summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* make sure that 'OC_Theme' exists before checking if the method existsBjoern Schiessle2014-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
* | | | Merge pull request #9507 from owncloud/fix-9302-masterThomas Müller2014-07-082-104/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | Upload abortion is now detected within the OC_Connector_Sabre_File::put()Thomas Müller2014-07-082-104/+14
| |/ /
* | | Merge pull request #9412 from owncloud/public-api-activityThomas Müller2014-07-082-1/+196
|\ \ \
| * | | Adding new interface \OCP\Activity\IExtentsionThomas Müller2014-07-082-1/+196
| |/ /
* | | port of #9500Arthur Schiwon2014-07-082-3/+12
* | | use case insensitive LIKE when searching for files in mysqlRobin Appelman2014-07-081-0/+2
* | | Add repair step to set MySQL collation to utf8_binRobin Appelman2014-07-083-2/+4
|/ /
* | Merge pull request #9502 from owncloud/add_ocsidsMorris Jobke2014-07-071-0/+3
|\ \
| * | add ocsids to info.xmlGeorg Ehrke2014-07-071-0/+3
* | | Merge pull request #9494 from owncloud/issue/9490Morris Jobke2014-07-071-1/+1
|\ \ \ | |/ / |/| |
| * | Only overwrite serverHost when in unit testsJoas Schilling2014-07-071-1/+1
* | | MySQL: adding repair step to convert MyIsam tables to InnoDBThomas Müller2014-07-071-0/+1
* | | Merge pull request #9468 from owncloud/fix_logout_error_messagesVincent Petry2014-07-071-1/+4
|\ \ \ | |/ / |/| |
| * | fix phpDocBlock for OC_App::getAppInfoGeorg Ehrke2014-07-051-1/+1
| * | better validation: cadd extra check if appinfo/info.xml existsGeorg Ehrke2014-07-051-0/+3
* | | Merge pull request #9419 from owncloud/fix_search_results_in_root_dirJörn Friedrich Dreyer2014-07-041-0/+4
|\ \ \
| * | | deprecate OC_Search_Provider in favor of \OCP\Search\ProviderJörn Friedrich Dreyer2014-07-031-0/+4
* | | | Merge pull request #9357 from owncloud/sharing_unshare_on_deleteBjörn Schießle2014-07-041-3/+13
|\ \ \ \
| * | | | make sure that the umount hook always contains the path relative to data/user...Bjoern Schiessle2014-07-041-3/+13
* | | | | Merge pull request #9445 from owncloud/filelist-auth-erroricewind19912014-07-041-6/+6
|\ \ \ \ \
| * | | | | Add machine readable error messages to OC\JSONRobin Appelman2014-07-041-6/+6
| | |_|/ / | |/| | |
* | | | | Merge pull request #8308 from owncloud/case_insensitive_search_oracleJörn Friedrich Dreyer2014-07-041-3/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | make search case insensitive on postgres and oracleJörn Friedrich Dreyer2014-07-031-3/+21
* | | | | Merge pull request #9269 from owncloud/fix_versions_previewThomas Müller2014-07-042-0/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | introduce and use getCurrentConnection()Jörn Friedrich Dreyer2014-07-012-1/+18
| * | | | reset collection to 'root' after adding a route to the apiJörn Friedrich Dreyer2014-07-011-0/+1
* | | | | Remove forgotten debug logVincent Petry2014-07-031-1/+0
| |_|/ / |/| | |
* | | | Merge pull request #9329 from owncloud/sharing_check_targetVincent Petry2014-07-023-9/+36
|\ \ \ \
| * | | | don't move a share mount point into a different mount pointBjoern Schiessle2014-07-011-7/+34