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

31566 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
62a59854f0
Fix LDAP race conditions 
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
  return only non-null values
 2016-04-20 21:50:28 +02:00
Thomas Müller
85d809c0d3 Merge pull request #23268 from owncloud/range-requests-should-not-block-the-session 
Close session for publicwebdav
 2016-04-18 09:23:39 +02:00
Thomas Müller
d5dbd4e051 Merge pull request #24048 from owncloud/memcache_psr-4 
Move \OC\Memcache to PSR-4
 2016-04-18 09:02:48 +02:00
Roeland Jago Douma
f3d05486fd
Move \OC\Memcache to PSR-4 2016-04-18 08:21:50 +02:00
Morris Jobke
d5aa694ccf Merge pull request #24036 from owncloud/db_psr4 
Move \OC\DB to PSR-4
 2016-04-17 19:50:07 +02:00
Jenkins for ownCloud
d33f048bee [tx-robot] updated from transifex 2016-04-17 01:54:52 -04:00
Lukas Reschke
0363aab021 Merge pull request #23936 from owncloud/update_3rdparty 
update 3rdparty to latest JSqueeze
 2016-04-16 23:47:26 +02:00
Lukas Reschke
2625d8fc71 Merge pull request #23978 from owncloud/integration-test-remaining-from-qa-26 
Added test case about downloading a file inside a folder with range
 2016-04-16 23:34:53 +02:00
Lukas Reschke
2d84e9c5fa Merge pull request #24020 from owncloud/update-sample-command 
Fix deprecated usages of libre office commands
 2016-04-16 23:30:11 +02:00
Lukas Reschke
e2946f7b80 Merge pull request #24030 from owncloud/integration-tests-improved-resharing 
Added test case for QA-94
 2016-04-16 23:28:28 +02:00
Lukas Reschke
95e62180ce Merge pull request #23939 from owncloud/stricter-csp-for-dav-backend 
Employ a stricter Content Security Policy on remote.php
 2016-04-16 23:15:23 +02:00
Jenkins for ownCloud
90a77cb868 [tx-robot] updated from transifex 2016-04-16 01:55:11 -04:00
Thomas Müller
56a37d315b Merge pull request #24017 from owncloud/share-permissions-namespace 
Move share-permissions property namespace
 2016-04-15 20:12:01 +02:00
Roeland Jago Douma
d09f835dca
Move \OC\DB to PSR-4 
Besides the statement wrapper that is moved to the legacy folder
(namepsace of shame folder)
 2016-04-15 19:46:34 +02:00
Thomas Müller
bb71fd6d02 Merge pull request #24031 from owncloud/comments_psr4 
Move \OC\Comments to PSR-4
 2016-04-15 18:11:29 +02:00
Roeland Jago Douma
653325f254
Move \OC\Comments to PSR-4 2016-04-15 15:54:20 +02:00
Sergio Bertolin
5b34dcc099 Added test case for QA-94 2016-04-15 13:12:34 +00:00
Thomas Müller
63a385d2b8 Merge pull request #23933 from owncloud/remember-file-sorting 
remember file sort order
 2016-04-15 14:06:21 +02:00
Thomas Müller
66058fd2ae Merge pull request #24023 from owncloud/command_psr4 
Move \OC\Command to PSR-4
 2016-04-15 14:06:00 +02:00
Thomas Müller
f52eb84244 Merge pull request #24024 from owncloud/dropbox-autoload 
Fix loading the dropbox autoloader
 2016-04-15 14:05:38 +02:00
Robin Appelman
baff79cc63 Fix loading the dropbox autoloader 2016-04-15 12:46:47 +02:00
Roeland Jago Douma
5c6079cd89
Move \OC\Command to PSR-4 2016-04-15 12:01:13 +02:00
Roeland Douma
7529605676 Merge pull request #24016 from owncloud/cache_psr4 
Move \OC\Cache to PSR-4
 2016-04-15 11:13:26 +02:00
Joas Schilling
04232cdcdb
Fix deprecated usages 
Warning: -convert-to is deprecated.  Use --convert-to instead.
Warning: -outdir is deprecated.  Use --outdir instead.
 2016-04-15 10:50:18 +02:00
Roeland Jago Douma
0cebb16e7c
Move share-permissions property namespace 
Fixes https://github.com/owncloud/core/issues/23741
 2016-04-15 10:22:18 +02:00
Roeland Jago Douma
d9007ccacf
Move \OC\Cache to PSR-4 2016-04-15 09:22:37 +02:00
Thomas Müller
3ffe1f2e1a Merge pull request #24013 from owncloud/session_psr4 
Move \OC\Session to PSR-4
 2016-04-15 08:36:03 +02:00
Jenkins for ownCloud
e6b0874087 [tx-robot] updated from transifex 2016-04-15 01:54:55 -04:00
Roeland Jago Douma
e2c36c2903
Move \OC\Session to PSR-4 2016-04-15 07:46:19 +02:00
Thomas Müller
e3b90d7caa Merge pull request #24007 from owncloud/security_psr4 
Move \OC\Security to PSR-4
 2016-04-14 23:44:36 +02:00
Thomas Müller
b23037ec5c Merge pull request #23998 from owncloud/translate-birthday 
Translate contacts birthday
 2016-04-14 23:41:03 +02:00
Thomas Müller
f4f4f88347 Merge pull request #24005 from owncloud/3rdparty-has-to-be-in-root 
Kill movable 3rdparty
 2016-04-14 23:33:34 +02:00
Thomas Müller
a4938d9b26 Merge pull request #23994 from owncloud/log-in-image 
use background image for log in view
 2016-04-14 23:12:43 +02:00
C. Montero Luque
ed1874ee97 Merge pull request #23561 from owncloud/background-scan-unscanned 
handle completely unscanned storages in the background scanner
 2016-04-14 15:23:42 -04:00
Roeland Jago Douma
9050e76d95
Move \OC\Security to PSR-4 2016-04-14 19:21:18 +02:00
Thomas Müller
dc061bae42
Kill movable 3rdparty 2016-04-14 17:59:49 +02:00
C. Montero Luque
5911ce530b Merge pull request #23527 from owncloud/fix-21136 
disable Paged Search when chunksize is set to 0, fixes #21136
 2016-04-14 11:14:19 -04:00
Thomas Müller
55735e1450
Translate contacts birthday - fixes #23982 2016-04-14 16:58:45 +02:00
Morris Jobke
dba08f5fca Merge pull request #23985 from owncloud/ext-fix-namespaces 
Fix namespaces for files_external
 2016-04-14 16:32:01 +02:00
Thomas Müller
0cff70bb90 Merge pull request #23991 from owncloud/handle-exceptions-in-templates 
Properly handle exception within templates
 2016-04-14 15:38:47 +02:00
Jan-Christoph Borchardt
2ab077d16e use background image for log in view 2016-04-14 12:36:55 +02:00
Thomas Müller
068e73cc47 Merge pull request #23975 from owncloud/change-default-calendar-and-contacts-names 
Use better names for the default calendars and addressbooks
 2016-04-14 11:57:43 +02:00
Thomas Müller
6d9e15c6a1 Merge pull request #22760 from owncloud/tooltip-cssfix 
add word wrap to tooltips. Fixes #22746
 2016-04-14 11:53:35 +02:00
Christoph Wurst
97d553b57a close navigation menu when opening app in new tab (#23914) 2016-04-14 11:53:20 +02:00
Christoph Wurst
a2572ffec7 add loading feedback to user menu entries (#23916) 
fixes #19857
 2016-04-14 11:53:09 +02:00
Roeland Douma
411fac892a On mount make sure multiple shares with same target map to unique ones (#23937) 
Scenario:
user0 shares a folder 'foo' with user2
user1 shares a folder 'foo' with user2
user2 logs in

Before: show only the 'foo' from user1

After: show both.

* Added intergration tests
 2016-04-14 11:50:27 +02:00
Scrutinizer Auto-Fixer
25fff15487 Scrutinizer Auto-Fixes (#23959) 
* Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com

* revert append() change
 2016-04-14 11:50:06 +02:00
Thomas Müller
e84da2cf54 Merge pull request #23976 from owncloud/kill-dav-migration 
Remove dav migration for 9.1
 2016-04-14 11:49:38 +02:00
Morris Jobke
dfb98c31a3 Merge pull request #19615 from owncloud/issue-15858-mount-points-return-wrong-paths-for-getusersharingfiles 
Fix Share::getUsersSharingFile() for mount points
 2016-04-14 11:49:11 +02:00
Roeland Douma
e396691712 Merge pull request #23986 from owncloud/psr-4_lock 
Move \OC\Lock to PSR-4
 2016-04-14 11:31:43 +02:00