summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4499 from nextcloud/downstream-26984Morris Jobke2017-04-254-2/+72
|\
| * Audit log for enabling/disabling a userJoas Schilling2017-04-252-0/+18
| * Trigger change when a user is enabled/disabledJoas Schilling2017-04-252-2/+54
* | Merge pull request #4508 from nextcloud/fix/remove-js-debug-loggingMorris Jobke2017-04-251-1/+0
|\ \
| * | Remove js debug loggingChristoph Wurst2017-04-251-1/+0
* | | Merge pull request #4479 from nextcloud/auth-flowMorris Jobke2017-04-2510-0/+770
|\ \ \
| * | | Fix auth flow background color and redirect view layoutJan-Christoph Borchardt2017-04-252-4/+11
| * | | AppToken to 72 charsRoeland Jago Douma2017-04-252-3/+3
| * | | Do not remove the state token to earlyRoeland Jago Douma2017-04-251-1/+3
| * | | Correctly case the stateTokenRoeland Jago Douma2017-04-251-1/+1
| * | | Add new auth flowLukas Reschke2017-04-2510-0/+761
| |/ /
* | | Merge pull request #4495 from nextcloud/downstream-27638Roeland Jago Douma2017-04-252-2/+7
|\ \ \ | |/ / |/| |
| * | Catch session already closed exception in destructorVictor Dubiniuk2017-04-252-2/+7
| |/
* | Merge pull request #4439 from nextcloud/appmenu-responsiveLukas Reschke2017-04-256-185/+135
|\ \
| * | Fix loading spinner for new app menuJulius Härtl2017-04-252-13/+33
| * | Fix adding/removing appsJulius Härtl2017-04-251-19/+6
| * | Responsive app menuJulius Härtl2017-04-255-157/+100
| |/
* | Merge pull request #4494 from nextcloud/fix-jsunitMorris Jobke2017-04-251-1/+1
|\ \ | |/ |/|
| * Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcherMorris Jobke2017-04-251-1/+1
* | Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletionJoas Schilling2017-04-252-0/+35
|\ \
| * | 4190Roger Szabo2017-04-252-0/+35
* | | Merge pull request #3531 from nextcloud/theming-scssMorris Jobke2017-04-2511-749/+470
|\ \ \
| * | | Mock itJoas Schilling2017-04-251-12/+39
| * | | Logo and background URLs must be relativeJoas Schilling2017-04-252-11/+8
| * | | Fix theming testsJulius Härtl2017-04-252-30/+13
| * | | Use theming cachebuster for server resourcesJulius Härtl2017-04-251-1/+3
| * | | Implement scss variable injection by OC_DefaultsJulius Haertl2017-04-2511-720/+432
| |/ /
* | | Merge pull request #4485 from nextcloud/translation-checkerMorris Jobke2017-04-254-2/+79
|\ \ \
| * | | Loop over the apps directory and add the taskJoas Schilling2017-04-252-23/+12
| * | | Fix invalid characterJoas Schilling2017-04-252-2/+2
| * | | Check whether we can json decode the translationsJoas Schilling2017-04-252-0/+88
| |/ /
* | | Merge pull request #3195 from nextcloud/settings-apps-tabularMorris Jobke2017-04-256-54/+205
|\ \ \ | |_|/ |/| |
| * | Fix app icon being inverted for app store apps tooJan-Christoph Borchardt2017-04-253-8/+20
| * | Show spinner until app store images loadedJan-Christoph Borchardt2017-04-252-2/+2
| * | Show placeholder for image-less apps in app managementJan-Christoph Borchardt2017-04-253-2/+6
| * | Center spinner in apps managementJan-Christoph Borchardt2017-04-252-4/+5
| * | Add installed category in AppSettingsControlerTestFelix A. Epp2017-04-251-4/+9
| * | Make svgs more fluid and consistent remove action, instead of 'remove app'Felix A. Epp2017-04-252-2/+2
| * | rename Uninstall to RemoveJan-Christoph Borchardt2017-04-252-5/+5
| * | also improve layout of apps from storeJan-Christoph Borchardt2017-04-253-23/+15
| * | Revert "Add Minor styling improvements with opacity instead of grey"Jan-Christoph Borchardt2017-04-251-6/+5
| * | fix sizing and alignment of your app listJan-Christoph Borchardt2017-04-252-7/+9
| * | hide app version and level on narrower screensJan-Christoph Borchardt2017-04-252-2/+15
| * | improve wording of Apps mgmt navigation entriesJan-Christoph Borchardt2017-04-252-6/+6
| * | Add Minor styling improvements with opacity instead of greyFelix A. Epp2017-04-251-5/+10
| * | Fix spacing between enbale-groups label and select2Felix A. Epp2017-04-251-0/+4
| * | Fix uninstall in tabular viewFelix A. Epp2017-04-252-6/+6
| * | Fix app-icon opacity and positioingFelix A. Epp2017-04-252-2/+7
| * | Add a link to the appstore page in the installed apps settings categoriesFelix A. Epp2017-04-251-1/+1
| * | Add apps category 'all installed'Felix A. Epp2017-04-252-7/+32