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

9529 commits

Author SHA1 Message Date
Robin Appelman
8ec7e9fac7 fix getting mount points when passing a path to the files:scan command 2015-06-29 14:03:23 +02:00
Lukas Reschke
5810e7ab87 Merge pull request #17050 from owncloud/request-status-from-ocs 
Request approved state for disabled apps with ocsid
 2015-06-29 13:41:11 +02:00
Thomas Müller
aa595392f6 Merge pull request #17217 from owncloud/use-new-updater-url 
Use new updater URL + add unit tests
 2015-06-29 11:27:23 +02:00
Jenkins for ownCloud
733d59ed44 [tx-robot] updated from transifex 2015-06-29 01:54:44 -04:00
Lukas Reschke
04fe9e05f0 Use new updater URL + add unit tests 
Uses the new updater url "https://updates.owncloud.com/server/"
 2015-06-28 11:25:28 +02:00
Jenkins for ownCloud
4d565a8447 [tx-robot] updated from transifex 2015-06-28 01:55:19 -04:00
Lukas Reschke
a793b98fd0 Fix indentation 2015-06-27 20:37:07 +02:00
Lukas Reschke
af01958f3e Add missing annotations for parameters 2015-06-27 20:35:47 +02:00
Lukas Reschke
d1f0ff372e Merge pull request #17163 from owncloud/update-licenses 
Update license headers
 2015-06-27 20:22:23 +02:00
Roeland Douma
708c6268ad Merge pull request #17206 from oparoz/bpg-media-type 
Adding BPG media type
 2015-06-27 10:19:56 +02:00
Jenkins for ownCloud
28c223edc6 [tx-robot] updated from transifex 2015-06-27 01:55:58 -04:00
Olivier Paroz
158c5b5e47 Adding BPG media type 2015-06-26 19:22:12 +02: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
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
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
Jenkins for ownCloud
b1e29c7dde [tx-robot] updated from transifex 2015-06-26 01:55:35 -04: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
Jenkins for ownCloud
dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04: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
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
Vincent Petry
8859004a2b Rollback folder scan if an entry was locked 2015-06-24 15:42:00 +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
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
Morris Jobke
300d1c88d0 Merge pull request #17106 from owncloud/htaccess-update-only-once 
Only update the htaccess ErrorDocument links when they are not set yet
 2015-06-24 12:20:22 +02:00
Vincent Petry
35047a2300 Fix locked paths in the moveMount case 
When moving a mount point directly, the lock must be applied on the
local mount point path instead of the attached storage root.

Other operations will still lock the attached storage root.
 2015-06-24 11:33:28 +02:00
Thomas Müller
5c213539af Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107 2015-06-24 11:06:29 +02:00
Morris Jobke
4f2f8a6f28 [sharing] handle shares of users that aren't available anymore 
* properly handle the case where an abandoned share is left and
  simply skip it
 2015-06-23 18:22:36 +02:00
Morris Jobke
02b2b60581 Merge pull request #17095 from owncloud/proper-error-handling 
Proper error handling
 2015-06-23 17:40:55 +02:00
Joas Schilling
0db311c9db Only update the htaccess ErrorDocument links when they are not set yet 2015-06-23 16:45:56 +02:00
Morris Jobke
c86e129ce9 [updater] keep maintenance active on failure and mark failure in red 2015-06-23 14:45:53 +02:00
Björn Schießle
cce841c665 Merge pull request #17045 from owncloud/enc_improvements 
encryption improvements
 2015-06-23 14:30:21 +02:00
Morris Jobke
1ba9fd3ada [upgrade] print update message before running the update code 
* otherwise you don't know during which app update something failed
 2015-06-23 13:13:44 +02:00
Bjoern Schiessle
95602d4069 make sure that we always read the header from the original file 2015-06-23 11:41:21 +02:00
Morris Jobke
fe42553e8a [updater] propagate error case properly 
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
 2015-06-23 10:03:27 +02:00
Morris Jobke
fdd01cf15c Added error message on initMountpoints exception 2015-06-23 09:54:03 +02:00
Joas Schilling
738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Joas Schilling
2b7e5f841a Merge spliteUserRemote with fixRemoteUrlInShareWith 2015-06-22 15:25:23 +02:00
Bjoern Schiessle
d38a378b8c make sure that we split username and server address at the first '@' from the right to allow usernames containing '@' 2015-06-22 15:25:23 +02:00
Björn Schießle
a88b370dc8 Merge pull request #12546 from oparoz/patch-1 
Send the mime icon if we can't generate a preview
 2015-06-22 13:55:17 +02:00
Thomas Müller
c74c8eff3a Enable x-sendfile only if we do not lock the file system 2015-06-22 12:07:53 +02:00
Thomas Müller
ced15c44b4 Merge pull request #16657 from owncloud/view-emit-path 
emit hooks from a view as long as the path is inside the default root
 2015-06-22 11:29:11 +02:00
Bernhard Posselt
7fe5ab4d4a Merge pull request #17056 from owncloud/appframework-type-cast 
Allow multiple whitespace in type hints in AppFramework
 2015-06-22 10:35:28 +02:00
Robin McCorkell
103f8ca6e8 Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm 
Use proper type
 2015-06-21 23:33:19 +01:00