summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use constant and clean up unit testChristoph Wurst2017-01-162-19/+18
* Increase 2fa backup codes entropyChristoph Wurst2017-01-162-2/+11
* [tx-robot] updated from transifexNextcloud bot2017-01-1684-106/+106
* Merge pull request #3062 from nextcloud/user-settings-tooltipJoas Schilling2017-01-131-2/+2
|\
| * use tooltip in user listChristoph Wurst2017-01-131-2/+2
* | Merge pull request #3024 from nextcloud/apps-scss-optimisationJohn Molakvoæ2017-01-131-258/+232
|\ \
| * | App navigation utils button fixJohn Molakvoæ (skjnldsv)2017-01-131-4/+4
| * | App-navigation action layout fixJohn Molakvoæ (skjnldsv)2017-01-111-8/+8
| * | Fix padding if empty buttonJohn Molakvoæ (skjnldsv)2017-01-111-1/+3
| * | Second optimisation and readabilityJohn Molakvoæ (skjnldsv)2017-01-111-49/+41
| * | CopyrightJohn Molakvoæ (skjnldsv)2017-01-111-1/+8
| * | Comments and cleanupJohn Molakvoæ (skjnldsv)2017-01-111-93/+81
| * | Quote fixJohn Molakvoæ (skjnldsv)2017-01-111-2/+2
| * | popover menu restructuration & unificationJohn Molakvoæ (skjnldsv)2017-01-111-165/+150
* | | Merge pull request #3048 from nextcloud/share-scss-optimisationJohn Molakvoæ2017-01-131-68/+45
|\ \ \
| * | | Share scss optimisationJohn Molakvoæ (skjnldsv)2017-01-121-68/+45
* | | | Merge pull request #3060 from nextcloud/cleanup-js-testsJoas Schilling2017-01-133-3/+17
|\ \ \ \
| * | | | fix image warningsChristoph Wurst2017-01-131-1/+3
| * | | | allow/fix loading of fontsChristoph Wurst2017-01-131-1/+4
| * | | | expect warning to be shownChristoph Wurst2017-01-131-1/+3
| * | | | add spies for l10n warningsChristoph Wurst2017-01-131-0/+7
* | | | | Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-c...Joas Schilling2017-01-131-0/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Change the row-format before changing the collationJoas Schilling2017-01-121-0/+12
| |/ / /
* | | | Merge pull request #2918 from nextcloud/encryption-recovery-improvementsMorris Jobke2017-01-1310-81/+176
|\ \ \ \ | |/ / / |/| | |
| * | | create new encryption keys on password reset and backup the old oneBjoern Schiessle2017-01-1010-81/+176
* | | | Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menuMorris Jobke2017-01-121-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Update federationscopemenu.jsJohn Molakvoæ2017-01-111-1/+1
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-1212-26/+98
|/ / /
* | | Merge pull request #3029 from nextcloud/systemtags-scss-optimisationJohn Molakvoæ2017-01-111-28/+20
|\ \ \
| * | | Systemtags scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-28/+20
* | | | Merge pull request #3027 from nextcloud/multiselect-scss-optimisationJohn Molakvoæ2017-01-111-31/+24
|\ \ \ \
| * | | | Multiselect scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-31/+24
| | |_|/ | |/| |
* | | | Merge pull request #3026 from nextcloud/icons-scss-optimisationMorris Jobke2017-01-111-60/+52
|\ \ \ \
| * | | | Comments and delete iconJohn Molakvoæ (skjnldsv)2017-01-111-7/+19
| * | | | Loader and animationJohn Molakvoæ (skjnldsv)2017-01-111-53/+33
| |/ / /
* | | | Merge pull request #3028 from nextcloud/tooltip-scss-optimisationRoeland Jago Douma2017-01-111-54/+53
|\ \ \ \
| * | | | Tooltip scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-54/+53
| |/ / /
* | / / [tx-robot] updated from transifexNextcloud bot2017-01-1132-290/+604
| |/ / |/| |
* | | Merge pull request #2849 from nextcloud/downstream-add-two-factor-exceptionRoeland Jago Douma2017-01-116-46/+179
|\ \ \
| * | | Update autoloaderRoeland Jago Douma2017-01-112-0/+2
| * | | fix coding style and increase code coverageChristoph Wurst2017-01-113-61/+131
| * | | Fix testsCornelius Kölbel2017-01-111-2/+5
| * | | Update TwoFactorException.phpCornelius Kölbel2017-01-111-2/+2
| * | | Add a TwoFactorExceptionCornelius Kölbel2017-01-113-5/+63
| |/ /
* | | Merge pull request #3007 from Loki3000/masterRoeland Jago Douma2017-01-113-4/+19
|\ \ \ | |/ / |/| |
| * | remove non required sql requestsLoki30002017-01-101-3/+8
| * | spaces addedLoki30002017-01-101-1/+1
| * | spaces addedLoki30002017-01-101-1/+1
| * | allowed '0' uidLoki30002017-01-101-1/+1
| * | allowed '0' uidLoki30002017-01-101-2/+2