Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9536 from owncloud/default-app-groups-master | Morris Jobke | 2014-07-10 | 1 | -97/+97 |
|\ | | | | | Default app groups master | ||||
| * | adding 'groups' entry to remote apps | Thomas Müller | 2014-07-09 | 1 | -1/+2 |
| | | |||||
| * | fixing typos | Thomas Müller | 2014-07-09 | 1 | -97/+96 |
| | | |||||
* | | Merge pull request #9510 from libasys/patch-1 | Thomas Müller | 2014-07-09 | 1 | -1/+1 |
|\ \ | | | | | | | BugFix missing $item on 'file_target' Line 1911 | ||||
| * | | BugFix missing $item on 'file_target' Line 1911 | libasys | 2014-07-08 | 1 | -1/+1 |
| | | | | | | | | | I think this should be right! | ||||
* | | | Merge pull request #9507 from owncloud/fix-9302-master | Thomas Müller | 2014-07-08 | 2 | -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üller | 2014-07-08 | 2 | -104/+14 |
| |/ | | | | | | | | | | | OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless Adding unit test testUploadAbort() | ||||
* | | Merge pull request #9412 from owncloud/public-api-activity | Thomas Müller | 2014-07-08 | 2 | -1/+196 |
|\ \ | | | | | | | Public api activity | ||||
| * | | Adding new interface \OCP\Activity\IExtentsion | Thomas Müller | 2014-07-08 | 2 | -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 #9500 | Arthur Schiwon | 2014-07-08 | 2 | -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 mysql | Robin Appelman | 2014-07-08 | 1 | -0/+2 |
| | | |||||
* | | Add repair step to set MySQL collation to utf8_bin | Robin Appelman | 2014-07-08 | 3 | -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_ocsids | Morris Jobke | 2014-07-07 | 1 | -0/+3 |
|\ | | | | | Add ocsids for shipped apps in core repo | ||||
| * | add ocsids to info.xml | Georg Ehrke | 2014-07-07 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #9494 from owncloud/issue/9490 | Morris Jobke | 2014-07-07 | 1 | -1/+1 |
|\ \ | |/ |/| | [issues/9490] \OC::$WEBROOT is invalid when called from cron.php | ||||
| * | Only overwrite serverHost when in unit tests | Joas Schilling | 2014-07-07 | 1 | -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 InnoDB | Thomas Müller | 2014-07-07 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #9468 from owncloud/fix_logout_error_messages | Vincent Petry | 2014-07-07 | 1 | -1/+4 |
|\ \ | |/ |/| | better validation: cadd extra check if appinfo/info.xml exists | ||||
| * | fix phpDocBlock for OC_App::getAppInfo | Georg Ehrke | 2014-07-05 | 1 | -1/+1 |
| | | |||||
| * | better validation: cadd extra check if appinfo/info.xml exists | Georg Ehrke | 2014-07-05 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #9419 from owncloud/fix_search_results_in_root_dir | Jörn Friedrich Dreyer | 2014-07-04 | 1 | -0/+4 |
|\ \ | | | | | | | Fix search results in root dir & deprecate OC_Search_Provider | ||||
| * | | deprecate OC_Search_Provider in favor of \OCP\Search\Provider | Jörn Friedrich Dreyer | 2014-07-03 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #9357 from owncloud/sharing_unshare_on_delete | Björn Schießle | 2014-07-04 | 1 | -3/+13 |
|\ \ \ | | | | | | | | | [sharing] unshare childrens on delete | ||||
| * | | | make sure that the umount hook always contains the path relative to ↵ | Bjoern Schiessle | 2014-07-04 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | data/user/files | ||||
* | | | | Merge pull request #9445 from owncloud/filelist-auth-error | icewind1991 | 2014-07-04 | 1 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | Reload the page when the files app encounters an authentication error | ||||
| * | | | | Add machine readable error messages to OC\JSON | Robin Appelman | 2014-07-04 | 1 | -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_oracle | Jörn Friedrich Dreyer | 2014-07-04 | 1 | -3/+21 |
|\ \ \ \ | |/ / / |/| | | | use case insensitive linguistic sort and compare when connecting to oracle | ||||
| * | | | make search case insensitive on postgres and oracle | Jörn Friedrich Dreyer | 2014-07-03 | 1 | -3/+21 |
| | | | | |||||
* | | | | Merge pull request #9269 from owncloud/fix_versions_preview | Thomas Müller | 2014-07-04 | 2 | -0/+18 |
|\ \ \ \ | |_|/ / |/| | | | change order of registering api and capabilities to fix file version previews | ||||
| * | | | introduce and use getCurrentConnection() | Jörn Friedrich Dreyer | 2014-07-01 | 2 | -1/+18 |
| | | | | |||||
| * | | | reset collection to 'root' after adding a route to the api | Jörn Friedrich Dreyer | 2014-07-01 | 1 | -0/+1 |
| | | | | |||||
* | | | | Remove forgotten debug log | Vincent Petry | 2014-07-03 | 1 | -1/+0 |
| |_|/ |/| | | |||||
* | | | Merge pull request #9329 from owncloud/sharing_check_target | Vincent Petry | 2014-07-02 | 3 | -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 point | Bjoern Schiessle | 2014-07-01 | 1 | -7/+34 |
| | | | | |||||
| * | | | add a explicit interface for the home storage | Bjoern Schiessle | 2014-07-01 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #9311 from owncloud/storage-not-available | Vincent Petry | 2014-07-02 | 3 | -18/+40 |
|\ \ \ \ | | | | | | | | | | | Handle storages not being available in webui and webdav | ||||
| * | | | | Remove invalid mounts from the active fs | Robin Appelman | 2014-07-02 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Catch StorageInvalidException in webdav | Robin Appelman | 2014-07-01 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Handle StorageNotAvailableException in webdav | Robin Appelman | 2014-06-30 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Add StorageNotAvailableException | Robin Appelman | 2014-06-30 | 1 | -17/+27 |
| | | | | | |||||
* | | | | | Merge pull request #9288 from owncloud/fix_dispatcher_null_values | Morris Jobke | 2014-07-02 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | don't typecast null values inside dispatcher.php | ||||
| * | | | | | don't typecast null values inside dispatcher.php | Georg Ehrke | 2014-06-29 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #9338 from owncloud/fix-redirect-for-appframework | Volkan Gezer | 2014-07-02 | 1 | -0/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Redirect after session expiry to the previous loaded page | ||||
| * | | | | | | Redirect after session expiry to the previous loaded page | Morris Jobke | 2014-07-01 | 1 | -0/+2 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | * fixes #6945 | ||||
* | | | | | | Merge pull request #9327 from owncloud/migrator-postgreskeywordtest | Vincent Petry | 2014-07-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added migrator test for reserved keyword | ||||
| * | | | | | | Fix migrator tests to use the correct migrator instances | Vincent Petry | 2014-07-01 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #9334 from owncloud/defaultappfix | Vincent Petry | 2014-07-01 | 2 | -6/+28 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Default app fix | ||||
| * | | | | | Added unit test for default app URL | Vincent Petry | 2014-07-01 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Use getAbsoluteUrl for redirection URL | Vincent Petry | 2014-07-01 | 1 | -5/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also separate the function into getDefaultPageUrl() and redirectToDefaultPage() to make it testable. | ||||
| * | | | | | Support for multiple default apps | Vincent Petry | 2014-07-01 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a default app isn't visible for the user, try the next one. Else fallback to the "files" app. |