summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | 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
* | | | | 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
| | |_|/ | |/| |