summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-26174-622/+1044
* Merge pull request #3233 from nextcloud/contactsmenuJan-Christoph Borchardt2017-04-2635-21/+2831
|\
| * Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-2617-5/+849
| |\ | |/ |/|
* | 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
| |/ /
| | * Fix testJan-Christoph Borchardt2017-04-261-1/+1
| | * Fix emptycontent HTML and wordingJan-Christoph Borchardt2017-04-251-4/+5
| | * Fix spinner position of Contacts menuJan-Christoph Borchardt2017-04-251-3/+1
| | * Use HTTP POST to retrieve the list of contactsChristoph Wurst2017-04-252-2/+2
| | * Update composer autoloaderChristoph Wurst2017-04-254-6/+8
| | * Adjust entry unit test to newly added avatar propertyChristoph Wurst2017-04-251-0/+1
| | * Fix failing contacts menu js test dataChristoph Wurst2017-04-251-2/+12
| | * Fix icon of second actionChristoph Wurst2017-04-251-3/+5
| | * Use absolute URI for action iconsChristoph Wurst2017-04-253-8/+29
| | * Don't show contacts an entry for themselvesChristoph Wurst2017-04-255-14/+59
| | * Let apps register contact menu provider via info.xmlChristoph Wurst2017-04-256-33/+125
| | * Use tooltop for contact's top action titleChristoph Wurst2017-04-251-1/+4
| | * Show mail address in popover menuChristoph Wurst2017-04-251-3/+1
| | * Contacts menuChristoph Wurst2017-04-2537-29/+2666
| |/ |/|
* | 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