Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-16 | 84 | -106/+106 |
| | |||||
* | Merge pull request #3062 from nextcloud/user-settings-tooltip | Joas Schilling | 2017-01-13 | 1 | -2/+2 |
|\ | | | | | use tooltip in user list | ||||
| * | use tooltip in user list | Christoph Wurst | 2017-01-13 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | Merge pull request #3024 from nextcloud/apps-scss-optimisation | John Molakvoæ | 2017-01-13 | 1 | -258/+232 |
|\ \ | | | | | | | Apps scss optimisation | ||||
| * | | App navigation utils button fix | John Molakvoæ (skjnldsv) | 2017-01-13 | 1 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | App-navigation action layout fix | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -8/+8 |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | Fix padding if empty button | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -1/+3 |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | Second optimisation and readability | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -49/+41 |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | Copyright | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -1/+8 |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | Comments and cleanup | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -93/+81 |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | Quote fix | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | popover menu restructuration & unification | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -165/+150 |
| | | | | | | | | | | | | | | | | | | fix #2798 Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | Merge pull request #3048 from nextcloud/share-scss-optimisation | John Molakvoæ | 2017-01-13 | 1 | -68/+45 |
|\ \ \ | | | | | | | | | Share scss optimisation | ||||
| * | | | Share scss optimisation | John Molakvoæ (skjnldsv) | 2017-01-12 | 1 | -68/+45 |
| | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | Merge pull request #3060 from nextcloud/cleanup-js-tests | Joas Schilling | 2017-01-13 | 3 | -3/+17 |
|\ \ \ \ | | | | | | | | | | | Cleanup js tests | ||||
| * | | | | fix image warnings | Christoph Wurst | 2017-01-13 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | | allow/fix loading of fonts | Christoph Wurst | 2017-01-13 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | | expect warning to be shown | Christoph Wurst | 2017-01-13 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | | add spies for l10n warnings | Christoph Wurst | 2017-01-13 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | | | Merge pull request #3051 from ↵ | Joas Schilling | 2017-01-13 | 1 | -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 collation | Joas Schilling | 2017-01-12 | 1 | -0/+12 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | Merge pull request #2918 from nextcloud/encryption-recovery-improvements | Morris Jobke | 2017-01-13 | 10 | -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 one | Bjoern Schiessle | 2017-01-10 | 10 | -81/+176 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | | Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menu | Morris Jobke | 2017-01-12 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | Fit federationScopeMenu to guidelines | ||||
| * | | | Update federationscopemenu.js | John Molakvoæ | 2017-01-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-12 | 12 | -26/+98 |
|/ / / | |||||
* | | | Merge pull request #3029 from nextcloud/systemtags-scss-optimisation | John Molakvoæ | 2017-01-11 | 1 | -28/+20 |
|\ \ \ | | | | | | | | | Systemtags scss optimisation | ||||
| * | | | Systemtags scss optimisation | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -28/+20 |
| | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | Merge pull request #3027 from nextcloud/multiselect-scss-optimisation | John Molakvoæ | 2017-01-11 | 1 | -31/+24 |
|\ \ \ \ | | | | | | | | | | | Multiselect scss optimisation | ||||
| * | | | | Multiselect scss optimisation | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -31/+24 |
| | |_|/ | |/| | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | Merge pull request #3026 from nextcloud/icons-scss-optimisation | Morris Jobke | 2017-01-11 | 1 | -60/+52 |
|\ \ \ \ | | | | | | | | | | | Icons scss optimisation | ||||
| * | | | | Comments and delete icon | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -7/+19 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | | | Loader and animation | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -53/+33 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | Merge pull request #3028 from nextcloud/tooltip-scss-optimisation | Roeland Jago Douma | 2017-01-11 | 1 | -54/+53 |
|\ \ \ \ | | | | | | | | | | | Tooltip scss optimisation | ||||
| * | | | | Tooltip scss optimisation | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -54/+53 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-11 | 32 | -290/+604 |
| |/ / |/| | | |||||
* | | | Merge pull request #2849 from nextcloud/downstream-add-two-factor-exception | Roeland Jago Douma | 2017-01-11 | 6 | -46/+179 |
|\ \ \ | | | | | | | | | Downstream add two factor exception | ||||
| * | | | Update autoloader | Roeland Jago Douma | 2017-01-11 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | fix coding style and increase code coverage | Christoph Wurst | 2017-01-11 | 3 | -61/+131 |
| | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | Fix tests | Cornelius Kölbel | 2017-01-11 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Update TwoFactorException.php | Cornelius Kölbel | 2017-01-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Add a TwoFactorException | Cornelius Kölbel | 2017-01-11 | 3 | -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/master | Roeland Jago Douma | 2017-01-11 | 3 | -4/+19 |
|\ \ \ | |/ / |/| | | Remove non required db requests | ||||
| * | | remove non required sql requests | Loki3000 | 2017-01-10 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | ``` SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = ''; ``` | ||||
| * | | spaces added | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | spaces added | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | allowed '0' uid | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | allowed '0' uid | Loki3000 | 2017-01-10 | 1 | -2/+2 |
| | | | |||||
| * | | fix spaces | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | fix brackets | Loki3000 | 2017-01-10 | 1 | -2/+4 |
| | | |