wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
38612 commits 157 branches 562 tags 714 MiB
Commit graph

15898 commits

Author SHA1 Message Date
Joas Schilling
bec9f18a0f Merge pull request #4478 from nextcloud/improve_settings_help 
adding some documentation hints and some smaller cleanup
 2017-04-26 09:45:01 +02:00
Morris Jobke
527369be9c Merge pull request #4500 from nextcloud/downstream-27118 
Restrict proppatch to the proper nodes
 2017-04-26 01:28:16 -03:00
Morris Jobke
4c2c08f376 Merge pull request #4416 from gvmura/avoid-duplicate-files-google 
Avoid duplicate files in google with the same name
 2017-04-26 01:26:04 -03:00
Morris Jobke
8a004ac41f Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwo 
user_ldap: Add support for gidNumber
 2017-04-25 22:34:30 -03:00
Nextcloud bot
e5fe41e16b
[tx-robot] updated from transifex 2017-04-26 00:07:43 +00:00
Jan-Christoph Borchardt
bbb58625fe Wording fixes 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 17:45:35 +02:00
Jan-Christoph Borchardt
4e537b5d6b Small layout fixes to settings hints 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 17:45:35 +02:00
Frank Karlitschek
f62b75b2b8 change the headline as suggested 2017-04-25 17:45:35 +02:00
Frank Karlitschek
c300d9b225 one more hint 2017-04-25 17:45:35 +02:00
Frank Karlitschek
5e1ce69b05 adding some documentation hints and some smaller cleanup 2017-04-25 17:45:35 +02:00
Vincent Petry
1c40a05204
Restrict proppatch to the proper nodes 
Need to fetch the node earlier because cancelling from within the
handler is not possible. Well, it is but it prevents other node types
using the same property names to run because the failure marks the
property with status 403.
 2017-04-25 17:25:03 +02:00
Joas Schilling
5ee445c54b
Audit log for enabling/disabling a user 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 17:20:35 +02:00
Joas Schilling
8ef25a7628 Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletion 
Audit group creation/deletion
 2017-04-25 16:14:52 +02:00
Morris Jobke
5a9224fb4c Merge pull request #3531 from nextcloud/theming-scss 
Theming using SCSS variables
 2017-04-25 10:56:13 -03:00
Arthur Schiwon
43f451e9e0
Fix usersInGroup retrieval 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-25 15:07:05 +02:00
Roger Szabo
f1522a8dca 4190 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-04-25 19:06:49 +08:00
Arthur Schiwon
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
Arthur Schiwon
b1d646640a
Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2 2017-04-25 12:42:17 +02:00
Joas Schilling
6448cf5748
Mock it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 12:16:07 +02:00
Joas Schilling
bedd500884
Logo and background URLs must be relative 
They are used way to often for such a change

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 11:43:06 +02:00
Julius Härtl
bc1efdf2e1
Fix theming tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-25 11:39:49 +02:00
Julius Haertl
68a63ad3f3
Implement scss variable injection by OC_Defaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>

Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Use SCSSCacher to build theming css

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update theming.scss

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Inject SCSSCacher for easier testing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <jus@bitgrid.net>

MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-25 11:39:45 +02:00
Joas Schilling
5be1010d45
Fix invalid character 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 11:06:27 +02:00
Xuanwo
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
Nextcloud bot
133f3fdc9a
[tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00
Morris Jobke
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
Roeland Jago Douma
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
Roeland Jago Douma
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
blizzz
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
Daniel Calviño Sánchez
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
Joas Schilling
3d671cc536 Merge pull request #4443 from nextcloud/cleanup-unused-imports 
Remove unused use statements
 2017-04-24 11:47:37 +02:00
Christoph Wurst
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
Joas Schilling
7a87fedac3
Remove dead arguments 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 10:18:14 +02:00
Joas Schilling
e19126425b
Fix similar issues with the group id 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 10:15:03 +02:00
Joas Schilling
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
Roeland Jago Douma
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
Roeland Jago Douma
1c2cdc9d3a Merge pull request #4444 from nextcloud/remove-unused-variables 
Remove unused variables
 2017-04-24 08:09:01 +02:00
Nextcloud bot
a01f946c56
[tx-robot] updated from transifex 2017-04-24 00:07:28 +00:00
Georg Ehrke
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
Morris Jobke
c54a59d51e
Remove unused use statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 19:23:31 -05:00
Nextcloud bot
11c7953888
[tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Morris Jobke
2b6f6dac00
Remove unused variables 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 18:20:51 -05:00
Lukas Reschke
7acdc2a096 Merge pull request #4432 from nextcloud/fix-grammar 
Fix grammar
 2017-04-22 08:15:46 +02:00
Nextcloud bot
363d1c69dd
[tx-robot] updated from transifex 2017-04-22 00:07:36 +00:00
Morris Jobke
aa2bed44b6
Fix grammar 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-21 16:07:12 -05:00
Roeland Jago Douma
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
Morris Jobke
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
Roeland Jago Douma
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
Morris Jobke
5605166523 Merge pull request #4423 from nextcloud/reload-fav-view 
properly reload favorites list
 2017-04-21 09:35:34 -05:00
Robin Appelman
c49def4a10
properly reload favorites list 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-21 14:20:34 +02:00