summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5643 from nextcloud/codeownersMorris Jobke2017-07-072-34/+2
|\ | | | | Move mention-bot notifications to code owners
| * Move mention-bot notifications to code ownersJoas Schilling2017-07-072-34/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5615 from ↵Morris Jobke2017-07-072-13/+64
|\ \ | | | | | | | | | | | | nextcloud/issue-5286-fix-navigation-entries-for-group-restricted-apps Don't load navigation entries of restricted apps
| * | Don't load navigation entries of restricted appsJoas Schilling2017-07-052-13/+64
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-0726-78/+138
| | |
* | | Merge pull request #5424 from nextcloud/moveFromCache-from-sharedMorris Jobke2017-07-067-3/+313
|\ \ \ | | | | | | | | fix moving folders out of a cache jail
| * | | adjust to moved repair stepRobin Appelman2017-06-293-4/+14
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Run repair step only onceMorris Jobke2017-06-225-5/+11
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Add repair step for invalid pathsRobin Appelman2017-06-213-2/+236
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | fix moving folders out of a cache jailRobin Appelman2017-06-152-1/+61
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #5174 from nextcloud/new-encryption-defaultMorris Jobke2017-07-0623-36/+387
|\ \ \ \ | |_|_|/ |/| | | Use the master key by default
| * | | adjust encryption tests to the new master key defaultBjoern Schiessle2017-07-061-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | update sharing test to new master key defaultBjoern Schiessle2017-07-061-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | update file system tests to take the master key into accountBjoern Schiessle2017-07-062-15/+25
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | fix and extend dav test to also test the master-key setupBjoern Schiessle2017-07-063-0/+54
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | no warning on password change if no encryption module uses per-user keysBjoern Schiessle2017-07-062-5/+54
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | since the default for the master key changed we need to write the setting ↵Bjoern Schiessle2017-07-062-1/+84
| | | | | | | | | | | | | | | | | | | | | | | | explicitely to the database if we migrate from a older version Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | add occ command to disable the master key againBjoern Schiessle2017-07-061-0/+89
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | improve status messagesBjoern Schiessle2017-07-064-7/+27
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | after the master key was loaded we are ready to go, no re-login neededBjoern Schiessle2017-07-063-4/+17
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | only collect detailed access list if it is really neededBjoern Schiessle2017-07-064-2/+32
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | make master key the new defaultBjoern Schiessle2017-07-062-1/+2
|/ / / | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-0612-0/+18
| | |
* | | Merge pull request #5404 from ↵blizzz2017-07-051-0/+4
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/use-translated-hint-insteadof-english-error Use translated Hint instead of english error on password policy
| * | | Use translated Hint instead of english error on password policyJoas Schilling2017-06-141-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #5231 from nextcloud/migrationsMorris Jobke2017-07-0536-114/+1995
|\ \ \ \ | | | | | | | | | | Migrations
| * | | | Fix autoloader and namespace testMorris Jobke2017-07-053-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Add migration for personal settings stuffJoas Schilling2017-07-053-5/+96
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix the installer testsJoas Schilling2017-07-052-1/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix tests of CodeChecker and MigrationServiceJoas Schilling2017-07-056-29/+84
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Register autoloading before running migrationsJoas Schilling2017-07-052-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Update autoloadingJoas Schilling2017-07-052-0/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Check the migration files for table, column and index length errorsJoas Schilling2017-07-053-3/+213
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix dropping tables and handle the prefix automaticallyJoas Schilling2017-07-054-11/+148
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Move twofactor_backupcodes to migrationsJoas Schilling2017-07-054-86/+103
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Allow to check the schema in pre and post as wellJoas Schilling2017-07-054-15/+34
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add a version to migrations, so parallel legacy branches can also have ↵Joas Schilling2017-07-052-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migrations Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add author and copyrightJoas Schilling2017-07-053-0/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Do not allow to go back on productive systemsJoas Schilling2017-07-052-2/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix code issuesJoas Schilling2017-07-051-11/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Use autoloading instead of require_once from a different dirJoas Schilling2017-07-051-12/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Adjust the code to use our interface and abstractJoas Schilling2017-07-054-78/+99
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Use migrations when there is no database.xmlJoas Schilling2017-07-052-3/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Start migrationsJoas Schilling2017-07-0518-17/+1260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixme: - Install and update of apps - No revert on live systems (debug only) - Service adjustment to our interface - Loading via autoloader Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #5621 from ↵Morris Jobke2017-07-056-15/+227
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-sorting-of-favorite-files-in-file-list Fix sorting of favorite files in file list
| * | | | | Fix sorting of favorite filesDaniel Calviño Sánchez2017-07-054-15/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sort comparator checks the "isFavorite" property of the FileInfo objects to compare. That property is set when the file list is loaded and the response from the server is parsed, and thus a freshly loaded file list has the proper sorting for favorite files. However, the property is not set in other cases, like when the FileInfo objects are derived from FileInfoModels due to a file being marked as a favorite or a text editor being closed, which causes the file to be sorted in the wrong position. There is no need to add the property in those situations, though; in all cases the TagsPlugin adds a "tags" array property that contains an OC.TAG_FAVORITE tag, so that tag can be checked instead of "isFavorite". Moreover, although "isFavorite" was added by the main "_parseFileInfo" function it did not really belong there but to the "FileInfoParser" from the TagsPlugin; however, as that property now is not used anywhere it was removed altogether. A cleaner solution would have been to make the sort comparator extensible by plugins like other behaviours of the file list and then add the sorting logic related to favorite files to the TagsPlugin. However, right now only the TagsPlugin would need to alter the main sorting logic, and it seems like a corner case anyway. Even if it is implemented as a plugin, favorite files is a core feature, so for the time being it will be taken into account directly in the main sorting logic; making the sort comparator extensible by plugins is defered until there are other use cases for that. Fixes #5410 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add acceptance tests for sorting of favorite filesDaniel Calviño Sánchez2017-07-052-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #5520 from nextcloud/disable-click-on-hintMorris Jobke2017-07-051-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | [Small] Hint should not be clickable
| * | | | | | Hint should not be clickableMaxence Lange2017-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | | | | | Merge pull request #5580 from nextcloud/admin-audit-updateMorris Jobke2017-07-0514-238/+346
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Admin audit update