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

12828 commits

Author SHA1 Message Date
Arthur Schiwon
82b55c4db9 untangle different user manager instances, fixes #22770 2016-03-02 13:02:43 +01:00
Joas Schilling
8885cb1eb9 Increase all versions on master which is now 9.1 2016-03-02 08:53:42 +01:00
Jenkins for ownCloud
702c1a8962 [tx-robot] updated from transifex 2016-03-02 01:56:33 -05:00
C. Montero Luque
4d69e562a0 Merge pull request #22757 from owncloud/apply-license 
Update copyright information and author file
 2016-03-01 15:36:37 -05:00
C. Montero Luque
5a2fe4107c Merge branch 'master' into part-file-root 2016-03-01 13:35:04 -05:00
C. Montero Luque
745fdc4800 Merge pull request #22742 from owncloud/ceph-keystone-readiness 
Use readiness notification socket to be absolutely sure this works
 2016-03-01 13:34:23 -05:00
Lukas Reschke
3067367ff3 Add new apps 2016-03-01 17:52:32 +01:00
Lukas Reschke
c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke
c430f5ba53 Map Maci 2016-03-01 17:45:05 +01:00
Lukas Reschke
933f60e314 Update author information 
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
 2016-03-01 17:25:15 +01:00
Robin Appelman
37f1206818 allow putting the part file in the view root 2016-03-01 15:21:24 +01:00
Thomas Müller
900dcf6594 Merge pull request #22699 from owncloud/checksum_int_test 
Checksum intergration tests and fixes
 2016-03-01 14:47:09 +01:00
Thomas Müller
a83af96dd3 Merge pull request #22686 from owncloud/cleanup_remote_address_books 
remove remote address book if access was revoked
 2016-03-01 14:46:51 +01:00
Vincent Petry
57babe032b Save some calls to refreshInfo during upload 2016-03-01 11:44:49 +01:00
Roeland Jago Douma
ac392457f2 Fix unit tests 2016-03-01 11:37:16 +01:00
Roeland Jago Douma
ec140fa2ec Checksums on chunked files 
We should also store checksums on chunked files.
We do not checksum individual chunks but only the final file.
 2016-03-01 11:37:16 +01:00
Roeland Jago Douma
3e88a5067f Remove checksum on upload of non checksumed file 
When we overwrite a checksumed file with a file without a checksum we
should remove the checksum from the server.

This is done by setting the column to empty.
 2016-03-01 11:37:16 +01:00
Thomas Müller
5fe5233f41 Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs 
Add autodiscovery support to server-to-server sharing implementation
 2016-03-01 11:27:28 +01:00
Thomas Müller
73e145cf63 Merge pull request #22728 from owncloud/external-share-testremote 
use ocs discover endpoint to test remote
 2016-03-01 11:27:07 +01:00
Bjoern Schiessle
1832bd0fa1 increase version number 2016-03-01 11:21:24 +01:00
Thomas Müller
a66899c528 Handle null case 2016-03-01 10:41:05 +01:00
Thomas Müller
1652541150 Merge pull request #22700 from owncloud/only_1_linkshare 
For now only allow 1 link share per file/folder
 2016-03-01 09:22:39 +01:00
Thomas Müller
25a4571dcd Merge pull request #22731 from owncloud/hide-nodes-from-listening 
Hides nodes from listing that the user has no access to
 2016-03-01 09:22:08 +01:00
Thomas Müller
fd4742d430 Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset 
Don't return quota when none set
 2016-03-01 08:30:58 +01:00
Roeland Jago Douma
ffce4fc6a9 For now only allow 1 link share per file/folder 
Fixes #22692
This is a temp fix util we get #22327

We just block it in the OCS Share API since we have 1 endpoint now
anyway.
 2016-03-01 08:25:40 +01:00
Thomas Müller
eb740d1dac Merge pull request #22727 from owncloud/decrypt_all_master_key 
make decrypt all work with the master key
 2016-03-01 08:23:27 +01:00
Thomas Müller
f3050b3adb Merge pull request #22740 from owncloud/fix_resare_updates 
Check correct permissions when resharing
 2016-03-01 08:17:56 +01:00
Jenkins for ownCloud
a06f59c580 [tx-robot] updated from transifex 2016-03-01 01:55:33 -05:00
Thomas Müller
3adb6ae0f5 Merge pull request #22707 from owncloud/use-our-public-api 
Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
 2016-03-01 07:24:57 +01:00
Lukas Reschke
9ca1e9c7e9 Only use scanner if remote is an ownCloud 2016-03-01 07:01:52 +01:00
Lukas Reschke
e965dcaebf /shareinfo is not required 2016-03-01 07:01:52 +01:00
Lukas Reschke
8f95d69954 Fix tests 2016-03-01 07:01:52 +01:00
Lukas Reschke
74e47da883 Add missing trailing slash 2016-03-01 07:01:51 +01:00
Robin Appelman
080a62231e use ocs discover endpoint to test remote 2016-03-01 07:01:51 +01:00
Lukas Reschke
88fc5149ed Fix Scrutinizer issues 2016-02-29 22:44:40 +01:00
Robin McCorkell
078cc3b3f0 Use readiness notification socket to be absolutely sure this works 2016-02-29 21:20:11 +00:00
Lukas Reschke
d04edfaf0d Hides nodes from listing that the user has no access to 2016-02-29 20:53:38 +01:00
Roeland Jago Douma
8924b0a0dc Check correct permissions when resharing 
Fixes #22675

Since we only get a share id we do not know the path for the sharer.
Now if we edit a share we start searching for shares for that user of
that node. And deduce the permissions that way.

* Intergration test added
* Fix unit tests
 2016-02-29 19:30:14 +01:00
Bjoern Schiessle
9e9cb73987 fix doc-block 2016-02-29 16:50:34 +01:00
Bjoern Schiessle
87e47afed8 remove synced remote address book if the remote server revoked access to his system address book 2016-02-29 16:50:34 +01:00
Bjoern Schiessle
7189c72c33 remove remote address book if the admin removes the server from the trusted servers list 2016-02-29 16:50:33 +01:00
Thomas Müller
52d217d775 Merge pull request #22623 from owncloud/docker-logs-on-swift-external 
Print docker logs to the console fro debugging
 2016-02-29 16:36:34 +01:00
Bjoern Schiessle
95ea2ccb53 make decrypt all work with the master key 2016-02-29 14:54:32 +01:00
Vincent Petry
11215f4e27 Return -3 for unlimited quota 
Returns -3 for unlimited quota in Webdav response.
Also adjusted personal page to show unlimited quota when set.
 2016-02-29 14:36:20 +01:00
Thomas Müller
a38e8b6436 Merge pull request #22662 from owncloud/comments-count 
remove comments count because it is not that relevant to show directly
 2016-02-29 13:44:56 +01:00
Joas Schilling
2a0cda74d4 Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* 2016-02-29 09:44:40 +01:00
Jenkins for ownCloud
5800585039 [tx-robot] updated from transifex 2016-02-29 01:55:04 -05:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Jenkins for ownCloud
f9826ec948 [tx-robot] updated from transifex 2016-02-27 01:56:08 -05:00
Bjoern Schiessle
eccd7cf654 reuse the url_hash instead of calculating a new hash for the address book 2016-02-26 20:00:13 +01:00