summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17206 from oparoz/bpg-media-typeRoeland Douma2015-06-271-0/+1
|\
| * 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 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 fileJoas Schilling2015-06-261-2/+6
* | | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-263-23/+70
|\ \ \ | |_|/ |/| |
| * | 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 the...Bjoern Schiessle2015-06-223-1/+53
* | | Merge pull request #17009 from owncloud/lock-downloadfileThomas Müller2015-06-261-6/+21
|\ \ \ | |_|/ |/| |
| * | 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
* | | Merge pull request #17165 from owncloud/federated_cloud_sharing_search_addres...Thomas Müller2015-06-261-3/+12
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
* | | | | Merge pull request #17110 from owncloud/share-error-handlingMorris Jobke2015-06-241-0/+1
|\ \ \ \ \
| * | | | | [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-0/+1
* | | | | | Merge pull request #17136 from rullzer/fix_remove_link_OCSLukas Reschke2015-06-241-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | set NULL correctly in password updateRoeland Jago Douma2015-06-241-1/+1
* | | | | | Merge pull request #17130 from owncloud/update-mime-typesThomas Müller2015-06-241-1/+3
|\ \ \ \ \ \
| * | | | | | 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 yetJoas Schilling2015-06-231-4/+14
* | | | | | Merge pull request #17095 from owncloud/proper-error-handlingMorris Jobke2015-06-232-4/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [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
| * | | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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
| |/ / / |/| | |
* | | | Merge pull request #12546 from oparoz/patch-1Björn Schießle2015-06-221-21/+31
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|\ \ \ \
| * | | | 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 AppFrameworkRobin McCorkell2015-06-201-1/+1
* | | | | | Merge pull request #17052 from owncloud/fix-phpdoc-groupmgmRobin McCorkell2015-06-212-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use proper typeLukas Reschke2015-06-192-2/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-202-0/+6
|/ / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 14:55:28 +0000