summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletionJoas Schilling2017-04-252-0/+35
|\ | | | | Audit group creation/deletion
| * 4190Roger Szabo2017-04-252-0/+35
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | Merge pull request #3531 from nextcloud/theming-scssMorris Jobke2017-04-2511-749/+470
|\ \ | | | | | | Theming using SCSS variables
| * | Mock itJoas Schilling2017-04-251-12/+39
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Logo and background URLs must be relativeJoas Schilling2017-04-252-11/+8
| | | | | | | | | | | | | | | | | | They are used way to often for such a change Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix theming testsJulius Härtl2017-04-252-30/+13
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Use theming cachebuster for server resourcesJulius Härtl2017-04-251-1/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Implement scss variable injection by OC_DefaultsJulius Haertl2017-04-2511-720/+432
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> Add Scss variables to example theme and theming app Signed-off-by: Julius Haertl <jus@bitgrid.net> Use SCSSCacher to build theming css Signed-off-by: Julius Härtl <jus@bitgrid.net> Update theming.scss Signed-off-by: Julius Härtl <jus@bitgrid.net> Code cleanup Signed-off-by: Julius Härtl <jus@bitgrid.net> Fix tests Signed-off-by: Julius Härtl <jus@bitgrid.net> Inject SCSSCacher for easier testing Signed-off-by: Julius Härtl <jus@bitgrid.net> Fix typehint Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Generate absolute URLs Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Fix tests to always use absolute urls for theming images Signed-off-by: Julius Härtl <jus@bitgrid.net> MailheaderColor -> ColorPrimary Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #4485 from nextcloud/translation-checkerMorris Jobke2017-04-254-2/+79
|\ \ | | | | | | Check whether we can json decode the translations
| * | Loop over the apps directory and add the taskJoas Schilling2017-04-252-23/+12
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix invalid characterJoas Schilling2017-04-252-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Check whether we can json decode the translationsJoas Schilling2017-04-252-0/+88
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3195 from nextcloud/settings-apps-tabularMorris Jobke2017-04-256-54/+205
|\ \ | | | | | | Make apps settings tabular
| * | Fix app icon being inverted for app store apps tooJan-Christoph Borchardt2017-04-253-8/+20
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Show spinner until app store images loadedJan-Christoph Borchardt2017-04-252-2/+2
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Show placeholder for image-less apps in app managementJan-Christoph Borchardt2017-04-253-2/+6
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Center spinner in apps managementJan-Christoph Borchardt2017-04-252-4/+5
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Add installed category in AppSettingsControlerTestFelix A. Epp2017-04-251-4/+9
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | Make svgs more fluid and consistent remove action, instead of 'remove app'Felix A. Epp2017-04-252-2/+2
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | rename Uninstall to RemoveJan-Christoph Borchardt2017-04-252-5/+5
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | also improve layout of apps from storeJan-Christoph Borchardt2017-04-253-23/+15
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Revert "Add Minor styling improvements with opacity instead of grey"Jan-Christoph Borchardt2017-04-251-6/+5
| | | | | | | | | | | | | | | | | | This reverts commit e9f8a15692ccd4690eef9d4268343d59aa8491ea. Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | fix sizing and alignment of your app listJan-Christoph Borchardt2017-04-252-7/+9
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | hide app version and level on narrower screensJan-Christoph Borchardt2017-04-252-2/+15
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | improve wording of Apps mgmt navigation entriesJan-Christoph Borchardt2017-04-252-6/+6
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Add Minor styling improvements with opacity instead of greyFelix A. Epp2017-04-251-5/+10
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | Fix spacing between enbale-groups label and select2Felix A. Epp2017-04-251-0/+4
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | Fix uninstall in tabular viewFelix A. Epp2017-04-252-6/+6
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | Fix app-icon opacity and positioingFelix A. Epp2017-04-252-2/+7
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | Add a link to the appstore page in the installed apps settings categoriesFelix A. Epp2017-04-251-1/+1
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | Add apps category 'all installed'Felix A. Epp2017-04-252-7/+32
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | Make enabled and disabled apps a tabular listFelix A. Epp2017-04-253-7/+91
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
* | | Merge pull request #4462 from danxuliu/fix-sharing-password-protected-linkRoeland Jago Douma2017-04-2513-62/+770
|\ \ \ | | | | | | | | Fix sharing a password protected link
| * | | Use "complete" callback in onPasswordEnteredDaniel Calviño Sánchez2017-04-242-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Extract common ajax call for addShare and updateShareDaniel Calviño Sánchez2017-04-241-36/+17
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Document options parameter in saveLinkShareDaniel Calviño Sánchez2017-04-241-1/+8
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add "complete" callback support for addShareDaniel Calviño Sánchez2017-04-242-0/+57
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add "complete" callback support for updateShareDaniel Calviño Sánchez2017-04-242-0/+55
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add missing unit test cases and conditionsDaniel Calviño Sánchez2017-04-241-0/+49
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Extract updateSharePasswordIfNeeded functionDaniel Calviño Sánchez2017-04-241-22/+30
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Join if block to preceding if chainDaniel Calviño Sánchez2017-04-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If getShareType() returns "email" it can not also return "user", "group" nor "link", so the if block can be added to the preceding if chain. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add missing unit test for updateShare with email shareDaniel Calviño Sánchez2017-04-241-0/+75
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add missing hook checkDaniel Calviño Sánchez2017-04-241-2/+13
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Fix double hashing of shared link passwordsDaniel Calviño Sánchez2017-04-242-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plain text password for a shared links was hashed and, then, the hashed password was hashed again and set as the final password. Due to this the password introduced in the "Authenticate" page for the shared link was always a wrong password, and thus the file could not be accessed. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Fix working icon not hidden when successfully setting a passwordDaniel Calviño Sánchez2017-04-242-0/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a request to set the password of a shared link is sent a working icon is shown. However, as there was no "success" callback, the icon was never hidden again after successfully setting the password (it worked fine if there was an error, though). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add acceptance tests for sharing password protected linksDaniel Calviño Sánchez2017-04-245-0/+289
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add system to share data between acceptance test stepsDaniel Calviño Sánchez2017-04-242-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The data storage (the "notebook") is shared between all the actors, so the data can be stored and retrieved between different steps by any actor in the same scenario. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #4484 from ↵blizzz2017-04-252-4/+9
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | nextcloud/fix/logincontroller-redirect-url-failed-login Fix remember redirect_url on failed login attempts
| * | | Fix remember redirect_url on failed login attemptsChristoph Wurst2017-04-252-4/+9
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | / [tx-robot] updated from transifexNextcloud bot2017-04-2582-1500/+594
| |/ |/|