summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11455 from nextcloud/feature/enforced-2faRoeland Jago Douma2018-09-309-2/+380
|\
| * Add mandatory 2FA service/classChristoph Wurst2018-09-309-2/+380
|/
* Merge pull request #11459 from nextcloud/dependabot/npm_and_yarn/settings/@ba...Roeland Jago Douma2018-09-302-280/+731
|\
| * Bump @babel/preset-env from 7.0.0 to 7.1.0 in /settingsdependabot[bot]2018-09-302-280/+731
|/
* Merge pull request #11458 from nextcloud/dependabot/npm_and_yarn/settings/bab...Roeland Jago Douma2018-09-302-4/+4
|\
| * Bump babel-loader from 8.0.2 to 8.0.4 in /settingsdependabot[bot]2018-09-292-4/+4
* | [tx-robot] updated from transifexNextcloud bot2018-09-3036-22/+146
|/
* Merge pull request #11445 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-09-292-118/+107
|\
| * Bump webpack from 4.19.1 to 4.20.2 in /apps/oauth2dependabot[bot]2018-09-282-118/+107
* | [tx-robot] updated from transifexNextcloud bot2018-09-29278-794/+836
|/
* Merge pull request #11193 from nextcloud/add-group-settingsMorris Jobke2018-09-2812-298/+1517
|\
| * Add new group entry on users list + fixesJohn Molakvoæ (skjnldsv)2018-09-2812-298/+1517
* | Merge pull request #11432 from nextcloud/assemblystream-eofMorris Jobke2018-09-281-1/+1
|\ \
| * | AssemblyStream is also eof if we have no more source streamRobin Appelman2018-09-281-1/+1
* | | Merge pull request #11037 from nextcloud/trash-webui-davMorris Jobke2018-09-2823-788/+584
|\ \ \ | |_|/ |/| |
| * | fix trashbin js testsRobin Appelman2018-09-261-143/+141
| * | fix sharing trashbin integration testsRobin Appelman2018-09-202-3/+23
| * | fix trashbin infoparsers interfering with other dav clientsRobin Appelman2018-09-201-0/+1
| * | more trashbin integration testsRobin Appelman2018-09-202-26/+101
| * | fix trashbin integration tests and add a few moreRobin Appelman2018-09-203-66/+85
| * | quote paths in behat.ymlRobin Appelman2018-09-201-10/+10
| * | use dav trashbin api for restoreRobin Appelman2018-09-202-48/+33
| * | use dav trash api for removing from trashbinRobin Appelman2018-09-202-73/+67
| * | remove old trashbin apiRobin Appelman2018-09-204-232/+0
| * | remove old trashbin endpointRobin Appelman2018-09-203-55/+9
| * | Use trashbin dav endpoint to list trash in webuiRobin Appelman2018-09-201-43/+39
| * | pass existing data to info parsersRobin Appelman2018-09-201-1/+1
| * | expose additional props from trashbin sabre endpointRobin Appelman2018-09-209-130/+116
* | | Merge pull request #11427 from nextcloud/enhancement/noid/ldap-numerical-idsblizzz2018-09-282-1/+44
|\ \ \
| * | | extend integration tests with users with numerical IDsArthur Schiwon2018-09-282-1/+44
* | | | Merge pull request #11429 from nextcloud/feature/11033/bump_strengthifyMorris Jobke2018-09-283-13/+15
|\ \ \ \
| * | | | Bump strengthifyRoeland Jago Douma2018-09-283-13/+15
* | | | | Merge pull request #11428 from nextcloud/history-icon-center-fixRoeland Jago Douma2018-09-282-2/+2
|\ \ \ \ \
| * | | | | CleanupJohn Molakvoæ (skjnldsv)2018-09-281-1/+1
| * | | | | Center back the history iconJohn Molakvoæ (skjnldsv)2018-09-282-2/+2
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-28276-704/+820
| |/ / / / |/| | | |
* | | | | Merge pull request #11414 from nextcloud/csp/11029/contacts_menu_compiled_han...Morris Jobke2018-09-289-81/+191
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Compile contactmenu handlebars templatesRoeland Jago Douma2018-09-279-81/+191
* | | | | Merge pull request #11423 from nextcloud/inline-input-error-fixMorris Jobke2018-09-281-160/+160
|\ \ \ \ \
| * | | | | TABS :DJohn Molakvoæ (skjnldsv)2018-09-281-160/+160
| * | | | | Fix invalid inline input confirm borderJohn Molakvoæ (skjnldsv)2018-09-281-5/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #11417 from nextcloud/hover-quota-used-space-regressionJohn Molakvoæ2018-09-286-17/+42
|\ \ \ \ \
| * | | | | State default unknown quota to 0John Molakvoæ (skjnldsv)2018-09-284-7/+12
| * | | | | Fix class selector for acceptance testsJohn Molakvoæ (skjnldsv)2018-09-281-1/+1
| * | | | | Fix string formattingJohn Molakvoæ (skjnldsv)2018-09-273-3/+3
| * | | | | Add back the total used space per userJohn Molakvoæ (skjnldsv)2018-09-275-12/+32
| |/ / / /
* | | | | Merge pull request #11412 from nextcloud/csp/11032/authtoekn_compiled_handlebarsChristoph Wurst2018-09-284-32/+69
|\ \ \ \ \
| * | | | | Compile handlebars template for AuthTokenViewRoeland Jago Douma2018-09-274-32/+69
| | |_|/ / | |/| | |
* | | | | Merge pull request #11410 from nextcloud/csp/11030/filesummary_compiled_handl...Roeland Jago Douma2018-09-275-13/+26
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Compile filesummary handlebarsRoeland Jago Douma2018-09-275-13/+26
|/ / / /