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
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
fab82e9780
Merge pull request #3029 from nextcloud/systemtags-scss-optimisation
...
Systemtags scss optimisation
2017-01-11 18:41:14 +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
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
7e06f051c9
remove non required sql requests
...
```
SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = '';
```
2017-01-10 17:16:56 +03:00
8ab16f87ac
spaces added
2017-01-10 16:44:14 +03:00
6a74f7db11
spaces added
2017-01-10 16:43:43 +03:00
5c77923360
allowed '0' uid
2017-01-10 16:39:10 +03:00
b7e6c5ecdf
allowed '0' uid
2017-01-10 16:37:18 +03:00
b727edf17e
Merge pull request #3009 from nextcloud/fix-calendar-todo-event-type
...
Make sure the used event type and the setting/filter are the same
2017-01-10 14:28:30 +01:00
30689f338f
Merge pull request #2914 from nextcloud/logrotate-logfile
...
Get the logfile location while running the logrotate cron job instead…
2017-01-10 14:28:09 +01:00
aee11009bd
Merge pull request #3000 from nextcloud/cache-no-store
...
set 'no-store' cache header if we do not want FF to cache
2017-01-10 14:07:13 +01:00
e6a3e8bcd0
show fewer warnings in karma test runs
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 13:50:22 +01:00
4dd2a1e679
Merge pull request #2943 from nextcloud/kill_old_preview_code
...
Cleanup old preview code
2017-01-10 13:50:14 +01:00
a5bf14ada3
Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares
...
share by mail should continue to work, even if public links are disabled
2017-01-10 13:06:20 +01:00
7fa063ceca
Better fallback for unknown log types
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:59:13 +01:00
3fa715c2ab
Merge pull request #3005 from nextcloud/dev-manual-12
...
fix dev manual link
2017-01-10 12:54:20 +01:00
a70a081fff
Make sure the used event type and the setting/filter are the same
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:28:55 +01:00
74a2938f8e
fix spaces
2017-01-10 14:21:23 +03:00
45c6301772
fix controller test
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 11:54:45 +01:00
5262779101
fix brackets
2017-01-10 13:29:35 +03:00
b0ff59d42f
remove non required db requests
2017-01-10 13:09:33 +03:00
33259b41cd
remove non required db requests
2017-01-10 13:05:21 +03:00
5a06dfaca1
fix dev manual link
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 11:02:05 +01:00
Morris Jobke
Nextcloud bot
John Molakvoæ
Roeland Jago Douma
John Molakvoæ (skjnldsv)
Roeland Jago Douma
Christoph Wurst
Cornelius Kölbel
Rodrigo Almeida
Bjoern Schiessle
Vincent Petry
Loki3000
Joas Schilling