wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31155 commits 157 branches 562 tags 714 MiB
Commit graph

31155 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
a98b038300 Query the cache when checking if a node exists 2016-03-21 13:53:33 +01:00
Thomas Müller
86581f6626 Merge pull request #22065 from owncloud/systemtags-create-same-prefix 
Allow creating tags where another one with same prefix exists
 2016-03-21 11:15:49 +01:00
Thomas Müller
8852fdaee3 Merge pull request #22789 from owncloud/dav-sharesproperty 
Add webdav property for share info in PROPFIND response
 2016-03-21 11:15:00 +01:00
Thomas Müller
e983bd7db0 Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browser 
In debugging mode we enable Sabre's browser plugin since it helps a l…
 2016-03-21 10:13:27 +01:00
Thomas Müller
c77412b1ac Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-enabled 
disable the recovery key if the master key is enabled
 2016-03-21 09:49:15 +01:00
Thomas Müller
8442516e10 Merge pull request #23329 from owncloud/fix-21555 
Avatar must be saved after login is done and external storages set up…
 2016-03-21 09:47:50 +01:00
Thomas Müller
16782484b9 Merge pull request #23349 from owncloud/hardenings 
Hardenings
 2016-03-21 09:45:05 +01:00
Thomas Müller
ef4dc22a6a Merge pull request #23369 from owncloud/use-raw-path 
Use raw PATH_INFO
 2016-03-21 09:44:27 +01:00
Thomas Müller
b9da594bd9 Merge pull request #23374 from owncloud/fix-htaccess-issues 
Write .htaccess update only if not already written
 2016-03-21 09:43:18 +01:00
Jenkins for ownCloud
35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Jenkins for ownCloud
1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Jenkins for ownCloud
9c053ed465 [tx-robot] updated from transifex 2016-03-19 01:55:39 -04:00
Jenkins for ownCloud
a6c921267e [tx-robot] updated from transifex 2016-03-18 01:59:00 -04:00
Thomas Müller
0bc51b9118 Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory 
Fix dropbox storage to not store the whole file in memory
 2016-03-17 20:52:41 +01:00
Thomas Müller
31ee463690 Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap 
fix writing to cache when fallback server should be used immediately
 2016-03-17 20:52:22 +01:00
Thomas Müller
d6d59fe227 Merge pull request #23346 from owncloud/fix_23325 
Set proper public webdav permissions when public upload disabled
 2016-03-17 20:51:54 +01:00
Thomas Müller
876e032d09 Merge pull request #23370 from owncloud/fix-username-change 
Update avatar on username change if avatar is set
 2016-03-17 19:50:12 +01:00
Thomas Müller
f957ca405f Merge pull request #23371 from owncloud/paurisa-Fixed_21588 
Rating icons changed to .svg
 2016-03-17 19:49:11 +01:00
Roeland Jago Douma
6e6e002280 Remove duplicated copyright 2016-03-17 19:24:25 +01:00
Thomas Müller
d6ee1798cc Merge pull request #23255 from owncloud/update-sabre3.0.8-fseek 
Update 3rdparty commit for sabre update 3.0.8
 2016-03-17 18:33:34 +01:00
Thomas Müller
520724d757 Necessary code changes to make browser plugin properly work 2016-03-17 18:00:06 +01:00
Lukas Reschke
e867a7d54d Write .htaccess update only if not already written 
The ownCloud update routine also runs the "updateHtaccess" code in case only an application gets updated. This leads to having entries multiple time in the .htaccess file leading to unpredictable behaviour.

With 9.0 we added the "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" entry to the .htaccess file, this change uses it to ensure that only to the .htaccess gets written if the file has not been modified already. Since the .htaccess modifications are optional this is not a big deal.

Without this change updates of applications can break the rewrite rules (ending in endless redirects) as well as breaking the code integrity checker.
 2016-03-17 17:59:28 +01:00
Pau
37d7712411 Rating icons changed to .svg 2016-03-17 17:37:45 +01:00
Morris Jobke
d79c8c6d13 Update avatar on username change if avatar is set 
* fixes #20455
 2016-03-17 17:34:22 +01:00
Lukas Reschke
24abe1e1e1 Use raw PATH_INFO 
PATH_INFO will be empty at this point and thus the logic in base.php did not catch this. Changing this to "getRawPathInfo" will ensure that the path info is properly read.

Fixes https://github.com/owncloud/core/issues/23199
 2016-03-17 17:32:38 +01:00
Roeland Jago Douma
85f363ba2c Add intergration tests 
Intergration tests to ensure the share-types property is set correctly.

* Unshared item
* Shared with user
* Shared with group
* Shared by link
* Shared with user & group & link
 2016-03-17 16:54:54 +01:00
Thomas Müller
7d638fdb34 In debugging mode we enable Sabre's browser plugin since it helps a lot when debugging 2016-03-17 16:51:19 +01:00
Vincent Petry
950530b162 Display share status info in favorite list 
Returns the shareTypes share status info to the favorites file list.
 2016-03-17 15:35:21 +01:00
Vincent Petry
f778e48ee5 Add webdav property for share info in PROPFIND response 2016-03-17 15:35:21 +01:00
Thomas Müller
8fb3e44610 Merge pull request #23287 from owncloud/issue-22786-absolute-paths 
Fix absolute path creation for remote shares with /oc webroot
 2016-03-17 14:29:57 +01:00
Lukas Reschke
bf017f5c11 Remove unused code 
This code is not used anymore.
 2016-03-17 13:09:23 +01:00
Lukas Reschke
979a3ff830 Escape App ID 
While all callers do this as well this prevents a misuse of the API by mistake.
 2016-03-17 13:09:22 +01:00
Roeland Jago Douma
533fdb4075 Set proper public webdav permissions when public upload disabled 
Fixes #23325

It can happen that a user shares a folder with public upload. And some
time later the admin disables public upload on the server.

To make sure this is handled correctly we need to check the config value
and reduce the permissions.

Fix is kept small to be easy backportable.
 2016-03-17 11:35:31 +01:00
Thomas Müller
828cb08d49 Merge pull request #23334 from owncloud/ext-user-mounting-gui 
Display external storage GUI even if user mounting disabled
 2016-03-17 09:55:23 +01:00
Thomas Müller
8237baba68 Merge pull request #23303 from owncloud/exclude-only-specific-third-party 
Exclude only known failing third-party files
 2016-03-17 09:50:02 +01:00
Thomas Müller
48a7f126fd Merge pull request #23326 from owncloud/manishbisht-combined-database-errors 
[CI] Installation: Combined database errors
 2016-03-17 09:33:26 +01:00
Thomas Müller
b5c56a7322 Merge pull request #23336 from owncloud/occ-typos 
Some typo corrections in occ command output
 2016-03-17 09:31:11 +01:00
Thomas Müller
a20cf140c3 Merge pull request #23340 from owncloud/dont-try-to-test-syntax-as-dav-test 
Don't try to execute a dav syntax test
 2016-03-17 09:28:44 +01:00
Joas Schilling
a400c5963b Don't try to execute a dav syntax test 2016-03-17 08:58:03 +01:00
Jenkins for ownCloud
ace1812026 [tx-robot] updated from transifex 2016-03-17 01:56:06 -04:00
Carla Schroder
0c9eaede41 Some typo corrections in occ command output 2016-03-16 16:14:25 -07:00
Robin McCorkell
a51ece97e3 Display external storage GUI even if user mounting disabled 2016-03-16 22:06:49 +00:00
Thomas Müller
f3f08cf910 Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally-untested-stuff 
Fallback for crappy ancient distributions
 2016-03-16 21:56:36 +01:00
Thomas Müller
8b5a1bbe3e Merge pull request #23258 from owncloud/sharee-tests 
Add integration tests for sharee endpoint
 2016-03-16 21:54:20 +01:00
Arthur Schiwon
d8621c78ed Avatar must be saved after login is done and external storages set up properly, fixes #21555 2016-03-16 20:51:03 +01:00
Manish Bisht
07e7d4836e Update oci.php 
Error Fixed

combined the database errors

Merged Database Errors
 2016-03-16 19:21:14 +01:00
Thomas Müller
b4ea527fb2 Merge pull request #23253 from owncloud/give-swift-more-time 
Give swift 15 seconds after startup
 2016-03-16 17:32:55 +01:00
Thomas Müller
d188ed938c Merge pull request #23082 from owncloud/contacts_calendar_name_color 
add title and color to birthday calendar
 2016-03-16 17:17:21 +01:00
Thomas Müller
596bc3bab2 Merge pull request #23300 from owncloud/smb-not-available 
handle connection errors as storage not available in smb
 2016-03-16 16:50:35 +01:00
Morris Jobke
e7e743bdb4 Give swift 15 seconds after startup 2016-03-16 16:16:04 +01:00