summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9798 from owncloud/ocs_share_api_add_expire_dateBjörn Schießle2014-07-282-7/+71
|\
| * add OCS api call to set expire date for link sharesBjoern Schiessle2014-07-252-7/+71
* | Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hosterMorris Jobke2014-07-282-2/+27
|\ \
| * | generate copy of sqlite database file in data directoryThomas Müller2014-07-282-2/+27
* | | Merge pull request #9924 from owncloud/eventsource-nginx-bufferingRobin Appelman2014-07-281-0/+2
|\ \ \
| * | | Prevent nginx from buffering event source eventsRobin Appelman2014-07-261-0/+2
* | | | Merge pull request #9784 from josh4trunks/libreoffice_match_clThomas Müller2014-07-281-3/+2
|\ \ \ \
| * | | | Cleanup Document Previewjosh4trunks2014-07-221-3/+2
| | |_|/ | |/| |
* | | | Merge pull request #9641 from owncloud/localuser-addressbookThomas Müller2014-07-281-0/+104
|\ \ \ \
| * | | | ownCloud users are exported as address bookThomas Müller2014-07-241-0/+104
* | | | | Merge pull request #9631 from owncloud/update-getid3Thomas Müller2014-07-281-2/+0
|\ \ \ \ \
| * | | | | add autoloadMorris Jobke2014-07-251-2/+0
| * | | | | update getID3 libraryMorris Jobke2014-07-251-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #9819 from owncloud/updater-setversionafterupdateThomas Müller2014-07-281-2/+3
|\ \ \ \ \
| * | | | | Set version AFTER a successful updateVincent Petry2014-07-231-2/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #9859 from tiezdne/masterThomas Müller2014-07-281-0/+2
|\ \ \ \ \
| * | | | | Update mimetypes.list.phptiezdne2014-07-241-0/+2
* | | | | | Merge pull request #9905 from owncloud/joblist-non-existing-classThomas Müller2014-07-281-1/+4
|\ \ \ \ \ \
| * | | | | | Dont try to execute jobs that no longer existRobin Appelman2014-07-251-1/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #9935 from owncloud/harden-get-urlcoThomas Müller2014-07-281-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Verify whether the URL is validLukas Reschke2014-07-271-0/+5
* | | | | | Merge pull request #9904 from owncloud/loggedout-getuserfolderThomas Müller2014-07-281-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Dont throw an error when calling $server->getUserFolder when logged outRobin Appelman2014-07-251-1/+5
| |/ / / /
* | | | | Merge pull request #9669 from owncloud/group-publicRobin Appelman2014-07-254-48/+64
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add group management to the public apiRobin Appelman2014-07-164-48/+64
* | | | | Merge pull request #9841 from owncloud/fix-password-reset-masterThomas Müller2014-07-241-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | - adding default value for $recoveryPasswordThomas Müller2014-07-241-1/+1
* | | | | register type mappings for unknown/unsupported mysql typesThomas Müller2014-07-241-0/+4
|/ / / /
* | / / only commit in case a transaction is activeThomas Müller2014-07-231-1/+3
| |/ / |/| |
* | | Revert changeSander2014-07-221-2/+2
* | | Allow getAppFolder to get another apps pathSander2014-07-221-3/+2
* | | adding special handling of checkPrecondition() for chunked uploadThomas Müller2014-07-221-0/+31
* | | perm -> permissionsThomas Müller2014-07-211-1/+1
* | | Merge pull request #9406 from philfry/masterVincent Petry2014-07-211-0/+1
|\ \ \
| * | | silently discard the response body, needed for apache/mod_dav and maybe other...Philippe Kueck2014-07-031-0/+1
* | | | Merge pull request #9672 from owncloud/mysql-affectedrowsAndreas Fischer2014-07-201-1/+9
|\ \ \ \
| * | | | Document why we have to check with defined() first.Andreas Fischer2014-07-161-0/+2
| * | | | Make MySQL return "number of found rows" instead of number of "affected rows".Andreas Fischer2014-07-161-1/+7
* | | | | update appstore api urlFrank Karlitschek2014-07-171-1/+1
* | | | | Fix renaming files in the root folder of a MappedLocal storageRobin Appelman2014-07-161-2/+17
* | | | | Merge pull request #9550 from kofemann/dcache-fixes-for-upstreamicewind19912014-07-162-4/+22
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | files: storage: rename should check parent directories of old and new filesTigran Mkrtchyan2014-07-102-4/+22
* | | | | Port of #9584Stephan Peijnik2014-07-161-1/+15
* | | | | Merge pull request #9640 from owncloud/fix_9627Björn Schießle2014-07-161-1/+1
|\ \ \ \ \
| * | | | | make sure that 'OC_Theme' exists before checking if the method existsBjoern Schiessle2014-07-151-1/+1
* | | | | | Merge pull request #9644 from owncloud/fix_user_apiThomas Müller2014-07-151-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | use UserSession service to resolve user idJörn Friedrich Dreyer2014-07-151-1/+1
* | | | | | Merge pull request #9540 from owncloud/use_fileinfo_in_search_resultsblizzz2014-07-151-33/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | mkae getRelativePath of file search results overwriteable in subclassesJörn Friedrich Dreyer2014-07-141-2/+1
| * | | | | return relative pathJörn Friedrich Dreyer2014-07-141-27/+15