summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 list
| * use tooltip in user listChristoph Wurst2017-01-131-2/+2
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #3024 from nextcloud/apps-scss-optimisationJohn Molakvoæ2017-01-131-258/+232
|\ \ | | | | | | Apps scss optimisation
| * | App navigation utils button fixJohn Molakvoæ (skjnldsv)2017-01-131-4/+4
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | App-navigation action layout fixJohn Molakvoæ (skjnldsv)2017-01-111-8/+8
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix padding if empty buttonJohn Molakvoæ (skjnldsv)2017-01-111-1/+3
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Second optimisation and readabilityJohn Molakvoæ (skjnldsv)2017-01-111-49/+41
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | CopyrightJohn Molakvoæ (skjnldsv)2017-01-111-1/+8
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Comments and cleanupJohn Molakvoæ (skjnldsv)2017-01-111-93/+81
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Quote fixJohn Molakvoæ (skjnldsv)2017-01-111-2/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | popover menu restructuration & unificationJohn Molakvoæ (skjnldsv)2017-01-111-165/+150
| | | | | | | | | | | | | | | | | | fix #2798 Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #3048 from nextcloud/share-scss-optimisationJohn Molakvoæ2017-01-131-68/+45
|\ \ \ | | | | | | | | Share scss optimisation
| * | | Share scss optimisationJohn Molakvoæ (skjnldsv)2017-01-121-68/+45
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #3060 from nextcloud/cleanup-js-testsJoas Schilling2017-01-133-3/+17
|\ \ \ \ | | | | | | | | | | Cleanup js tests
| * | | | fix image warningsChristoph Wurst2017-01-131-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | allow/fix loading of fontsChristoph Wurst2017-01-131-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | expect warning to be shownChristoph Wurst2017-01-131-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | add spies for l10n warningsChristoph Wurst2017-01-131-0/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #3051 from ↵Joas Schilling2017-01-131-0/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | nextcloud/issue-2831-change-row-format-before-collation Change the row-format before changing the collation
| * | | | Change the row-format before changing the collationJoas Schilling2017-01-121-0/+12
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | 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 one
| * | | create new encryption keys on password reset and backup the old oneBjoern Schiessle2017-01-1010-81/+176
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menuMorris Jobke2017-01-121-1/+1
|\ \ \ \ | | |/ / | |/| | Fit federationScopeMenu to guidelines
| * | | Update federationscopemenu.jsJohn Molakvoæ2017-01-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | [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 optimisation
| * | | Systemtags scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-28/+20
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #3027 from nextcloud/multiselect-scss-optimisationJohn Molakvoæ2017-01-111-31/+24
|\ \ \ \ | | | | | | | | | | Multiselect scss optimisation
| * | | | Multiselect scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-31/+24
| | |_|/ | |/| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #3026 from nextcloud/icons-scss-optimisationMorris Jobke2017-01-111-60/+52
|\ \ \ \ | | | | | | | | | | Icons scss optimisation
| * | | | Comments and delete iconJohn Molakvoæ (skjnldsv)2017-01-111-7/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Loader and animationJohn Molakvoæ (skjnldsv)2017-01-111-53/+33
| |/ / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #3028 from nextcloud/tooltip-scss-optimisationRoeland Jago Douma2017-01-111-54/+53
|\ \ \ \ | | | | | | | | | | Tooltip scss optimisation
| * | | | Tooltip scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-54/+53
| |/ / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | / / [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
|\ \ \ | | | | | | | | Downstream add two factor exception
| * | | Update autoloaderRoeland Jago Douma2017-01-112-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | fix coding style and increase code coverageChristoph Wurst2017-01-113-61/+131
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | Fix testsCornelius Kölbel2017-01-111-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Update TwoFactorException.phpCornelius Kölbel2017-01-111-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add a TwoFactorExceptionCornelius Kölbel2017-01-113-5/+63
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Two Factor third party App may throw a TwoFactorException() with a more detailed error message in case the authentication fails. The 2FA Controller will then display the message of this Exception to the user. Working on #26593 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #3007 from Loki3000/masterRoeland Jago Douma2017-01-113-4/+19
|\ \ \ | |/ / |/| | Remove non required db requests
| * | remove non required sql requestsLoki30002017-01-101-3/+8
| | | | | | | | | | | | | | | ``` SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = ''; ```
| * | 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
| | |
| * | fix spacesLoki30002017-01-101-1/+1
| | |
| * | fix bracketsLoki30002017-01-101-2/+4
| | |