summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* 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!
* | | 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-082-1/+196
|\ \ | | | | | | Public api activity
| * | Adding new interface \OCP\Activity\IExtentsionThomas Müller2014-07-082-1/+196
| |/ | | | | | | | | | | | | | | | | | | | | | | 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-083-2/+4
|/ | | | | Set default collation of mysql connection to utf8_bin Set utf_bin as default collation for new tables
* 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-071-1/+1
|\ \ | |/ |/| [issues/9490] \OC::$WEBROOT is invalid when called from cron.php
| * 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-071-0/+1
| |
* | 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
| |
* | 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
| * | | | Add machine readable error messages to OC\JSONRobin Appelman2014-07-041-6/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload the files app in case of authentication errors, expired tokens or disabled app Reloading will triger the full server side handeling of those errors formatting fix missing semicolon + some jshint warnings
* | | | Merge pull request #8308 from owncloud/case_insensitive_search_oracleJörn Friedrich Dreyer2014-07-041-3/+21
|\ \ \ \ | |/ / / |/| | | use case insensitive linguistic sort and compare when connecting to oracle
| * | | 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
|\ \ \ \ | |_|/ / |/| | | change order of registering api and capabilities to fix file version previews
| * | | 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 point
| * | | don't move a share mount point into a different mount pointBjoern Schiessle2014-07-011-7/+34
| | | |
| * | | add a explicit interface for the home storageBjoern Schiessle2014-07-012-2/+2
| | | |
* | | | Merge pull request #9311 from owncloud/storage-not-availableVincent Petry2014-07-023-18/+40
|\ \ \ \ | | | | | | | | | | Handle storages not being available in webui and webdav
| * | | | Remove invalid mounts from the active fsRobin Appelman2014-07-021-0/+4
| | | | |
| * | | | Catch StorageInvalidException in webdavRobin Appelman2014-07-011-0/+3
| | | | |
| * | | | Handle StorageNotAvailableException in webdavRobin Appelman2014-06-301-1/+6
| | | | |
| * | | | Add StorageNotAvailableExceptionRobin Appelman2014-06-301-17/+27
| | | | |
* | | | | Merge pull request #9288 from owncloud/fix_dispatcher_null_valuesMorris Jobke2014-07-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | don't typecast null values inside dispatcher.php
| * | | | | don't typecast null values inside dispatcher.phpGeorg Ehrke2014-06-291-1/+1
| | | | | |
* | | | | | Merge pull request #9338 from owncloud/fix-redirect-for-appframeworkVolkan Gezer2014-07-021-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Redirect after session expiry to the previous loaded page
| * | | | | | Redirect after session expiry to the previous loaded pageMorris Jobke2014-07-011-0/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * fixes #6945
* | | | | | Merge pull request #9327 from owncloud/migrator-postgreskeywordtestVincent Petry2014-07-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added migrator test for reserved keyword
| * | | | | | Fix migrator tests to use the correct migrator instancesVincent Petry2014-07-011-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #9334 from owncloud/defaultappfixVincent Petry2014-07-012-6/+28
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Default app fix
| * | | | | Added unit test for default app URLVincent Petry2014-07-011-1/+1
| | | | | |
| * | | | | Use getAbsoluteUrl for redirection URLVincent Petry2014-07-011-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also separate the function into getDefaultPageUrl() and redirectToDefaultPage() to make it testable.
| * | | | | Support for multiple default appsVincent Petry2014-07-011-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a default app isn't visible for the user, try the next one. Else fallback to the "files" app.