upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-24 07:39:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 42
32971 commits 864 branches 1197 tags 8.3 GiB
Commit graph

12106 commits

Author SHA1 Message Date
Roeland Jago Douma
ae3d0d96fe
Optimize isSharingDisabledForuser 2016-06-14 10:17:06 +02:00
Jenkins for ownCloud
5887afbb37 [tx-robot] updated from transifex 2016-06-14 08:02:15 +02:00
Arthur Schiwon
ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 2016-06-14 01:06:25 +02:00
Christoph Wurst
465807490d
create session token only for clients that support cookies 2016-06-13 19:44:05 +02:00
Christoph Wurst
331d88bcab
create session token on all APIs 2016-06-13 15:38:34 +02:00
Vincent Petry
86d7241be2
Capped cache for cache info in UserMountCache 2016-06-13 15:08:12 +02:00
Roeland Jago Douma
64471b5d4a
Remove shares of the root folder 
Fixes #23265

(A possibly costly) repair job to remove cyclic shares.
 2016-06-13 15:07:41 +02:00
Jenkins for ownCloud
3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Bjoern Schiessle
5f2bc3a96d
emit correct signal if a app get's disabled 2016-06-13 13:36:23 +02:00
Robin Appelman
338cd4033a handle invalid storages in LazyStorageMountInfo 2016-06-13 13:31:45 +02:00
Christoph Wurst
5daa9a5417 fail hard if 2fa provider can not be loaded (#25061) 2016-06-13 12:46:45 +02:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Lukas Reschke
842cc2a788 Merge pull request #19 from nextcloud/files-drop 
add "hide file list" option
 2016-06-10 18:29:09 +02:00
Vincent Petry
52a0c939ab Merge pull request #24863 from owncloud/propagator-batching 
Propagator batching for the file scanner
 2016-06-10 17:45:52 +02:00
Vincent Petry
21de838b85 Merge pull request #24898 from owncloud/avatar_repair 
Repair job to fix permissions for avatars
 2016-06-10 17:02:11 +02:00
Vincent Petry
ffb2838dd8 Merge pull request #25055 from owncloud/enc-cappedcache-getaccesslist 
Use capped cache for encryption's user access list
 2016-06-10 15:35:39 +02:00
Jörn Friedrich Dreyer
c14198b874 fetchall appconfig entries (#23835) 2016-06-10 15:20:22 +02:00
Jörn Friedrich Dreyer
c668588e17 map oracle driver options to params (#23938) 2016-06-10 14:07:31 +02:00
Vincent Petry
77caa0e913
Use capped cache for encryption's user access list 2016-06-10 13:02:41 +02:00
Roeland Jago Douma
28d9ad2817
Empty string is null on oracle 2016-06-10 12:44:49 +02:00
Roeland Jago Douma
1b66db72d9
Repair job to fix permissions for avatars 
Fixes #22978

On some older installations the permissions for the userRoot and the
avatars are not correct. This breaks since we now use the Node API in
the avatar code.

This repair job makes sure that the permissions are set correctly.

* Unit tests added
 2016-06-10 12:44:49 +02:00
Vincent Petry
a0d8702a1c Merge pull request #25051 from owncloud/2fa-raw-php-files 
Check 2FA state for raw php files too
 2016-06-10 11:56:21 +02:00
Vincent Petry
68c3b23e04 Merge pull request #24080 from owncloud/support-calendar-class-property 
Extract CLASS property from calendar object and store it in the database
 2016-06-10 11:22:11 +02:00
Vincent Petry
d81dac24aa Merge pull request #25025 from owncloud/clear_old_calendar_shares 
Add repair step to clean old calendar shares
 2016-06-10 10:42:04 +02:00
Christoph Wurst
7b3dc806eb
Check 2FA state for raw php files too 2016-06-10 09:52:52 +02:00
Jenkins for ownCloud
e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Arthur Schiwon
a636e4ff28
Downstream 2016-06-09 
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
 2016-06-09 18:45:12 +02:00
blizzz
51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Vincent Petry
6ba18934e6 Merge pull request #25000 from owncloud/fix-email-login-dav 
Allow login by email address via webdav as well
 2016-06-09 16:28:06 +02:00
Roeland Jago Douma
7d51fd0310
Add repair step to clean old calendar/contact shares 
fixes #21889
 2016-06-09 15:48:45 +02:00
Bjoern Schiessle
bb54ab0db8
add hide file list option 2016-06-09 15:15:17 +02:00
Jenkins for ownCloud
6aab7d7232
[tx-robot] updated from transifex 2016-06-09 14:00:02 +02:00
Robin Appelman
49db29727c
make sure $data['mtime'] is always a timestamp 2016-06-09 14:00:02 +02:00
Robin Appelman
7970ff2099
don't update storage mtime if we can't get the modified date 2016-06-09 14:00:01 +02:00
Robin Appelman
ea6921da3b
Ignore forbidden files while scanning 2016-06-09 14:00:01 +02:00
Robin Appelman
bee918693a
dissalow symlinks in local storages that point outside the datadir 2016-06-09 14:00:01 +02:00
Joas Schilling
4f27c2c433
Allow to decrypt user '0' files only 2016-06-09 14:00:00 +02:00
Christoph Wurst
60e15e934c
do not generate device token if 2FA is enable for user 2016-06-09 14:00:00 +02:00
Joas Schilling
0041d89dc2
Do not allow to store boolean configs, they behave unexpected on postgres 2016-06-09 13:59:58 +02:00
Robin Appelman
18f7cede51
Fix warnings when trying to get mtime of non existing files 2016-06-09 13:59:58 +02:00
Robin Appelman
f4831f4074
return success when deleting ghost files 2016-06-09 13:59:58 +02:00
Robin Appelman
67c2c85b05
allow deleting "ghost files" trough the View and Node api 2016-06-09 13:59:58 +02:00
Thomas Müller
f20c617154
Allow login by email address via webdav as well - fixes #24791 2016-06-09 12:08:49 +02:00
Vincent Petry
90c1ec1c49 Merge pull request #25014 from owncloud/admin-datadircheck-fix 
Use temporary htaccesstest.txt for data dir security check
 2016-06-09 11:58:28 +02:00
Vincent Petry
826e276a79 Merge pull request #24973 from owncloud/token-password-session-token 
When creating a session token, make sure it's the login password and …
 2016-06-09 11:58:04 +02:00
Thomas Müller
369c3b5d7e
Implement classification migration as repair step 2016-06-09 11:09:14 +02:00
Vincent Petry
aca4ea12c1 Merge pull request #24826 from owncloud/cors-client-login 
use client login method on CORS routes
 2016-06-09 10:31:14 +02:00
Vincent Petry
0e3737ffe1 Merge pull request #25028 from owncloud/scanner-user-not-setup 
skip scanning for a user when the user is not setup yet
 2016-06-09 10:29:46 +02:00
Jan-Christoph Borchardt
81145ee57c THIS IS NEXTCLOUD! adjusting the design 2016-06-08 17:02:18 +02:00
Joas Schilling
e49307014c Do not log token or challenge with exception stacktrace (#25026) 
* Make the filtering better readable

* Add some more methods to the sensitive list
 2016-06-08 16:32:58 +02:00
Christoph Wurst
9997c431c3
use client login method on CORS routes 2016-06-08 15:18:53 +02:00
Christoph Wurst
46e26f6b49
catch sessionnotavailable exception if memory session is used 2016-06-08 15:03:15 +02:00
Robin Appelman
808438efc0 skip scanning for a user when the user is not setup yet 2016-06-08 14:19:42 +02:00
Christoph Wurst
ec929f07f2
When creating a session token, make sure it's the login password and not a device token 2016-06-08 13:31:55 +02:00
Arthur Schiwon
39aeebfac5
Print error message again, when 3rdparty submodule is not initialized 
- old code used Response which attempted to use OC::$server which is not
and cannot be intialised at this part of the code.
 2016-06-08 10:34:32 +02:00
Vincent Petry
8d0948977e Merge pull request #24899 from owncloud/local-storage-symlinks 
dissalow symlinks in local storages that point outside the datadir
 2016-06-08 10:19:24 +02:00
Vincent Petry
ed92f4c427 Merge pull request #24983 from owncloud/issue-23776-do-not-allow-boolean-user-config 
Do not allow to store boolean configs, they behave unexpected on postgres
 2016-06-08 10:14:08 +02:00
Vincent Petry
12683b786d Merge pull request #24991 from owncloud/2fa-do-not-generate-token 
do not generate device token if 2FA is enable for user
 2016-06-08 10:13:04 +02:00
Vincent Petry
b7935dcebd Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only 
Allow to decrypt user '0' files only
 2016-06-08 10:12:28 +02:00
Vincent Petry
87c150e2fb Merge pull request #25005 from owncloud/parent-storage-time-cast 
don't update storage mtime if we can't get the modified date
 2016-06-08 09:57:17 +02:00
Jenkins for ownCloud
bbd61cd98a [tx-robot] updated from transifex 2016-06-08 01:54:57 -04:00
Vincent Petry
fb087a0261
Use temporary htaccesstest.txt for data dir security check 2016-06-07 18:36:13 +02:00
Robin Appelman
2cf7ad8c55 make sure $data['mtime'] is always a timestamp 2016-06-07 17:09:24 +02:00
Robin Appelman
6822689e38 don't update storage mtime if we can't get the modified date 2016-06-07 15:04:24 +02:00
Robin Appelman
73547f29be Ignore forbidden files while scanning 2016-06-07 14:01:55 +02:00
Robin Appelman
7b1b723e5b dissalow symlinks in local storages that point outside the datadir 2016-06-07 14:01:53 +02:00
Vincent Petry
bf917d7063 Merge pull request #24813 from owncloud/delete-ghost-files 
allow deleting "ghost files" trough the View and Node api
 2016-06-07 09:34:16 +02:00
Joas Schilling
d4ba982131
Allow to decrypt user '0' files only 2016-06-07 09:13:11 +02:00
Christoph Wurst
8f7a4aaa4d
do not generate device token if 2FA is enable for user 2016-06-07 09:09:51 +02:00
Lukas Reschke
deef15a3c7
Remove "Help" link from personal sidebar 
At the moment we want to hide the help link from the personal sidebar as it contains the original ownCloud documentation.

Once we have our own documentation with our proper branding and so on we can reenable this.
 2016-06-06 18:40:15 +02:00
Joas Schilling
7d31ae9909 Fix second check for quota size (#24989) 2016-06-06 13:47:53 +02:00
Joas Schilling
911fd3ead4
Do not allow to store boolean configs, they behave unexpected on postgres 2016-06-06 12:38:20 +02:00
Jenkins for ownCloud
4234892a60 [tx-robot] updated from transifex 2016-06-04 02:01:18 -04:00
Robin Appelman
6bc8305edd Fix warnings when trying to get mtime of non existing files 2016-06-03 13:35:27 +02:00
Robin Appelman
14f96f86e7 return success when deleting ghost files 2016-06-03 13:34:54 +02:00
Robin Appelman
63408fa6ef allow deleting "ghost files" trough the View and Node api 2016-06-03 13:30:59 +02:00
Vincent Petry
eb6ae84cee Merge pull request #24564 from owncloud/fix_21173_take_2 
normalize path in getInternalPath
 2016-06-03 10:50:18 +02:00
Jenkins for ownCloud
63132483ca [tx-robot] updated from transifex 2016-06-03 02:19:30 -04:00
Georg Ehrke
89a10fdb2d
normalize path in getInternalPath 2016-06-02 19:11:35 +02:00
Robin Appelman
fce19d22d9 fix mtime propagation on sqlite 2016-06-02 15:43:43 +02:00
Vincent Petry
1ab7ee5e23 Merge pull request #24940 from owncloud/fix-normalizedcachekey-keepunicode 
Add keepUnicode value in the cache key of normalizedPathCache
 2016-06-02 15:18:13 +02:00
Robin Appelman
cc67ad4dda use propagator batching in the scanner 2016-06-02 15:07:50 +02:00
Robin Appelman
9fb44e34af add propagator batching 2016-06-02 15:07:47 +02:00
Vincent Petry
53398b5146 Merge pull request #24936 from owncloud/2fa-block-ocs 
block OCS if 2FA challenge needs to be solved first
 2016-06-02 14:55:34 +02:00
Vincent Petry
f37d519d0d Merge pull request #24946 from owncloud/issue-24943-duplicate-downgrade-unsupported-message 
Do not show the hint when it's the same as the message
 2016-06-02 10:40:53 +02:00
Vincent Petry
6b1422929d Merge pull request #24947 from owncloud/2fa-remember-redirect-url 
remember redirect_url when solving the 2FA challenge
 2016-06-02 10:40:32 +02:00
Vincent Petry
a81c7dd3bb Merge pull request #24953 from owncloud/fix-client-download-url 
Fix URL for client downloads
 2016-06-02 10:39:17 +02:00
Jenkins for ownCloud
f9f8fb7bf2 [tx-robot] updated from transifex 2016-06-02 01:55:16 -04:00
Joas Schilling
1d2cdfb9fd
Fix URL for client downloads 2016-06-01 16:58:57 +02:00
Christoph Wurst
5e71d23ded
remember redirect_url when solving the 2FA challenge 2016-06-01 14:43:47 +02:00
Vincent Petry
5ad8fa7675
Add keepUnicode value in the cache key of normalizedPathCache 2016-06-01 14:28:59 +02:00
Joas Schilling
13892417c4
Do not show the hint when it's the same as the message 2016-06-01 13:34:57 +02:00
Christoph Wurst
3ec6f4e165
block OCS if 2FA challenge needs to be solved first 2016-06-01 11:19:49 +02:00
Vincent Petry
7b4459d28d Merge pull request #24912 from owncloud/session-tokens-apache-auth 
Create session tokens for apache auth users
 2016-06-01 10:56:10 +02:00
Christoph Wurst
c58d8159d7
Create session tokens for apache auth users 2016-05-31 17:07:49 +02:00
Vincent Petry
2b111b217c Merge pull request #24851 from owncloud/ldap-static-method-log 
Hack to prevent infinite loop with LDAP + logging
 2016-05-31 13:52:52 +02:00
Vincent Petry
c0a19ecd2d Merge pull request #24907 from owncloud/properly-check-for-mbstring 
Properly check for mbstring extension
 2016-05-31 13:51:17 +02:00
Vincent Petry
5bb06723b0
Hack to prevent infinite loop with LDAP + logging 
Forward port of a50619200c to 9.1/master
 2016-05-31 11:38:41 +02:00
Vincent Petry
59ed464ee6 Merge pull request #24769 from owncloud/issue-24752-no-ui-message-when-integrity-disabled 
Only show message in the UI when the checker is enabled
 2016-05-31 10:36:16 +02:00
Vincent Petry
a441220f24 Merge pull request #24628 from owncloud/decryptall-checkifneedsprocessing 
[decrypt_all] Check if file needs to decrypted or not for speed up large oc setups.
 2016-05-31 10:12:03 +02:00