mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
36,727 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

36727 Commits

Author SHA1 Message Date
Morris Jobke 6431f009de Merge pull request #3511 from nextcloud/backport-3362-stable11 
[stable11] Fix cookie name (nc_token instead of oc_token)
 2017-02-16 11:33:02 -06:00
Morris Jobke cc226b183f Merge pull request #3493 from nextcloud/backport-3324 
[stable11] LDAP's checkPassword should only catch when a user was not found
 2017-02-16 11:32:37 -06:00
Morris Jobke c868e37346 Merge pull request #3508 from nextcloud/nullstorage-free-space-11 
[11] return unknown free space from nullstorage
 2017-02-16 10:53:06 -06:00
Morris Jobke 48554db156
fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-16 10:29:45 -06:00
Lukas Reschke 92bfeb2eb6
RC2 it is 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-02-16 16:40:06 +01:00
Christoph Wurst c6071e027c
Fix cookie name (nc_token instead of oc_token) 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-16 16:27:20 +01:00
Christoph Wurst 757949eec3
add title to backup codes print page 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-16 16:14:58 +01:00
Christoph Wurst 41522306ed
print and close the new tab, not the current one when printing backup codes 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-16 16:14:49 +01:00
Morris Jobke 131945593e
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-16 13:38:54 +01:00
Robin Appelman 8cf62e21b5
return unknown free space from nullstorage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-16 13:38:45 +01:00
Nextcloud bot 8296f1a35b
[tx-robot] updated from transifex 2017-02-16 01:07:53 +00:00
Morris Jobke 88720f3565 Merge pull request #3499 from nextcloud/fix-addressbook-deletion 
[stable11] Address book data lost when any user receiving a share is deleted backport
 2017-02-15 18:37:05 -06:00
Roeland Jago Douma 17d57f336d Merge pull request #3500 from nextcloud/stable11-3403 
[stable11] Rename database password toggle
 2017-02-15 20:15:38 +01:00
Morris Jobke aeefcfe8a2 Merge pull request #3494 from nextcloud/backport-3485 
[stable11] Popovermenu files css fix
 2017-02-15 10:29:28 -06:00
Morris Jobke f59e0ed4ca
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-15 10:14:07 -06:00
John Molakvoæ (skjnldsv) 6923821964
Address book data lost when any user receiving a share is deleted backport 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-02-15 16:09:00 +01:00
John Molakvoæ (skjnldsv) 07da606caa
Css fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-02-15 12:34:54 +01:00
Arthur Schiwon 839f2342da
LDAP's checkPassword should only catch when a user was not found, fixes #2431 
Also fixes error processing after ldap_search, due to different return format

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-02-15 11:50:36 +01:00
Nextcloud bot d41b2d688c
[tx-robot] updated from transifex 2017-02-15 01:07:38 +00:00
Morris Jobke 4e9f59dab2 Merge pull request #3481 from nextcloud/stable11-screensharing-icon 
[stable11] add screensharing icon
 2017-02-14 17:40:22 -06:00
Jan-Christoph Borchardt 9c1573d278 add screensharing icon 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-02-14 21:04:36 +01:00
Nextcloud bot 33c995bc47
[tx-robot] updated from transifex 2017-02-14 01:07:30 +00:00
Lukas Reschke bd3c99057b Merge pull request #3440 from nextcloud/backport-oc-26963 
[stable11] Make sure invalid images don't flood the log file
 2017-02-13 10:13:16 +01:00
Lukas Reschke 9ba080f5f8 Merge pull request #3445 from nextcloud/stable11-add-integration-tests-for-dav 
[stable11] Add integration tests for legacy DAV endpoints
 2017-02-13 10:11:28 +01:00
Nextcloud bot 2cb637ec85
[tx-robot] updated from transifex 2017-02-13 01:07:19 +00:00
Nextcloud bot 1e668ec02b
[tx-robot] updated from transifex 2017-02-12 01:07:36 +00:00
Nextcloud bot 61420af20c
[tx-robot] updated from transifex 2017-02-11 01:07:33 +00:00
Victor Dubiniuk 02a7e3f6d2
Check if color exists in palette before using it 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-02-10 16:28:32 +01:00
Lukas Reschke 886938718d
Add integration tests for legacy DAV endpoints 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-02-10 16:19:45 +01:00
Lukas Reschke f65b99c17d Merge pull request #3431 from nextcloud/backport-3430-fix-ios-client-detection 
[stable11] Fix detection of the new iOS app
 2017-02-10 14:45:54 +01:00
Lukas Reschke c025aa88d4 Merge pull request #3436 from nextcloud/stable11-increase-version 
Increase version to 11.0.2 RC1
 2017-02-10 14:03:49 +01:00
Joas Schilling 057f330879
Make sure invalid images don't flood the log file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-10 13:45:37 +01:00
Lukas Reschke 592af1fff1 Merge pull request #3259 from nextcloud/add-profile-data-to-provisioning-api-stable11 
Add profile data to provisioning api stable11
 2017-02-10 13:00:04 +01:00
Lukas Reschke 347008f125
Increase version to 11.0.2 RC1 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-02-10 12:55:32 +01:00
Lukas Reschke 3f290315ef Merge pull request #3433 from nextcloud/backport-3181-fix-favorite-activity-mail 
[stable11] Make sure the file information is available when sending the email
 2017-02-10 12:49:39 +01:00
Lukas Reschke 7330430618 Merge pull request #3426 from nextcloud/stable11-set-vendor-during-install 
[stable11] Set vendor during install
 2017-02-10 11:41:06 +01:00
Lukas Reschke 020bf77dde Merge pull request #3286 from nextcloud/popover-backport 
[stable11] popovermenu backport
 2017-02-10 11:27:03 +01:00
Lukas Reschke 0cb59ad3f5 Merge pull request #3412 from nextcloud/backport-3394-files-activity-expects-parameter-1-to-be-an-array 
[stable11] Make sure ownCloud 8.2 activities also can get displayed
 2017-02-10 10:44:14 +01:00
Joas Schilling 372474603d
Make sure the file information is available when sending the email 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-10 10:35:29 +01:00
Joas Schilling 76a2bf72e6
Fix detection of the new iOS app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-10 10:13:33 +01:00
Morris Jobke 5c1bf139b4 Merge pull request #3414 from nextcloud/backport-3396-dont-log-password-on-failed-confirmation 
[stable11] Don't log the password on confirmPassword when LDAP throws an exception
 2017-02-10 00:08:47 -06:00
Morris Jobke 020fa06d34 Merge pull request #3411 from nextcloud/backport-3407-user-settings-email-accounts-table 
[stable11] Update the email in the accounts table as well
 2017-02-09 23:52:41 -06:00
Morris Jobke c6ed15b88e
Set vendor during install 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-09 23:39:58 -06:00
Morris Jobke eb31895ad5 Merge pull request #3423 from nextcloud/stable11-transifex 
add transifex config for sharebymail
 2017-02-09 20:14:24 -06:00
Morris Jobke e48f608b08
add transifex config for sharebymail 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-09 19:56:04 -06:00
Nextcloud bot 3aeed578fc
[tx-robot] updated from transifex 2017-02-10 01:07:12 +00:00
Joas Schilling 1ee9bee489
Backport more fixes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-09 14:53:17 +01:00
Lukas Reschke 201055bf8c Merge pull request #3251 from nextcloud/fix-upload-estimation-translation 
Use correct plural implementation for upload estimation
 2017-02-09 14:45:46 +01:00
Joas Schilling 8d87ac3a9d
Don't log the password on confirmPassword when LDAP throws an exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-09 12:20:53 +01:00
Joas Schilling 1badbe922e
Fix files sharing legacy as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-09 12:17:22 +01:00