summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* 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-304-6/+16
|/
* [tx-robot] updated from transifexNextcloud bot2018-09-29124-234/+238
* Add new group entry on users list + fixesJohn Molakvoæ (skjnldsv)2018-09-2812-298/+1517
* [tx-robot] updated from transifexNextcloud bot2018-09-28114-440/+440
* Merge pull request #11417 from nextcloud/hover-quota-used-space-regressionJohn Molakvoæ2018-09-285-16/+41
|\
| * State default unknown quota to 0John Molakvoæ (skjnldsv)2018-09-284-7/+12
| * 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 #11416 from nextcloud/bugfix/11218/show-email-authtype-noneblizzz2018-09-271-1/+1
|\ \ \
| * | | Show auth type "None" in email settingsMorris Jobke2018-09-271-1/+1
| |/ /
* | | Merge pull request #10833 from nextcloud/fix_8623Morris Jobke2018-09-271-2/+3
|\ \ \ | |_|/ |/| |
| * | Re-enable upload button after updating Avatar fixes #8623Tobia De Koninck2018-08-241-2/+3
* | | Fix "checkWellKnownUrl" not being runDaniel Calviño Sánchez2018-09-271-2/+2
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2018-09-272-2/+120
* | Rebase and bumpJohn Molakvoæ (skjnldsv)2018-09-262-494/+310
* | Merge branch 'master' into babel-npm-webpack-fixesJohn Molakvoæ (skjnldsv)2018-09-2638-260/+851
|\ \
| * | [tx-robot] updated from transifexNextcloud bot2018-09-262-6/+6
| * | [npm] Bump settingsRoeland Jago Douma2018-09-253-448/+300
| * | [tx-robot] updated from transifexNextcloud bot2018-09-254-84/+132
| * | [tx-robot] updated from transifexNextcloud bot2018-09-242-44/+44
| * | [tx-robot] updated from transifexNextcloud bot2018-09-234-0/+78
| * | [tx-robot] updated from transifexNextcloud bot2018-09-228-18/+156
| * | [tx-robot] updated from transifexNextcloud bot2018-09-214-4/+6
| * | [tx-robot] updated from transifexNextcloud bot2018-09-204-0/+4
| * | [tx-robot] updated from transifexNextcloud bot2018-09-194-0/+4
| * | [tx-robot] updated from transifexNextcloud bot2018-09-198-0/+8
| * | [tx-robot] updated from transifexNextcloud bot2018-09-182-2/+2
| * | Merge pull request #11208 from violoncelloch/add-mastodon-iconJoas Schilling2018-09-171-0/+7
| |\ \
| | * | change "(remote-)follow" to "follow"Jonas Sulzer2018-09-141-1/+1
| | * | add mastodon icon to settings/userJonas Sulzer2018-09-131-0/+7
| * | | [tx-robot] updated from transifexNextcloud bot2018-09-1710-52/+176
| * | | [tx-robot] updated from transifexNextcloud bot2018-09-164-4/+76
| * | | [tx-robot] updated from transifexNextcloud bot2018-09-154-4/+18
| * | | [tx-robot] updated from transifexNextcloud bot2018-09-144-10/+20
| |/ /
| * | Merge pull request #11091 from nextcloud/bugfix/11088/cannot-read-passwdblizzz2018-09-131-4/+4
| |\ \
| | * | Add int-typehintDaniel Kesselberg2018-09-121-1/+1
| | * | Remove posix_getpwuid and compare only useridDaniel Kesselberg2018-09-061-4/+4
| * | | Merge pull request #10840 from webfoersterei/refactor/5530-urandom-checkJoas Schilling2018-09-131-12/+14
| |\ \ \
| | * | | Allow any Random generator that implements ISecureRandom for setupCheckTimo Förster2018-08-241-3/+3
| | * | | Change check if secure randomness is possible.Timo Förster2018-08-241-12/+14
| | | |/ | | |/|
| * | | [tx-robot] updated from transifexNextcloud bot2018-09-136-26/+86
| * | | Fix the link and anchor for the update notificationsJoas Schilling2018-09-121-1/+1
| * | | [tx-robot] updated from transifexNextcloud bot2018-09-112-0/+20
* | | | Update config and babel for ie11John Molakvoæ (skjnldsv)2018-09-106-822/+1219
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2018-09-104-0/+4