c371e2f532
Merge pull request #3062 from nextcloud/user-settings-tooltip
...
use tooltip in user list
2017-01-13 16:53:18 +01:00
8d8aff1bce
Merge pull request #3024 from nextcloud/apps-scss-optimisation
...
Apps scss optimisation
2017-01-13 16:31:16 +01:00
127024d89d
Merge pull request #3048 from nextcloud/share-scss-optimisation
...
Share scss optimisation
2017-01-13 16:03:17 +01:00
ce9c833c5b
App navigation utils button fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-13 15:31:42 +01:00
0f792fedef
Merge pull request #3060 from nextcloud/cleanup-js-tests
...
Cleanup js tests
2017-01-13 14:47:06 +01:00
91beb178a7
Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation
...
Change the row-format before changing the collation
2017-01-13 14:43:06 +01:00
c70b3f0e46
use tooltip in user list
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 14:01:15 +01:00
dd88e70dff
fix image warnings
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:49:37 +01:00
c82befbc00
allow/fix loading of fonts
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:46:06 +01:00
da28a1612e
expect warning to be shown
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:33:12 +01:00
622101f2dd
Merge pull request #2918 from nextcloud/encryption-recovery-improvements
...
create new encryption keys on password reset and backup the old one
2017-01-13 11:28:43 +01:00
9d56d5e94d
add spies for l10n warnings
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:20:19 +01:00
77b5d7bc86
Change the row-format before changing the collation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 16:54:29 +01:00
bab09dc5d4
Share scss optimisation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-12 15:02:14 +01:00
00c3f807db
Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menu
...
Fit federationScopeMenu to guidelines
2017-01-12 10:09:30 +01:00
09a46b7bd6
[tx-robot] updated from transifex
2017-01-12 01:07:43 +00:00
a3e31116b1
Update federationscopemenu.js
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 21:20:01 +01:00
67c4f3d07c
App-navigation action layout fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 21:01:54 +01:00
fab82e9780
Merge pull request #3029 from nextcloud/systemtags-scss-optimisation
...
Systemtags scss optimisation
2017-01-11 18:41:14 +01:00
dda4b3b272
Fix padding if empty button
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 18:37:59 +01:00
3463c134a9
Merge pull request #3027 from nextcloud/multiselect-scss-optimisation
...
Multiselect scss optimisation
2017-01-11 18:24:15 +01:00
b6c00a3f51
Merge pull request #3026 from nextcloud/icons-scss-optimisation
...
Icons scss optimisation
2017-01-11 16:52:27 +01:00
96d2f2f124
Merge pull request #3028 from nextcloud/tooltip-scss-optimisation
...
Tooltip scss optimisation
2017-01-11 16:38:18 +01:00
c35ea15916
[tx-robot] updated from transifex
2017-01-11 15:20:22 +00:00
dfee6ffaca
Systemtags scss optimisation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:38:35 +01:00
2899f34c4c
Tooltip scss optimisation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:33:11 +01:00
8317a71fee
Multiselect scss optimisation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:22:19 +01:00
2a2d4390c6
Comments and delete icon
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:16:05 +01:00
27a1dadea4
Loader and animation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:12:39 +01:00
c87d48700c
Second optimisation and readability
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
735423e399
Copyright
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
3e36899778
Comments and cleanup
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
5b4d5aba41
Quote fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:41 +01:00
2d56cceb87
popover menu restructuration & unification
...
fix #2798
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:15 +01:00
bc26f78eb1
Merge pull request #2849 from nextcloud/downstream-add-two-factor-exception
...
Downstream add two factor exception
2017-01-11 13:06:01 +01:00
005ce8aaf6
Merge pull request #3007 from Loki3000/master
...
Remove non required db requests
2017-01-11 12:37:54 +01:00
c7f0063a70
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-11 11:02:11 +01:00
243c9c0941
fix coding style and increase code coverage
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 11:01:54 +01:00
b8d41752ca
Fix tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:54 +01:00
ee8c617a6d
Update TwoFactorException.php
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:54 +01:00
e077e01bf2
Add a TwoFactorException
...
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>
2017-01-11 11:01:52 +01:00
c4e51fd055
Merge pull request #3020 from nextcloud/2944
...
[#2944 ] Update mobile.css
2017-01-11 09:34:32 +01:00
4f3da2bee4
Update mobile.css
2017-01-11 09:12:08 +01:00
447e388ce9
Merge pull request #2744 from nextcloud/oc_26324
...
[downstream] Fix DAV stat cache to properly cache 404
2017-01-11 08:16:40 +01:00
f515c6db4a
Merge pull request #2745 from nextcloud/oc_26590
...
[downstream] Skip local shares in bkg scan and occ files:scan (#26590 )
2017-01-11 08:16:12 +01:00
a90cbb0f09
Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully
...
Handle log_type "nextcloud" more gracefully
2017-01-11 08:14:24 +01:00
fcda3a20f4
create new encryption keys on password reset and backup the old one
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-10 17:04:32 +01:00
40239decb1
Merge pull request #3012 from nextcloud/fix-karma-image-warnings
...
show fewer warnings in karma test runs
2017-01-10 16:29:39 +01:00
00b17c3af5
Only check for local shared storages
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-10 16:14:21 +01:00
706655ef20
Skip local shares in bkg scan and occ files:scan ( #26590 )
...
Local shares should only be scanned when doing it for the owner to
avoid repeatedly rescanning the same shared storage over and over again
for every recipient.
2017-01-10 16:11:45 +01:00
Joas Schilling
John Molakvoæ
John Molakvoæ (skjnldsv)
Christoph Wurst
Morris Jobke
Nextcloud bot
Roeland Jago Douma
Roeland Jago Douma
Cornelius Kölbel
Rodrigo Almeida
Bjoern Schiessle
Vincent Petry