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

25673 commits

This branch
This branch
All branches
Author SHA1 Message Date
Björn Schießle
569c2a8deb Merge pull request #17203 from owncloud/fix-share-autocomplete 
fix z-index of share-autocomplete
 2015-06-26 22:01:42 +02:00
Olivier Paroz
158c5b5e47 Adding BPG media type 2015-06-26 19:22:12 +02:00
Clark Tomlinson
ca1da0acb7 add check if server returns a 500 and display error 
resolves https://github.com/owncloud/core/issues/17170
 2015-06-26 12:50:09 -04:00
Vincent Petry
0684cc15dc Merge pull request #17071 from owncloud/share-get-users-non-existing 
fix getUsersSharingFile with locking
 2015-06-26 18:27:53 +02:00
Jan-Christoph Borchardt
4edf388a38 fix z-index of share-autocomplete 2015-06-26 17:48:35 +02:00
Olivier Paroz
b30515ddda Signature of overriding method should match the parent 2015-06-26 17:45:04 +02:00
Vincent Petry
271ef9dedb Remove test-specific method to make Bjoern and Joas happy 2015-06-26 17:37:04 +02:00
Arthur Schiwon
8625a8cf23 ensure groups match filter when using memberOf to read users group, refs #17119 2015-06-26 16:42:11 +02:00
Vincent Petry
56d9df34cb Unit test for etag update on custom share folder 2015-06-26 16:32:28 +02:00
Robin Appelman
c338999032 fix getUsersSharingFile with locking 2015-06-26 16:31:52 +02:00
Thomas Müller
ac94126393 Merge pull request #17191 from owncloud/issue-17188-group-share-part-file 
Correctly check if the real file exists, otherwise try the part file
 2015-06-26 16:01:41 +02:00
Björn Schießle
b318b9cf17 Merge pull request #17008 from owncloud/fix-17006 
Improve splitting of username and remote adress when username contains an `@`
 2015-06-26 16:01:16 +02:00
Joas Schilling
9b336765b6 Correctly check if the real file exists, otherwise try the part file 2015-06-26 13:17:23 +02:00
Thomas Müller
796aae4402 Merge pull request #17009 from owncloud/lock-downloadfile 
Lock file during download
 2015-06-26 13:04:34 +02:00
Thomas Müller
9558562883 Merge pull request #17082 from owncloud/shared-etag-propagate-file 
Fix etag propagation for single file shares
 2015-06-26 12:36:17 +02:00
Thomas Müller
8cc88fa64f Merge pull request #17190 from owncloud/lock-changelabel 
Rename experimental to transactional file locking
 2015-06-26 12:27:16 +02:00
Vincent Petry
eadf789519 Rename experimental to transactional file locking 2015-06-26 11:10:10 +02:00
Thomas Müller
6c3a4282e5 Merge pull request #17165 from owncloud/federated_cloud_sharing_search_address_book 
Search address book for federated cloud id
 2015-06-26 10:53:02 +02:00
Morris Jobke
569157d529 Merge pull request #17185 from rullzer/fix_17178 
Fix for #17178
 2015-06-26 08:21:32 +02:00
Jenkins for ownCloud
b1e29c7dde [tx-robot] updated from transifex 2015-06-26 01:55:35 -04:00
Roeland Jago Douma
27d5838fb7 Fix for #17178 
If no array of arrays is submitted make sure we still keep $sharedUsers
and $sharedGroups as arrays so the rest of the code keeps functioning as
it should.
 2015-06-25 21:16:18 +02:00
Vincent Petry
eae08d0adc Release locks after class in tests 2015-06-25 16:33:02 +02:00
Vincent Petry
538e466c30 Keep shared locks in post hooks 
Instead of unlocking after the file operation, change exclusive locks
back to shared locks during post hooks, and unlock after that.

Also added unit tests to test locking in pre-hooks, during operation and
post-hooks.
 2015-06-25 16:33:02 +02:00
Robin Appelman
0128a86df1 add some docs 2015-06-25 14:29:40 +02:00
Morris Jobke
0032cddb40 add additional email address for Georg 2015-06-25 14:14:14 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Bjoern Schiessle
a288d0eea3 ne need to check twice if $row['share_with'] is set 2015-06-25 12:14:46 +02:00
Bjoern Schiessle
dd9dfc4461 show nice display name for remote shares if possible 2015-06-25 12:14:03 +02:00
Bjoern Schiessle
f9dcb559e9 search address book for federated cloud id 2015-06-25 11:57:03 +02:00
Thomas Müller
9be1d08c3c Merge pull request #17162 from owncloud/LukasReschke-patch-1 
Create .htaccess
 2015-06-25 11:44:38 +02:00
Morris Jobke
cdb0e62e9b [license script] sort names case insensitive 2015-06-25 11:43:07 +02:00
Lukas Reschke
08984154cd Create .htaccess 
Ref https://github.com/owncloud/core/pull/16724#discussion_r33236344 – shouldn't hurt also.
 2015-06-25 11:23:11 +02:00
Morris Jobke
5cb1e20214 remove duplicate ID in HTML template for public shares 2015-06-25 10:13:56 +02:00
Morris Jobke
1601867c9d Remove unneeded getetag entries in properties table 
* fixes #13281
 2015-06-25 08:44:26 +02:00
Morris Jobke
160d8003f8 Merge pull request #17152 from owncloud/LDAP/AD-Typo 
Ldap/ad typo
 2015-06-25 07:56:04 +02:00
Jenkins for ownCloud
dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Lukas Reschke
a63f6023fd Dropped an S from the mouseover 
We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
 2015-06-24 22:10:10 +02:00
Bjoern Schiessle
407db913de add occ command to trashbin to remove deleted files 2015-06-24 19:09:20 +02:00
Vincent Petry
58439c337c Merge pull request #17070 from owncloud/lock-movemountbug 
Lock correct paths when moving mount
 2015-06-24 18:37:48 +02:00
Robin Appelman
c87ab65081 fix etag propagation for single file shares 2015-06-24 18:16:03 +02:00
Robin Appelman
f847d9409e add unit test for single file share etag propagation 2015-06-24 18:16:03 +02:00
Morris Jobke
5f59393b30 Merge pull request #17110 from owncloud/share-error-handling 
[sharing] handle shares of users that aren't available anymore
 2015-06-24 17:38:34 +02:00
Lukas Reschke
004280e407 Merge pull request #17136 from rullzer/fix_remove_link_OCS 
Allow removing of link password in OCS again
 2015-06-24 16:45:00 +02:00
Thomas Müller
1e7a3a4b3b Merge pull request #17139 from owncloud/increase-oracle-init-time 
Let's wait a little longer until oracle finally is available
 2015-06-24 16:17:23 +02:00
Vincent Petry
8859004a2b Rollback folder scan if an entry was locked 2015-06-24 15:42:00 +02:00
Thomas Müller
047b7a13a3 Let's wait a little longer until oracle finally is available 2015-06-24 14:09:32 +02:00
Thomas Müller
7a3cfbc3c8 Merge pull request #17133 from owncloud/rename-user-webdavauth 
Rename user_webdavauth to prevent accidental activation - refs #17112
 2015-06-24 13:57:52 +02:00
Thomas Müller
161ca900e0 Merge pull request #17130 from owncloud/update-mime-types 
Update wmv and add mts and mt2s
 2015-06-24 13:35:58 +02:00
Roeland Jago Douma
6c3da1ec90 Added unit test to verify link password removeal 2015-06-24 12:38:33 +02:00
Roeland Jago Douma
6977eff106 set NULL correctly in password update 
Old code used 'NULL' but docterine wants null. Now it is possible again
to remove the password from a link share.
 2015-06-24 12:37:59 +02:00