summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix Metadata testsJohn Molakvoæ (skjnldsv)2018-03-081-1/+8
* Fixed Controller TestJohn Molakvoæ (skjnldsv)2018-03-083-54/+145
* Fixed select2 workflowJohn Molakvoæ (skjnldsv)2018-03-082-40/+30
* Fix users loading on group click and group creation on selectJohn Molakvoæ (skjnldsv)2018-03-082-3/+5
* Use group displayNames in users listJohn Molakvoæ (skjnldsv)2018-03-086-41/+74
* Fix group display name in the sidebar of the user managementJoas Schilling2018-03-082-8/+8
* Fix group displaynames in activityJoas Schilling2018-03-084-35/+108
* Start fixing Select2 optionsJoas Schilling2018-03-082-10/+16
* Correctly return the group nameJoas Schilling2018-03-082-11/+6
* Show the displayname in the users group listJoas Schilling2018-03-081-1/+1
* Merge pull request #8711 from nextcloud/objectstore-write-only-fopenMorris Jobke2018-03-081-7/+13
|\
| * don't read existing file when overwriting using object storeRobin Appelman2018-03-071-7/+13
* | Merge pull request #8662 from nextcloud/better-debugging-unit-testsRoeland Jago Douma2018-03-071-0/+7
|\ \
| * | Single quotesJoas Schilling2018-03-071-1/+1
| * | Suppress phan errorJoas Schilling2018-03-071-0/+1
| * | Try without autoloadingJoas Schilling2018-03-061-1/+1
| * | Better debugging for "Your test case is not allowed to access the database."Joas Schilling2018-03-051-0/+6
* | | Merge pull request #8714 from nextcloud/8705Morris Jobke2018-03-072-1/+25
|\ \ \
| * | | Fix testsRoeland Jago Douma2018-03-071-0/+17
| * | | Check if the cached js file existsRoeland Jago Douma2018-03-071-1/+8
* | | | Merge pull request #8373 from nextcloud/right-header-stdrdMorris Jobke2018-03-079-164/+203
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed public templateJohn Molakvoæ (skjnldsv)2018-03-075-38/+36
| * | | Fixed loading state in apps nav menuJohn Molakvoæ (skjnldsv)2018-03-041-23/+25
| * | | Fixed appsmenuJohn Molakvoæ (skjnldsv)2018-03-041-1/+1
| * | | Fixed centering of the nav/picker popupJohn Molakvoæ (skjnldsv)2018-03-041-6/+6
| * | | App menu fixJohn Molakvoæ (skjnldsv)2018-03-041-1/+2
| * | | Use correct variablesJohn Molakvoæ (skjnldsv)2018-03-041-1/+1
| * | | Create special option to toggle header menu containerJohn Molakvoæ (skjnldsv)2018-03-044-7/+9
| * | | Clean scss, use proper loading icon and menu position on narrow screensJohn Molakvoæ (skjnldsv)2018-03-043-50/+72
| * | | New standard for top right headerJohn Molakvoæ (skjnldsv)2018-03-041-50/+64
* | | | Merge pull request #8696 from nextcloud/fix-public-api-docblizzz2018-03-071-1/+1
|\ \ \ \
| * | | | Fix PHPDoc for public APIMorris Jobke2018-03-061-1/+1
* | | | | Merge pull request #8652 from nextcloud/navigation-controller-etagMorris Jobke2018-03-072-2/+62
|\ \ \ \ \
| * | | | | Fix testsJulius Härtl2018-03-071-1/+1
| * | | | | Replace logout href to avoid new etag on every requestJulius Härtl2018-03-062-7/+22
| * | | | | Add ETag to NavigationControllerJulius Härtl2018-03-052-2/+47
* | | | | | Merge pull request #8596 from nextcloud/bugfix/8454/sharee-email-matches-not-...Morris Jobke2018-03-061-4/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add the users result only when non empty so tests stay the sameJoas Schilling2018-03-021-1/+3
| * | | | | Also array_slice wide email matches of local usersJoas Schilling2018-03-011-4/+7
* | | | | | Merge pull request #7419 from Abijeet/feature-7175Morris Jobke2018-03-0613-52/+140
|\ \ \ \ \ \
| * | | | | | reuse query builderRobin Appelman2018-01-124-11/+16
| * | | | | | refactor user searchingRobin Appelman2017-12-209-52/+101
| * | | | | | Added newline to end of htaccess fileAbijeet2017-12-181-1/+1
| * | | | | | Adds search by email function on the users screen.Abijeet2017-12-163-4/+38
* | | | | | | Merge pull request #8579 from nextcloud/feature/2692/merge-can-i-updateMorris Jobke2018-03-069-18/+277
|\ \ \ \ \ \ \
| * | | | | | | Fix the cursor on the iconJoas Schilling2018-03-061-1/+2
| * | | | | | | Add a little arrow to indicate that the list can be openedJoas Schilling2018-03-062-3/+16
| * | | | | | | Fix the available listJoas Schilling2018-03-061-1/+0
| * | | | | | | Show a loading message while we determinate the status of the updatesJoas Schilling2018-03-062-1/+7
| * | | | | | | Check for app updates when there is a new major version availableJoas Schilling2018-02-286-16/+253