summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-151-0/+1
|
* Merge pull request #9562 from owncloud/users-groupfilterThomas Müller2014-07-151-50/+36
|\ | | | | Do not filter groups, but therefore update the user counts according to the filter
| * fixing PHPDocThomas Müller2014-07-141-16/+16
| |
| * remove dead codeArthur Schiwon2014-07-141-34/+20
| | | | | | | | | | | | | | | | | | | | do not filter groups. but update the user count according to the filter improve phpdoc improve metadata runtime cache add metadata tests
* | 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
|\ | | | | Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns
| * 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 downloade...
| * | append file extension to the temporary file which contains the downloaded ↵Thomas Müller2014-07-111-9/+4
| | | | | | | | | | | | archive - in case of zip files fileinfo doesn't seem to return anything reliable
* | | Expose the user manager in the public server containerRobin Appelman2014-07-141-0/+7
| | |
* | | Add public interfaces for User, UserManager and UserSessionRobin Appelman2014-07-146-3/+229
| | |
* | | Merge pull request #9539 from enoch85/patch-1Björn Schießle2014-07-141-14/+11
|\ \ \ | | | | | | | | Fix for #9422
| * | | Fix for #9422Daniel Hansson2014-07-091-14/+11
| | | |
* | | | Merge pull request #9571 from owncloud/fix_appstore_update_issueVincent Petry2014-07-142-9/+3
|\ \ \ \ | | | | | | | | | | Fix update to button issue
| * | | | improve check for duplicate appsGeorg Ehrke2014-07-101-7/+2
| | | | |
| * | | | add proper version comparision in OC_Installer::isUpdateAvailableGeorg Ehrke2014-07-101-2/+1
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-131-1/+20
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-123-1/+24
| |/ / |/| |
* | | Merge pull request #9536 from owncloud/default-app-groups-masterMorris Jobke2014-07-101-97/+97
|\ \ \ | |/ / |/| | Default app groups master
| * | 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 1911
| * | | BugFix missing $item on 'file_target' Line 1911libasys2014-07-081-1/+1
| | | | | | | | | | | | I think this should be right!
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-091-2/+5
| | | |
* | | | 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...
| * | | Upload abortion is now detected within the OC_Connector_Sabre_File::put()Thomas Müller2014-07-082-104/+14
| |/ / | | | | | | | | | | | | | | | OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless Adding unit test testUploadAbort()
* | | Merge pull request #9412 from owncloud/public-api-activityThomas Müller2014-07-084-2/+387
|\ \ \ | | | | | | | | Public api activity
| * | | Adding new interface \OCP\Activity\IExtentsionThomas Müller2014-07-084-2/+387
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding method getNotificationTypes() Adding method filterNotificationTypes() Adding method getDefaultTypes() Adding method translate() and getTypeIcon() Adding method getGroupParameter() Adding method getNavigation() Adding method getNavigation() Adding method isFilterValid() and getQueryForFilter() Adding unit tests for \OC\ActivityManager
* | | port of #9500Arthur Schiwon2014-07-082-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't trigger update from checkPassword, it is already called by userExists, this is enough. do not write to database when the value is the same add test cases. also split test classes in a file each, looks like only the first class is being executed also appconfig shall not write to database if the value is unchanged
* | | 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-084-2/+79
|/ / | | | | | | | | Set default collation of mysql connection to utf8_bin Set utf_bin as default collation for new tables
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-082-8/+15
| |
* | Merge pull request #9502 from owncloud/add_ocsidsMorris Jobke2014-07-071-0/+3
|\ \ | | | | | | Add ocsids for shipped apps in core repo
| * | add ocsids to info.xmlGeorg Ehrke2014-07-071-0/+3
| | |
* | | Merge pull request #9494 from owncloud/issue/9490Morris Jobke2014-07-072-4/+12
|\ \ \ | |/ / |/| | [issues/9490] \OC::$WEBROOT is invalid when called from cron.php
| * | Only calculate the WEBROOT from scriptName if it contains $SUBURIJoas Schilling2014-07-071-3/+11
| | | | | | | | | | | | | | | | | | | | | If not we are most likely in CLI mode. However to be able to still generate valid URLs, we need to use the overwrite webroot instead. Fix #9490
| * | Only overwrite serverHost when in unit testsJoas Schilling2014-07-071-1/+1
| | | | | | | | | | | | | | | The intention of the original commit 12f7cb87679453fa96c796df857b7e7193d4ee09 was to fix tests. But cron should always return a valid host not localhost.
* | | MySQL: adding repair step to convert MyIsam tables to InnoDBThomas Müller2014-07-072-0/+52
| | |
* | | Merge pull request #9468 from owncloud/fix_logout_error_messagesVincent Petry2014-07-071-1/+4
|\ \ \ | |/ / |/| | better validation: cadd extra check if appinfo/info.xml exists
| * | 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
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-072-0/+5
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-062-3/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-052-1/+31
| | |
* | | Merge pull request #9419 from owncloud/fix_search_results_in_root_dirJörn Friedrich Dreyer2014-07-041-0/+4
|\ \ \ | | | | | | | | Fix search results in root dir & deprecate OC_Search_Provider
| * | | 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
|\ \ \ \ | | | | | | | | | | [sharing] unshare childrens on delete
| * | | | make sure that the umount hook always contains the path relative to ↵Bjoern Schiessle2014-07-041-3/+13
| | | | | | | | | | | | | | | | | | | | data/user/files
* | | | | Merge pull request #9445 from owncloud/filelist-auth-erroricewind19912014-07-041-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Reload the page when the files app encounters an authentication error