Commit graph

37266 commits

Author SHA1 Message Date
Joas Schilling
ed4633a552 Merge pull request #3408 from nextcloud/nullstorage-free-space
return unknown free space from nullstorage
2017-02-09 13:17:54 +01:00
Lukas Reschke
51f0555b5c Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation
Don't log the password on confirmPassword when LDAP throws an exception
2017-02-09 12:19:53 +01:00
Björn Schießle
f33760c7f1 Merge pull request #3407 from nextcloud/issue-3312-user-settings-email-accounts-table
Update the email in the accounts table as well
2017-02-09 12:10:45 +01:00
Joas Schilling
ac841ee002 Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name
oc_token should be nc_token
2017-02-09 10:07:59 +01:00
Morris Jobke
5e408aeb6c
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-08 20:39:34 -06:00
Nextcloud bot
3c4b539fdf
[tx-robot] updated from transifex 2017-02-09 01:07:10 +00:00
Robin Appelman
ad5d04ccbe
return unknown free space from nullstorage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 16:38:00 +01:00
Robin Appelman
ae66cf8d37
add tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
Robin Appelman
976cff780b
register cloudidmanager for files_sharing
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
Robin Appelman
e7e614d801
log ocs exceptions
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
Robin Appelman
a359d0d7c7
remove test for removed code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:02 +01:00
Robin Appelman
fa49c4a13b
Add a single public api for resolving a cloud id to a user and remote and back
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:02 +01:00
Lukas Reschke
1a591cea97 Merge pull request #3394 from nextcloud/issue-3344-files-activity-expects-parameter-1-to-be-an-array
Make sure ownCloud 8.2 activities also can get displayed
2017-02-08 14:47:45 +01:00
Joas Schilling
460b667f80
Update the email in the accounts table as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-08 13:52:55 +01:00
Joas Schilling
f5c42fe0c4 Merge pull request #3403 from nextcloud/rename-dbpassword-toggle
Rename database password toggle
2017-02-08 12:16:53 +01:00
Joas Schilling
54e39d4b93
Fix files sharing legacy as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-08 11:55:50 +01:00
m3ntalsp00n
01963b4d72 Fix indentation and l10n compliance.
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
2017-02-08 16:55:31 +10:00
Nextcloud bot
1aba2d9ed8
[tx-robot] updated from transifex 2017-02-08 01:07:09 +00:00
Morris Jobke
f1c4f4c020
Rename database password toggle
* otherwise submitting the form with the password show will be overwritten
* see 2c9d7eeb76/core/Controller/SetupController.php (L59)
* seems to be a legacy fallback
* fixes #3381

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-07 16:59:12 -06:00
Joas Schilling
d0e6235b03
Don't log the password on confirmPassword when LDAP throws an exception
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 12:16:11 +01:00
Joas Schilling
d79838ac9b
Add tests for getUser()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 12:01:28 +01:00
Joas Schilling
881c7275a2
Add tests for getFile()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 11:49:32 +01:00
Joas Schilling
c031c77e3c
Make sure ownCloud 8.2 activities also can get displayed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 11:30:23 +01:00
Nextcloud bot
5e4bbb394c
[tx-robot] updated from transifex 2017-02-07 01:08:50 +00:00
Sandro Lutz
9b6f99ab08 Update license header
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 01:25:39 +01:00
Morris Jobke
5157f16d28 Merge pull request #3352 from nextcloud/public-page-guest-css-loader
Fix public page css fallback loading
2017-02-06 18:15:56 -06:00
Sandro Lutz
fa1d607bfa Merge remote-tracking branch 'nextcloud/master'
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 00:15:30 +01:00
Sandro Lutz
ff3fa538e4 Add missing use statement for PublicEmitter
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 00:12:19 +01:00
John Molakvoæ (skjnldsv)
5383cc6170
TOTP css
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-06 22:26:01 +01:00
Robin Appelman
b55f5af7ea Merge pull request #3364 from nextcloud/sass-logging
Lower log levels of resource locator
2017-02-06 12:52:57 +01:00
Nextcloud bot
fa96b9e356
[tx-robot] updated from transifex 2017-02-06 01:07:04 +00:00
Nextcloud bot
e4a74568e6
[tx-robot] updated from transifex 2017-02-05 01:07:05 +00:00
Marius Blüm
9ce8437b8b Merge pull request #3353 from nextcloud/mobile-view-files-fix
Fix files mobile view
2017-02-04 21:00:40 +01:00
m3ntalsp00n
dd9ee2db6f fix tests, longer wait time, update notification stub
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
2017-02-04 18:51:52 +10:00
m3ntalsp00n
fd40613d8e showUpdate funciton allows updated messages
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
2017-02-04 15:47:09 +10:00
Nextcloud bot
03bbda913d
[tx-robot] updated from transifex 2017-02-04 01:07:20 +00:00
Morris Jobke
942465c8b1
fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-03 11:52:01 -06:00
Robin Appelman
3d8a300b77
Lower log levels of resource locator
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-03 13:09:33 +01:00
Nextcloud bot
49bce91404
[tx-robot] updated from transifex 2017-02-03 01:07:21 +00:00
Christoph Wurst
5e728d0eda oc_token should be nc_token
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-02 21:56:44 +01:00
Morris Jobke
949fbdef33 Merge pull request #3359 from nextcloud/fix-sharing-app-description
Fix Sharing app description
2017-02-02 14:47:45 -06:00
Joas Schilling
d318e2b005
Fix Sharing app description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-02 16:22:21 +01:00
Nextcloud bot
b946ec9d6c
[tx-robot] updated from transifex 2017-02-02 01:07:05 +00:00
Sandro Lutz
20f878b014 Fix typo for UserManager variable
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:54:00 +01:00
Sandro Lutz
6feff0ceba Add check if UserManager is of type PublicEmitter before calling preLogin hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:50 +01:00
Sandro Lutz
e30d28f7eb Change where preLogin hook gets called
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:42 +01:00
Sandro Lutz
6ab0a3215d Remove preLoginValidation hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:29 +01:00
Sandro Lutz
e14d50eb1f Fix indentation
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:50:47 +01:00
Sandro Lutz
4ebcd5ac0b Add preLoginValidation hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:50:25 +01:00
John Molakvoæ (skjnldsv)
e0e5b32f94
Fix files mobile view
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-01 18:39:27 +01:00