summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5685 from nextcloud/jail-propagatorRoeland Jago Douma2017-07-123-26/+27
|\ | | | | Fix propagating changes within jail wrapper
| * Fix propagating changes within jail wrapperRobin Appelman2017-07-113-26/+27
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-07-12154-1636/+1896
| |
* | Merge pull request #5657 from nextcloud/select-error-textLukas Reschke2017-07-111-0/+4
|\ \ | | | | | | [Small] warning is now selecteable
| * | warning is now selecteableMaxence Lange2017-07-081-0/+4
| | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | Merge pull request #5681 from nextcloud/upstream-fix-circlesMorris Jobke2017-07-114-9/+15
|\ \ \ | |_|/ |/| | upstream fix circles
| * | upstreamMaxence Lange2017-07-114-9/+15
| | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | Merge pull request #5672 from nextcloud/upload-hidden-filelistMorris Jobke2017-07-112-9/+13
|\ \ \ | |/ / |/| | properly block file upload to non-active filelist
| * | fix testRobin Appelman2017-07-111-9/+11
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | properly block file upload to non-active filelistRobin Appelman2017-07-101-0/+2
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #5662 from nextcloud/comradekingu-patch-1Morris Jobke2017-07-111-5/+5
|\ \ \ | | | | | | | | Spelling: No shouting at user, and Facebook
| * | | Spelling: No shouting at user, and FacebookAllan Nordhøy2017-07-091-5/+5
| | | |
* | | | Merge pull request #5656 from ↵Morris Jobke2017-07-109-41/+394
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix-unselecting-items-on-multi-select-dropdowns Fix unselecting items on multi select dropdowns
| * | | | Enable the toggleSelect extension in multi-select dropdownsDaniel Calviño Sánchez2017-07-103-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toggleSelect extension for Select2 makes possible to unselect items in a multi-select dropdown by clicking on them; this behaviour should be enabled in all the multi-select dropdowns used in the server. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | 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>
| * | | | Add acceptance tests for unselecting items in dropdown for tagsDaniel Calviño Sánchez2017-07-104-0/+318
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Extract app navigation elements to its own contextDaniel Calviño Sánchez2017-07-083-39/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The app navigation is not exclusive to the Files app but a generic component used by other apps too, so its locators and steps should be in its own context. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Fix typoDaniel Calviño Sánchez2017-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #5666 from nextcloud/comradekingu-patch-2Morris Jobke2017-07-101-11/+11
|\ \ \ \ \ | | | | | | | | | | | | Spelling: No "we" for recommendations.
| * | | | | Spelling: No "we" for recommendations.Allan Nordhøy2017-07-101-11/+11
| | |_|/ / | |/| | |
* | | | | Merge pull request #5669 from nextcloud/fix-remote-share-activity-emailsMorris Jobke2017-07-102-8/+14
|\ \ \ \ \ | | | | | | | | | | | | Fix remote share activity emails
| * | | | | Fix owner cloud id in unshare activityJoas Schilling2017-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fix activity emails for accept/decline of remote sharesJoas Schilling2017-07-102-7/+13
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #5671 from GitHubUser4234/ldap_password_renew_nc12fixMorris Jobke2017-07-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Rectify variable in RenewpasswordController
| * | | | Rectify variable $uid->$userRoger Szabo2017-07-101-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | | Merge pull request #5649 from nextcloud/fix-5611Morris Jobke2017-07-102-9/+11
|\ \ \ \ | | | | | | | | | | fix alignment of radio button and its label in encryption settings
| * | | | fix alignment of radio button and its label in encryption settingsArthur Schiwon2017-07-072-9/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-1020-86/+88
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-0920-12/+72
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-07-0836-74/+106
| | |
* | | Merge pull request #5645 from nextcloud/try-to-prevent-spam-collecting-of-emailsLukas Reschke2017-07-071-0/+3
|\ \ \ | |/ / |/| | Don't show mail domain and from in config report
| * | Don't show mail domain and from in config reportJoas Schilling2017-07-071-0/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5628 from ↵Morris Jobke2017-07-073-10/+22
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/only-create-the-migration-dir-when-necessary Only create the migration directory when necessary
| * | | Register autoloading before running migrationsJoas Schilling2017-07-071-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Only create the migration directory when necessaryJoas Schilling2017-07-062-9/+21
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5529 from michaelletzgus/optimize_js_orderMorris Jobke2017-07-071-3/+3
|\ \ \ | | | | | | | | Optimize performance / Load CSS and JS in parallel on firefox
| * | | Optimize performance / Load CSS and JS in parallel on firefoxMichael Letzgus2017-06-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the inline <script> after the external <script> because the internal JS between CSS <link> and external JS makes firefox loading CSS and JS not in parallel. The internal js is now parsed last but will still be executed first since everything else is deferred js. Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
* | | | Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emailsMorris Jobke2017-07-0734-82/+313
|\ \ \ \ | | | | | | | | | | Use PNGs for icons in activity emails
| * | | | Fix testsJoas Schilling2017-06-202-12/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Use PNG version of the icons for shipped activitiesJoas Schilling2017-06-2030-70/+272
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add a flag to allow checking if SVGs are okayJoas Schilling2017-06-202-0/+29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-12 00:04:45 +0000