summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Styles scssJohn Molakvoæ (skjnldsv)2018-06-201-55/+55
* Share scssJohn Molakvoæ (skjnldsv)2018-06-201-4/+4
* Public scssJohn Molakvoæ (skjnldsv)2018-06-201-2/+2
* Tooltip scssJohn Molakvoæ (skjnldsv)2018-06-201-8/+8
* Multiselect scssJohn Molakvoæ (skjnldsv)2018-06-201-5/+5
* Mobile scssJohn Molakvoæ (skjnldsv)2018-06-201-3/+3
* Inputs scssJohn Molakvoæ (skjnldsv)2018-06-201-62/+62
* Icons scssJohn Molakvoæ (skjnldsv)2018-06-201-12/+12
* Fixes scssJohn Molakvoæ (skjnldsv)2018-06-201-1/+1
* Header scssJohn Molakvoæ (skjnldsv)2018-06-201-21/+21
* Apps scssJohn Molakvoæ (skjnldsv)2018-06-201-33/+33
* Css4 vars root initJohn Molakvoæ (skjnldsv)2018-06-201-8/+36
* Merge pull request #9927 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/w...Roeland Jago Douma2018-06-202-208/+214
|\
| * Bump webpack from 4.11.1 to 4.12.0 in /apps/oauth2dependabot[bot]2018-06-202-208/+214
* | Merge pull request #9900 from nextcloud/feature/noid/wait-for-cron-to-finishMorris Jobke2018-06-205-12/+73
|\ \ | |/ |/|
| * Wait for cron to finish before running upgrade commandMorris Jobke2018-06-195-12/+73
* | Merge pull request #9929 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/w...John Molakvoæ2018-06-202-7/+7
|\ \
| * | Bump webpack-cli from 3.0.3 to 3.0.8 in /apps/oauth2dependabot[bot]2018-06-202-7/+7
|/ /
* | Merge pull request #9928 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/w...John Molakvoæ2018-06-202-4/+4
|\ \
| * | Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/oauth2dependabot[bot]2018-06-202-4/+4
|/ /
* | Merge pull request #9930 from nextcloud/tests/noid/add-oauth2-buildJohn Molakvoæ2018-06-2010-14/+21
|\ \
| * | Bump build and configJohn Molakvoæ (skjnldsv)2018-06-209-14/+13
| * | Add vue build for oauth2 app to droneJulius Härtl2018-06-201-0/+8
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-06-20184-254/+314
* | Merge pull request #9912 from nextcloud/search-standardJohn Molakvoæ2018-06-2017-531/+718
|\ \
| * | Apps searchJohn Molakvoæ (skjnldsv)2018-06-193-43/+20
| * | Debounce search and resetJohn Molakvoæ (skjnldsv)2018-06-191-4/+4
| * | Run vue builds in parallelMorris Jobke2018-06-191-3/+4
| * | Fit user search to new standardJohn Molakvoæ (skjnldsv)2018-06-194-3815/+33
| * | Added new search standardJohn Molakvoæ (skjnldsv)2018-06-195-376/+543
| * | Add user search supportJohn Molakvoæ (skjnldsv)2018-06-193-3/+3827
| * | Better design for core search, fixes and style to scssJohn Molakvoæ (skjnldsv)2018-06-197-134/+134
|/ /
* | Merge pull request #9919 from nextcloud/immutable-groupsJohn Molakvoæ2018-06-1910-21/+113
|\ \
| * | New user support, provisionning api and design fixesJohn Molakvoæ (skjnldsv)2018-06-197-20/+65
| * | Don't pretend we can add/remove users to/from groups when we can'tRobin Appelman2018-06-196-4/+51
* | | Merge pull request #9920 from nextcloud/fix/9867/fix_setup_checkMorris Jobke2018-06-192-4/+18
|\ \ \ | |/ / |/| |
| * | Fix testsMorris Jobke2018-06-191-3/+7
| * | If cronErros is empty json_decode will return NULLRoeland Jago Douma2018-06-191-1/+11
|/ /
* | Merge pull request #9830 from nextcloud/feature/noid/oauth_vue_redirect_validateMorris Jobke2018-06-1918-151/+6136
|\ \
| * | Fix redirctUriRoeland Jago Douma2018-06-191-4/+4
| * | js-src => srcRoeland Jago Douma2018-06-198-4/+4
| * | Fix AdminTestsRoeland Jago Douma2018-06-192-33/+5
| * | Cleanup ControllerRoeland Jago Douma2018-06-192-13/+1
| * | Fix testsRoeland Jago Douma2018-06-191-17/+65
| * | [oauth2] Fix css for admin settingsJulius Härtl2018-06-193-3/+18
| * | Migrate OAuth Admin settings to vueRoeland Jago Douma2018-06-1915-88/+6050
* | | Merge pull request #9881 from nextcloud/user-db-backend-querybuilderMorris Jobke2018-06-194-13/+48
|\ \ \
| * | | use query builder in all places in the db user backendRobin Appelman2018-06-151-13/+26
| * | | Add count to function builderRobin Appelman2018-06-143-0/+22
* | | | Merge pull request #9914 from Jaczel/new-settings-grammatical-fixMorris Jobke2018-06-191-2/+2
|\ \ \ \