summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #9903 from nextcloud/dependabot/npm_and_yarn/settings/webp...Roeland Jago Douma2018-06-192-4/+4
|\
| * Bump webpack-merge from 4.1.2 to 4.1.3 in /settingsdependabot[bot]2018-06-192-4/+4
* | Merge pull request #9485 from nextcloud/feature/9441/multiple_token_providersblizzz2018-06-1922-111/+2309
|\ \ | |/ |/|
| * CommentsRoeland Jago Douma2018-06-195-6/+20
| * Add getProvider helper functionRoeland Jago Douma2018-06-181-35/+17
| * Use constant for token versionRoeland Jago Douma2018-06-189-20/+27
| * Add more testsRoeland Jago Douma2018-06-187-34/+506
| * Generate the new publicKey tokens by default!Roeland Jago Douma2018-06-181-2/+1
| * Actually convert the tokenRoeland Jago Douma2018-06-183-40/+94
| * Add publickey provider to managerRoeland Jago Douma2018-06-181-47/+52
| * SetPassword on PublicKeyTokensRoeland Jago Douma2018-06-183-14/+31
| * Just pass uid to the Token stuffRoeland Jago Douma2018-06-189-97/+34
| * Add first testsRoeland Jago Douma2018-06-184-1/+785
| * Initial PKT implementationRoeland Jago Douma2018-06-188-11/+678
| * Add new authtoken v2 columns to the authtoken tableRoeland Jago Douma2018-06-184-1/+57
| * Abstract the Provider via a managerRoeland Jago Douma2018-06-184-9/+213
* | Merge pull request #9905 from nextcloud/dependabot/npm_and_yarn/settings/v-to...Julius Härtl2018-06-194-6/+6
|\ \
| * | Bump compilationJohn Molakvoæ (skjnldsv)2018-06-192-2/+2
| * | Bump v-tooltip from 2.0.0-rc.32 to 2.0.0-rc.33 in /settingsdependabot[bot]2018-06-182-4/+4
| |/
* | Merge pull request #9902 from nextcloud/dependabot/npm_and_yarn/apps/updateno...Julius Härtl2018-06-192-14/+19
|\ \
| * | Bump webpack-cli from 3.0.3 to 3.0.8 in /apps/updatenotificationdependabot[bot]2018-06-182-14/+19
| |/
* / [tx-robot] updated from transifexNextcloud bot2018-06-19244-498/+672
|/
* Merge pull request #9893 from kevgathuku/update-unshare-messageJulius Härtl2018-06-181-1/+1
|\
| * Update message shown when unsharing a fileKevin Ndung'u2018-06-181-1/+1
* | Merge pull request #9884 from nextcloud/groups-search-use-proper-keysJulius Härtl2018-06-183-10/+11
|\ \
| * | Tests fixJohn Molakvoæ (skjnldsv)2018-06-151-5/+5
| * | Keep userids as keys on group searchJohn Molakvoæ (skjnldsv)2018-06-152-5/+6
* | | Merge pull request #9823 from nextcloud/bufgix/noid/update_token_on_session_i...blizzz2018-06-186-7/+42
|\ \ \ | |_|/ |/| |
| * | Allow updating the token on session regenerationRoeland Jago Douma2018-06-146-7/+42
* | | Merge pull request #9717 from nextcloud/feature/actions-menuJohn Molakvoæ2018-06-1816-148/+338
|\ \ \
| * | | Adds a test case for the loading symbol in deleted files.Abijeet2018-06-183-5/+10
| * | | Fixes the restore loading icon appearing continuously.Abijeet2018-06-181-1/+1
| * | | Fixes issue with action being displayed incorrectly.Abijeet2018-06-182-2/+4
| * | | Fix alignment of more iconMorris Jobke2018-06-181-0/+4
| * | | Fixes UI issues with the design,Abijeet2018-06-182-6/+4
| * | | Fixes issues found during running of test cases.Abijeet2018-06-184-41/+35
| * | | Fixed failing test cases for the new actions menu.Abijeet2018-06-182-31/+74
| * | | Fixes the position of the navigation toggle menu icon in mobile.Abijeet2018-06-181-1/+1
| * | | Added a new action menu in files and trash list.Abijeet2018-06-1811-132/+152
| * | | Adds an action dropdown that is shown on file selection.Abijeet2018-06-185-33/+157
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2018-06-1810-4/+172
* | | [tx-robot] updated from transifexNextcloud bot2018-06-1732-50/+112
* | | [tx-robot] updated from transifexNextcloud bot2018-06-1622-30/+100
| |/ |/|