685faad5ca
fix method name due to changes in master
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-25 13:03:08 +02:00
b1d646640a
Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2
2017-04-25 12:42:17 +02:00
8db21ad8c8
user_ldap: Add support for gidNumber
...
This patch is based on the work of @dleeuw (https://github.com/dleeuw )
(See https://github.com/nextcloud/server/issues/2640#issuecomment-269615883 for more details).
The difference is user & group data will be written into cache to have
better performance, and functions splited from primaryGroupID series to
make them more readable.
Fixed https://github.com/nextcloud/server/issues/2640
Signed-off-by: Xuanwo <xuanwo@yunify.com>
2017-04-25 10:06:47 +08:00
133f3fdc9a
[tx-robot] updated from transifex
2017-04-25 00:07:30 +00:00
b156117cbd
Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casing
...
Fix storage info with wrong casing
2017-04-24 10:41:16 -03:00
c5617f4e8a
Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save
...
Fix working icon placement on password save
2017-04-24 14:34:56 +02:00
97c27395aa
Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warnings
...
Fix sinon.stub deprecation warnings
2017-04-24 13:47:46 +02:00
42e805f057
Merge pull request #1023 from GitHubUser4234/ldap_password_renew_pr
...
Handle password expiry in user_ldap
2017-04-24 12:17:04 +02:00
36f55b5867
Fix working icon placement on password save
...
Before, the icon appeared below the text input for the password. Now, it
appears inside the text input, to the right end.
The CSS was adjusted based on other icons shown in that position for
other text inputs in the Share tab view, like the information icon or
the clipboard icon.
Fixes #4135
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:50:06 +02:00
3d671cc536
Merge pull request #4443 from nextcloud/cleanup-unused-imports
...
Remove unused use statements
2017-04-24 11:47:37 +02:00
2317d7bb49
Fix sinon.stub deprecation warnings
...
Calls to `sinon.stub(obj, 'meth', fn)` are deprecated and therefore
replaced by `sinon.stub(obj, 'meth).callsFake(fn)` as instructed by
the deprecation warning.
This makes the js unit testing output readable again.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-24 10:39:37 +02:00
7a87fedac3
Remove dead arguments
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:18:14 +02:00
e19126425b
Fix similar issues with the group id
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:15:03 +02:00
992c48c89b
Fix the storage info and other checks when the user has wrong casing
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:10:50 +02:00
d842b29c5b
Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displayname
...
add owner-displayname property to calendars and addressbooks
2017-04-24 09:17:55 +02:00
1c2cdc9d3a
Merge pull request #4444 from nextcloud/remove-unused-variables
...
Remove unused variables
2017-04-24 08:09:01 +02:00
a01f946c56
[tx-robot] updated from transifex
2017-04-24 00:07:28 +00:00
c89e057d27
add owner-displayname property to calendars and addressbooks
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-23 11:26:49 +02:00
c54a59d51e
Remove unused use statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
11c7953888
[tx-robot] updated from transifex
2017-04-23 00:07:31 +00:00
2b6f6dac00
Remove unused variables
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 18:20:51 -05:00
7acdc2a096
Merge pull request #4432 from nextcloud/fix-grammar
...
Fix grammar
2017-04-22 08:15:46 +02:00
363d1c69dd
[tx-robot] updated from transifex
2017-04-22 00:07:36 +00:00
aa2bed44b6
Fix grammar
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-21 16:07:12 -05:00
867b3ee234
Merge pull request #4396 from nextcloud/scan-non-existing
...
show error when trying to scan non existing path
2017-04-21 19:47:33 +02:00
4dd72e9eb9
Use RESPOND_NOT_FOUND for non existing user
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-21 11:30:00 -05:00
9a0280f1c8
Merge pull request #4422 from nextcloud/favorite-wording-detail
...
Wording detail fix for favorite emptycontent view
2017-04-21 16:43:22 +02:00
5605166523
Merge pull request #4423 from nextcloud/reload-fav-view
...
properly reload favorites list
2017-04-21 09:35:34 -05:00
c49def4a10
properly reload favorites list
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-21 14:20:34 +02:00
8b8f537f3b
Wording detail fix for favorite emptycontent view
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-21 14:11:49 +02:00
bec4b468c3
No need to log guzzle exception
...
When getting/requesting a shared secret there is no need to log the full
exception when an unexpected status code is returned since this won't
really tell us anything as the bad stuff happened on a remote server
Fixes #3380
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-21 11:29:01 +02:00
e9b00f84b8
Merge pull request #4406 from nextcloud/fix-unit-test-problems
...
Fix unit test problems
2017-04-21 09:35:01 +02:00
c4bd01456b
Merge pull request #4408 from nextcloud/accesslist_ng
...
Move systemtags and comments to new accesslist functions
2017-04-21 08:58:52 +02:00
fb7663cefe
[tx-robot] updated from transifex
2017-04-21 00:07:37 +00:00
f5b900b654
Merge pull request #4412 from individual-it/master
...
deleted forgotten code in test
2017-04-20 18:04:32 -05:00
8a743e0359
Merge pull request #4404 from Ardinis/master
...
Remove json handling for files_external:config
2017-04-20 17:59:35 -05:00
b99d2b78bd
Merge pull request #3595 from nextcloud/dav-sharing-changes
...
Restrict DAV share handling to the owner only
2017-04-20 16:44:16 -05:00
5d18e4243d
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:01:26 -05:00
faf55adb90
deleted forgotten code in test
...
how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-20 22:27:51 +05:45
810fb7ff2c
Merge pull request #4402 from nextcloud/fix-clickable-area
...
Fix clickable area in share permissions menu
2017-04-20 16:49:00 +02:00
6c294c3407
fix typo
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
9d07ec5a96
Fix casing
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
aa54d31bd2
fix unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:27 +02:00
972b4c04e2
respect password policy for auto generated passwords
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
428d7cdb5e
improve mail text
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
f00c1eccf7
create activity if a password was send by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
7a8f8cbb33
templates no longer needed
2017-04-20 16:33:26 +02:00
d8dcd72118
allow admin to enforce password on mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
4004e39f75
Move systemtags and comments to new accesslist functions
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 14:34:28 +02:00
73b6cd1061
Fix invalid Dav test
...
PHP Warning: Declaration of PublicCalendarTest::testPrivateClassification()
should be compatible with CalendarTest::testPrivateClassification($expectedChildren, $isShared)
in apps/dav/tests/unit/CalDAV/PublicCalendarTest.php on line 29
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:54:20 +02:00
Arthur Schiwon
Xuanwo
Nextcloud bot
Morris Jobke
Roeland Jago Douma
Daniel Calviño Sánchez
Joas Schilling
Christoph Wurst
Georg Ehrke
Lukas Reschke
Robin Appelman
Jan-Christoph Borchardt
Roeland Jago Douma
Artur Neumann
Björn Schießle