summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | dn2ocname: also apply group filter to readAttribute()Roland Tapken2018-03-071-6/+4
| * | | | | | Apply ldapUserFilter on members of groupRoland Tapken2018-02-071-1/+5
* | | | | | | Merge pull request #8593 from eneiluj/masterMorris Jobke2018-03-082-38/+96
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add testsRoeland Jago Douma2018-03-082-28/+86
| * | | | | | Make SecurityMiddleware strictRoeland Jago Douma2018-03-081-10/+9
| * | | | | | Do not throw AppNotEnabledException for app public pages - refs #6962, refs #...Julien Veyssier2018-02-281-1/+2
* | | | | | | 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
| * | | | | | | | | Ignore dev filesJoas Schilling2018-02-281-0/+1
| * | | | | | | | | Also allow to specify the cache file nameJoas Schilling2018-02-282-2/+4
* | | | | | | | | | Merge pull request #5833 from nextcloud/fix_uninstall_rep_stepMorris Jobke2018-03-067-43/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused and outdated hookMorris Jobke2018-03-061-3/+0