summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-27145-97/+242
|\ | | | | Update license headers
| * update license headers and authorsMorris Jobke2015-06-25145-97/+242
| |
* | Merge pull request #17206 from oparoz/bpg-media-typeRoeland Douma2015-06-271-0/+1
|\ \ | | | | | | Adding BPG media type
| * | Adding BPG media typeOlivier Paroz2015-06-261-0/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-272-0/+12
| | |
* | | Merge pull request #17071 from owncloud/share-get-users-non-existingVincent Petry2015-06-261-2/+2
|\ \ \ | |/ / |/| | fix getUsersSharingFile with locking
| * | fix getUsersSharingFile with lockingRobin Appelman2015-06-261-2/+2
| | |
* | | Merge pull request #17191 from owncloud/issue-17188-group-share-part-fileThomas Müller2015-06-261-2/+6
|\ \ \ | | | | | | | | Correctly check if the real file exists, otherwise try the part file
| * | | Correctly check if the real file exists, otherwise try the part fileJoas Schilling2015-06-261-2/+6
| | | |
* | | | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-263-23/+70
|\ \ \ \ | |_|/ / |/| | | Improve splitting of username and remote adress when username contains an `@`
| * | | Use \OC\HintException and translate the hintJoas Schilling2015-06-224-34/+10
| | | |
| * | | Merge spliteUserRemote with fixRemoteUrlInShareWithJoas Schilling2015-06-222-25/+44
| | | |
| * | | make sure that we split username and server address at the first '@' from ↵Bjoern Schiessle2015-06-223-1/+53
| | | | | | | | | | | | | | | | the right to allow usernames containing '@'
* | | | Merge pull request #17009 from owncloud/lock-downloadfileThomas Müller2015-06-261-6/+21
|\ \ \ \ | |_|/ / |/| | | Lock file during download
| * | | Enable x-sendfile only if we do not lock the file systemThomas Müller2015-06-221-4/+8
| | | |
| * | | Lock file before downloadVincent Petry2015-06-181-2/+13
| | | | | | | | | | | | | | | | | | | | This will throw a LockedException if a concurrent request is currently touching that file.
* | | | Merge pull request #17165 from ↵Thomas Müller2015-06-261-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/federated_cloud_sharing_search_address_book Search address book for federated cloud id
| * | | | ne need to check twice if $row['share_with'] is setBjoern Schiessle2015-06-251-1/+1
| | | | |
| * | | | show nice display name for remote shares if possibleBjoern Schiessle2015-06-251-2/+11
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-262-0/+2
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-252-0/+2
| | | |
* | | | Merge pull request #17070 from owncloud/lock-movemountbugVincent Petry2015-06-242-23/+62
|\ \ \ \ | | | | | | | | | | Lock correct paths when moving mount
| * | | | Rollback folder scan if an entry was lockedVincent Petry2015-06-241-0/+5
| | | | |
| * | | | Fix locked paths in the moveMount caseVincent Petry2015-06-241-23/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #17110 from owncloud/share-error-handlingMorris Jobke2015-06-241-0/+1
|\ \ \ \ \ | | | | | | | | | | | | [sharing] handle shares of users that aren't available anymore
| * | | | | [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * properly handle the case where an abandoned share is left and simply skip it
* | | | | | Merge pull request #17136 from rullzer/fix_remove_link_OCSLukas Reschke2015-06-241-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Allow removing of link password in OCS again
| * | | | | set NULL correctly in password updateRoeland Jago Douma2015-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old code used 'NULL' but docterine wants null. Now it is possible again to remove the password from a link share.
* | | | | | Merge pull request #17130 from owncloud/update-mime-typesThomas Müller2015-06-241-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update wmv and add mts and mt2s
| * | | | | | Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107Thomas Müller2015-06-241-1/+3
| |/ / / / /
* | | | | | Merge pull request #17106 from owncloud/htaccess-update-only-onceMorris Jobke2015-06-241-4/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Only update the htaccess ErrorDocument links when they are not set yet
| * | | | | Only update the htaccess ErrorDocument links when they are not set yetJoas Schilling2015-06-231-4/+14
| | | | | |
* | | | | | Merge pull request #17095 from owncloud/proper-error-handlingMorris Jobke2015-06-232-4/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Proper error handling
| * | | | | [updater] keep maintenance active on failure and mark failure in redMorris Jobke2015-06-231-1/+1
| | | | | |
| * | | | | [updater] propagate error case properlyMorris Jobke2015-06-231-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add $success to the updateEnd hook * add new return code for a update failure * add exception class to failure hook message
| * | | | | Added error message on initMountpoints exceptionMorris Jobke2015-06-231-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #17045 from owncloud/enc_improvementsBjörn Schießle2015-06-231-3/+5
|\ \ \ \ \ | |_|/ / / |/| | | | encryption improvements
| * | | | make sure that we always read the header from the original fileBjoern Schiessle2015-06-231-3/+5
| | | | |
* | | | | [upgrade] print update message before running the update codeMorris Jobke2015-06-231-0/+1
| |/ / / |/| | | | | | | | | | | * otherwise you don't know during which app update something failed
* | | | Merge pull request #12546 from oparoz/patch-1Björn Schießle2015-06-221-21/+31
|\ \ \ \ | |_|/ / |/| | | Send the mime icon if we can't generate a preview
| * | | Remove unneeded returns from private cropping methodsOlivier Paroz2015-06-191-16/+12
| | | |
| * | | Remove unneeded returns from private cropping methodsOlivier Paroz2015-06-181-16/+6
| | | |
| * | | Move media type icon preview creation to its own methodOlivier Paroz2015-06-181-4/+25
| | | |
| * | | Send the mime icon if we can't generate a previewOlivier Paroz2015-06-181-1/+4
| | | |
* | | | Merge pull request #16657 from owncloud/view-emit-pathThomas Müller2015-06-221-2/+4
|\ \ \ \ | | | | | | | | | | emit hooks from a view as long as the path is inside the default root
| * | | | fix check if hooks should be emited in runHooksRobin Appelman2015-06-151-1/+2
| | | | |
| * | | | emit hooks from a view as long as the path is inside the default rootRobin Appelman2015-06-021-1/+2
| | | | |
* | | | | Merge pull request #17056 from owncloud/appframework-type-castBernhard Posselt2015-06-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Allow multiple whitespace in type hints in AppFramework
| * | | | | Allow multiple whitespace in type hints in AppFrameworkRobin McCorkell2015-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type hints such as `@param bool $doSomething` will now correctly get parsed, allowing for alignment of docblock parameters if the app developer so wishes.
* | | | | | Merge pull request #17052 from owncloud/fix-phpdoc-groupmgmRobin McCorkell2015-06-212-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use proper type
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 17:59:54 +0000