aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix email vs mailJoas Schilling2017-04-261-1/+1
* Use correct plural form and add special strings for tomorrow and todayJoas Schilling2017-04-262-2/+14
* Fix past tenseJoas Schilling2017-04-261-4/+4
* 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
| * | Make enabled and disabled apps a tabular listFelix A. Epp2017-04-253-7/+91
* | | Merge pull request #4462 from danxuliu/fix-sharing-password-protected-linkRoeland Jago Douma2017-04-2513-62/+770
|\ \ \
| * | | Use "complete" callback in onPasswordEnteredDaniel Calviño Sánchez2017-04-242-3/+3
| * | | Extract common ajax call for addShare and updateShareDaniel Calviño Sánchez2017-04-241-36/+17
| * | | Document options parameter in saveLinkShareDaniel Calviño Sánchez2017-04-241-1/+8
| * | | Add "complete" callback support for addShareDaniel Calviño Sánchez2017-04-242-0/+57
| * | | Add "complete" callback support for updateShareDaniel Calviño Sánchez2017-04-242-0/+55
| * | | Add missing unit test cases and conditionsDaniel Calviño Sánchez2017-04-241-0/+49
| * | | Extract updateSharePasswordIfNeeded functionDaniel Calviño Sánchez2017-04-241-22/+30
| * | | Join if block to preceding if chainDaniel Calviño Sánchez2017-04-241-3/+2
| * | | Add missing unit test for updateShare with email shareDaniel Calviño Sánchez2017-04-241-0/+75
| * | | Add missing hook checkDaniel Calviño Sánchez2017-04-241-2/+13
| * | | Fix double hashing of shared link passwordsDaniel Calviño Sánchez2017-04-242-1/+7
| * | | Fix working icon not hidden when successfully setting a passwordDaniel Calviño Sánchez2017-04-242-0/+145
| * | | Add acceptance tests for sharing password protected linksDaniel Calviño Sánchez2017-04-245-0/+289
| * | | Add system to share data between acceptance test stepsDaniel Calviño Sánchez2017-04-242-3/+29