summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5656 from ↵Morris Jobke2017-07-101-0/+1
|\ | | | | | | | | nextcloud/fix-unselecting-items-on-multi-select-dropdowns Fix unselecting items on multi select dropdowns
| * Add select2-toggleselect to the JavaScript files to loadDaniel Calviño Sánchez2017-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | "select2-toggleselect.js" provides an extension to Select2 that makes possible to unselect items in a multi-select dropdown by clicking on them. It seems that its load slipped through when moving things around in commit 6a470e59356b8c52115fe2790666027f38977604; this commit adds it to the JavaScript files to be loaded in the same position that it should have had in that commit (based on how the other declarations were moved). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | [tx-robot] updated from transifexNextcloud bot2017-07-102-14/+14
| |
* | [tx-robot] updated from transifexNextcloud bot2017-07-092-0/+42
| |
* | Merge pull request #5628 from ↵Morris Jobke2017-07-071-0/+17
|\ \ | | | | | | | | | | | | nextcloud/only-create-the-migration-dir-when-necessary Only create the migration directory when necessary
| * | Only create the migration directory when necessaryJoas Schilling2017-07-061-0/+17
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emailsMorris Jobke2017-07-079-0/+0
|\ \ | |/ |/| Use PNGs for icons in activity emails
| * Use PNG version of the icons for shipped activitiesJoas Schilling2017-06-209-0/+0
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5231 from nextcloud/migrationsMorris Jobke2017-07-057-1/+517
|\ \ | | | | | | Migrations
| * | Add migration for personal settings stuffJoas Schilling2017-07-051-0/+93
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Check the migration files for table, column and index length errorsJoas Schilling2017-07-051-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow to check the schema in pre and post as wellJoas Schilling2017-07-051-4/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add a version to migrations, so parallel legacy branches can also have ↵Joas Schilling2017-07-051-9/+19
| | | | | | | | | | | | | | | | | | migrations Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add author and copyrightJoas Schilling2017-07-052-0/+6
| | | | | | | | | | | | 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>
| * | Adjust the code to use our interface and abstractJoas Schilling2017-07-051-63/+27
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Start migrationsJoas Schilling2017-07-055-0/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-052-13/+1
|\ \ \ | | | | | | | | | | | | | | | | 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-052-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | 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 #5441 from nextcloud/custom-theme-updateMorris Jobke2017-07-052-0/+65
|\ \ \ \ | | | | | | | | | | Add command to apply updates to custom themes
| * | | | Add command to apply updates to custom themesJulius Härtl2017-07-052-0/+65
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-052-2/+2
| |_|/ / |/| | |
* | | | Merge pull request #5407 from nextcloud/5157-simple-logoMorris Jobke2017-07-045-19/+14
|\ \ \ \ | | | | | | | | | | Simplified Nextcloud logo icon #2
| * | | | Revert background-size as requested, issue will be fixed separatelyMarin Treselj2017-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
| * | | | Simplified Nextcloud logo iconMarin Treselj2017-07-025-20/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-042-30/+30
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-034-14/+16
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-022-0/+592
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-014-2/+4
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-302-0/+4
| | | |
* | | | Merge pull request #5490 from nextcloud/add-clear-site-data-headerLukas Reschke2017-06-291-1/+3
|\ \ \ \ | | | | | | | | | | Add Clear-Site-Data header
| * | | | Add Clear-Site-Data headerLukas Reschke2017-06-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a Clear-Site-Data header to the logout response which will delete all relevant data in the caches which may contain potentially sensitive content. See https://w3c.github.io/webappsec-clear-site-data/#header for the definition of the types. Ref https://twitter.com/mikewest/status/877149667909406723 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-272-4/+6
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-262-2/+42
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-252-2/+2
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-222-0/+2
| | | |
* | | | Merge pull request #5474 from nextcloud/wording-4925Morris Jobke2017-06-211-1/+1
|\ \ \ \ | | | | | | | | | | Improve wording of various error messages
| * | | | Improve wording of various error messagesJan-Christoph Borchardt2017-06-211-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | / [tx-robot] updated from transifexNextcloud bot2017-06-212-0/+6
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-06-208-14/+20
|/ /
* | Merge pull request #5447 from nextcloud/calendar-icon-whiteJan-Christoph Borchardt2017-06-199-7/+11
|\ \ | | | | | | Add white version of the calendar.svg icon
| * | Add CSS class for icon-calendarMarin Treselj2017-06-171-0/+3
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | Add viewport to all core/img/places/* icons.Marin Treselj2017-06-179-9/+9
| | | | | | | | | | | | | | | | | | Also removed some unneeded style declarations. Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | Add white version of the calendar.svg iconMarin Treselj2017-06-162-1/+2
| |/ | | | | | | | | | | There's no reason for not including it and it is needed for Deck app. Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | [tx-robot] updated from transifexNextcloud bot2017-06-196-0/+6
| |
* | Merge pull request #5423 from nextcloud/better-svg-optimizationMorris Jobke2017-06-171-1/+1
|\ \ | | | | | | Remove XML header and line breaks in SVG files.
| * | Remove XML heared and line breaks in SVG files.Marin Treselj2017-06-151-1/+1
| | | | | | | | | | | | | | | | | | My suggestion for further SVG optimiztion - as mentioned in #5229 Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-06-176-4/+6
| |/ |/|