Commit Graph

37113 Commits

Author SHA1 Message Date
Joas Schilling ade91c8fe2
Recognize .bat and .cmd files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 14:25:25 +01:00
Björn Schießle b4ade76665 Merge pull request #3424 from nextcloud/fix-upgrade-path
Fix return value of getAllowedPreviousVersions()
2017-02-10 11:48:30 +01:00
Björn Schießle 4ea33fb453 Merge pull request #3425 from nextcloud/set-vendor-during-install
Set vendor during install
2017-02-10 11:45:50 +01:00
Björn Schießle a88fc0c283 Merge pull request #3181 from nextcloud/fix-favorite-activity-mail
Make sure the file information is available when sending the email
2017-02-10 11:35:45 +01:00
Joas Schilling dd5cded898 Merge pull request #3429 from nextcloud/oparoz-issuetemplate
Fix issue template log formatting
2017-02-10 10:30:01 +01:00
Olivier Paroz 08ced5bc7c Fix log formatting 2017-02-10 09:08:05 +01:00
Morris Jobke d548329543
Set vendor during install
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 23:37:00 -06:00
Morris Jobke b8c749b903
Fix return value of getAllowedPreviousVersions()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 23:24:24 -06:00
Morris Jobke 397feb9e8d Merge pull request #3422 from nextcloud/transifex
add transifex config for sharebymail
2017-02-09 20:14:10 -06:00
Morris Jobke 8a74ab88d8
add transifex config for sharebymail
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 19:53:32 -06:00
Nextcloud bot c2e61362cc
[tx-robot] updated from transifex 2017-02-10 01:07:02 +00:00
Robin Appelman bf88060a98 Merge pull request #3297 from nextcloud/cloud-id-resolve
Add a single public api for resolving a cloud id to a user and remote and back
2017-02-09 14:54:32 +01:00
Robin Appelman 0d8d658b7e
fix copyright headers
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-09 13:32:36 +01:00
Robin Appelman f6cd5200a2
clean cloud ids
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-09 13:31:06 +01:00
Lukas Reschke 4a5a3681d9 Merge pull request #3184 from nextcloud/issue-3165
Prevent migration from ownCloud 11 to Nextcloud 12
2017-02-09 13:29:08 +01:00
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
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
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
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
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