summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* update license headers and authorsMorris Jobke2015-06-25145-97/+242
* [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
|/ / / /
* | | | Merge pull request #17041 from owncloud/ocp-since-checkerMorris Jobke2015-06-199-1/+28
|\ \ \ \
| * | | | Fix missing @since tags in OCPMorris Jobke2015-06-199-1/+28
| | |_|/ | |/| |
* / | | Fix naming of param in private/server.phpMorris Jobke2015-06-191-5/+5
|/ / /
* | | Merge pull request #16889 from owncloud/group-sorting-fixesJoas Schilling2015-06-192-0/+27
|\ \ \
| * | | Do not return backends but add a method to check for oneJoas Schilling2015-06-162-5/+19
| * | | Only sort by group name when LDAP is involvedJoas Schilling2015-06-162-0/+13
* | | | Merge pull request #16963 from owncloud/fileinfo-lockVincent Petry2015-06-183-29/+57
|\ \ \ \
| * | | | remove unneeded normalizeRobin Appelman2015-06-181-2/+0
| * | | | unlock the file if the file doesnt existsRobin Appelman2015-06-181-0/+2
| * | | | use old cache data when lockedRobin Appelman2015-06-171-28/+49
| * | | | handle locked exceptions when getting file/directory info in sabreRobin Appelman2015-06-172-1/+8
* | | | | Merge pull request #17017 from owncloud/cache-update-write-lockVincent Petry2015-06-184-34/+47
|\ \ \ \ \
| * | | | | dont update the cache on rename failRobin Appelman2015-06-181-1/+1
| * | | | | update noopscannerRobin Appelman2015-06-181-3/+3
| * | | | | extends phpdocRobin Appelman2015-06-181-3/+4
| * | | | | update the file cache within the write lockRobin Appelman2015-06-183-31/+43
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-182-0/+10