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

28122 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
e28daf2b37 Merge pull request #20273 from owncloud/sharing-api-adding-tests 
Adding more tests to the sharing API.
 2015-11-05 15:58:09 +01:00
Thomas Müller
7969f79a78 Merge pull request #20325 from owncloud/subadmin-handle-null 
subadmin methods should not return any null user or group
 2015-11-05 14:30:42 +01:00
Sergio Bertolín
eec7d2764c Merge branch 'master' into sharing-api-adding-tests 2015-11-05 12:43:22 +01:00
Arthur Schiwon
51ead4e59b subadmin methods should not return any null user or group 2015-11-05 11:50:57 +01:00
Thomas Müller
8bffc84766 Merge pull request #20301 from owncloud/fix-files_external-empty-user-mounting 
[files_external] fix empty user mounts setting
 2015-11-05 11:36:36 +01:00
Sergio Bertolin
1a51d4c4c7 Added changes in the verification of sharing get responses 2015-11-05 09:10:46 +00:00
Thomas Müller
6e7461f64c Merge pull request #20320 from owncloud/drop-file_map 
Drop unused table file_map
 2015-11-05 10:03:41 +01:00
Thomas Müller
5eec9f4068 Merge pull request #20321 from owncloud/drop-principal-tables 
Drop unused tables principalgroups and principals
 2015-11-05 10:02:39 +01:00
Morris Jobke
3778680f3f Drop unused tables principalgroups and principals 
* was removed in 3e84f170e7
 2015-11-05 08:40:21 +01:00
Morris Jobke
6b6f19bb94 Drop unused table file_map 
* used only for windows support
* windows support was dropped in 8.2.0 - see #17379
* was introduced in fd8cb9974b
* ref #18935
 2015-11-05 08:21:53 +01:00
Jenkins for ownCloud
2f4fa5b49c [tx-robot] updated from transifex 2015-11-05 01:55:14 -05:00
Thomas Müller
b23159fa5e Merge pull request #20315 from owncloud/add-coverity 
Add coverity badge
 2015-11-04 23:28:28 +01:00
Thomas Müller
ba02a3771b Merge pull request #20053 from owncloud/getfileinfo-locking 
Don't lock if we're only reading cache metadata
 2015-11-04 22:40:17 +01:00
Lukas Reschke
5a9f5ef902 Add coverity badge 
Coverity now scans our JS code…
 2015-11-04 22:36:35 +01:00
Robin Appelman
a2cfbd975a mark path as checked 2015-11-04 16:34:39 +01:00
Morris Jobke
05359e384e Merge pull request #20300 from owncloud/fix_comment 
adjust comment, this parameter was added for 9.0
 2015-11-04 16:17:17 +01:00
Morris Jobke
2a35ecb9ba [files_external] fix empty user mounts setting 
* fixes #19858
* if no backend is allowed to be mounted also the user mount setting should be disabled
 2015-11-04 15:47:03 +01:00
Björn Schießle
d1a090e3e2 adjust comment, this parameter was added for 9.0 2015-11-04 15:12:22 +01:00
Robin Appelman
c487f0f138 when a file is locked use old cache data 2015-11-04 14:45:10 +01:00
Thomas Müller
bb216feeb2 Merge pull request #18361 from owncloud/sharing_performance_improvements 
improve calculation of share recipients
 2015-11-04 14:44:31 +01:00
Sergio Bertolin
3b7690f842 added test for deleting a share 2015-11-04 13:42:14 +00:00
Robin Appelman
0a56313ca4 fix whitespace 2015-11-04 14:41:03 +01:00
Morris Jobke
09436e95c4 Merge pull request #20155 from owncloud/fix-20020 
add port to host only, if an URL is used instead of a plain hostname
 2015-11-04 14:02:43 +01:00
Sergio Bertolin
0593381522 Added general function to create shares in preconditions. 2015-11-04 12:16:00 +00:00
Arthur Schiwon
8eeaf11d41 add port to host only, if an URL is used instead of a plain hostname 2015-11-04 12:34:30 +01:00
Thomas Müller
475b52c93b Merge pull request #20283 from owncloud/fix-varaible-type 
Fix typo in variable name
 2015-11-04 11:10:48 +01:00
Thomas Müller
c59ca9203d Merge pull request #18821 from owncloud/global-classes 
Global classes in core CSS
 2015-11-04 10:30:10 +01:00
Thomas Müller
b162761124 Merge pull request #20157 from owncloud/users-fixeveryonecount 
Fix everyone count for subadmins
 2015-11-04 10:28:56 +01:00
Thomas Müller
ed0da94d3b Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorage 
Correct the description of function setEncryptHomeStorage
 2015-11-04 10:27:54 +01:00
Morris Jobke
cc9695ea41 Fix typo in variable name 
* introduced with #20135 - c6f6a8758b

Fixes following error meessage:

{"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Undefined variable: subAdmins at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
{"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Invalid argument supplied for foreach() at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
 2015-11-04 09:44:19 +01:00
Morris Jobke
18f0bafd88 fix subadmin user count for empty groups 2015-11-04 09:39:51 +01:00
Bjoern Schiessle
4719305e3b cache result from parent folders 2015-11-04 09:27:29 +01:00
Jenkins for ownCloud
7fe047425f [tx-robot] updated from transifex 2015-11-04 01:55:44 -05:00
Robin Appelman
fc7f7e5c37 only lock in getDirectoryContent if we need to update the cache 2015-11-03 18:23:22 +01:00
Robin Appelman
4f2656993e only lock in getFileInfo if we need to update the cache 2015-11-03 18:23:22 +01:00
Robin Appelman
0397871f7e Split checkUpdate 2015-11-03 18:23:22 +01:00
Phil Davis
46261b5ff1 Correct the description of function setEncryptHomeStorage 2015-11-03 22:47:55 +05:45
Sergio Bertolin
0f27b719ea enhancements to pre and post conditions 2015-11-03 16:08:01 +00:00
Thomas Müller
5a25f1c2a0 Merge pull request #20269 from owncloud/capabilities-webdav-ng-sync 
Add a new core capability which tells the clients which url to use
 2015-11-03 15:33:07 +01:00
Thomas Müller
b2a437ffff Add a new core capability which tells the clients which url to use 2015-11-03 14:27:36 +01:00
Thomas Müller
a8daef4280 Merge pull request #20223 from owncloud/fix-apply-webdav-tags 
Fix TagList namespace in property map
 2015-11-03 14:22:49 +01:00
Thomas Müller
b0c456c0fc Merge pull request #20201 from owncloud/checkboxes-groups-enable 
Apply new checkbox style in app settings
 2015-11-03 11:19:45 +01:00
Thomas Müller
292c924043 Merge pull request #20253 from owncloud/external-storage-wording 
fix external storage wording detail, ref #19858
 2015-11-03 11:16:21 +01:00
Morris Jobke
43f5671211 Merge pull request #20256 from owncloud/fix-searchbox-iceweasel 
Don't validate searchbox
 2015-11-03 11:07:07 +01:00
Hendrik Leppelsack
cf0ebfc7aa don't validate searchbox 2015-11-03 10:10:52 +01:00
Jan-Christoph Borchardt
fa5a15be2b fix external storage wording detail, ref #19858 2015-11-03 08:56:15 +01:00
Jenkins for ownCloud
82f3590fd0 [tx-robot] updated from transifex 2015-11-03 01:58:43 -05:00
Thomas Müller
0559b2092c Merge pull request #20232 from owncloud/error-button-color 
fix button text color
 2015-11-02 21:48:50 +01:00
Thomas Müller
1018d6115a Merge pull request #20045 from owncloud/dbal-2.5.2 
Bump 3rdparty for dbal-2.5.2
 2015-11-02 20:22:52 +01:00
Roeland Jago Douma
7ac8ce7aa0 Bump 3rdparty for dbal-2.5.2 2015-11-02 19:44:47 +01:00