summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* add OCS api call to set expire date for link sharesBjoern Schiessle2014-07-252-7/+71
* 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
| * | | | use fileinfo object in search resultsJörn Friedrich Dreyer2014-07-091-9/+11
| | |/ / | |/| |
* | | | Merge pull request #8987 from owncloud/lastindexid-debugVincent Petry2014-07-152-2/+14
|\ \ \ \
| * | | | - Added test to trigger index id errorVincent Petry2014-07-142-2/+14
* | | | | Merge pull request #9561 from libasys/patch-3icewind19912014-07-151-1/+1
|\ \ \ \ \
| * | | | | Update share.phplibasys2014-07-101-1/+1
| * | | | | Update share.phplibasys2014-07-101-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #9621 from owncloud/fix_logger_implementationThomas Müller2014-07-151-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix logger implementation and testJörn Friedrich Dreyer2014-07-151-1/+1
| | |/ / | |/| |
* | | | Merge pull request #9562 from owncloud/users-groupfilterThomas Müller2014-07-151-50/+36
|\ \ \ \
| * | | | fixing PHPDocThomas Müller2014-07-141-16/+16
| * | | | remove dead codeArthur Schiwon2014-07-141-34/+20
* | | | | Use the correct path when building the FileInfo for the search resultRobin Appelman2014-07-141-1/+2
|/ / / /
* | | | Merge pull request #9228 from owncloud/remove-routing-singular-issuesMorris Jobke2014-07-141-12/+2
|\ \ \ \
| * | | | use id instead of resourceIdBernhard Posselt2014-06-261-11/+1
| * | | | dont strip the s from the resourceBernhard Posselt2014-06-261-2/+2
* | | | | Merge pull request #9598 from owncloud/fix-app-installation-masterThomas Müller2014-07-141-9/+4
|\ \ \ \ \
| * | | | | append file extension to the temporary file which contains the downloaded arc...Thomas Müller2014-07-111-9/+4
* | | | | | Add public interfaces for User, UserManager and UserSessionRobin Appelman2014-07-143-3/+6
| |_|/ / / |/| | | |
* | | | | Merge pull request #9539 from enoch85/patch-1Björn Schießle2014-07-141-14/+11
|\ \ \ \ \
| * | | | | Fix for #9422Daniel Hansson2014-07-091-14/+11
| | |_|/ / | |/| | |
* | | | | Merge pull request #9571 from owncloud/fix_appstore_update_issueVincent Petry2014-07-142-9/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | improve check for duplicate appsGeorg Ehrke2014-07-101-7/+2
| * | | | add proper version comparision in OC_Installer::isUpdateAvailableGeorg Ehrke2014-07-101-2/+1
| |/ / /
* | | | Merge pull request #9536 from owncloud/default-app-groups-masterMorris Jobke2014-07-101-97/+97
|\ \ \ \ | |/ / / |/| | |
| * | | adding 'groups' entry to remote appsThomas Müller2014-07-091-1/+2
| * | | fixing typosThomas Müller2014-07-091-97/+96
* | | | Merge pull request #9510 from libasys/patch-1Thomas Müller2014-07-091-1/+1
|\ \ \ \
| * | | | BugFix missing $item on 'file_target' Line 1911libasys2014-07-081-1/+1