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
Georg Ehrke
40eec1e63c
add repairstep with backgroundjob to index calendar data
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-25 11:55:31 +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
Georg Ehrke
e760cda96f
remove unused CalendarSearchValidator
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-24 22:38:21 +02:00
Georg Ehrke
57b543a918
add Nextcloud Search extension to CalDAV
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-24 22:38:20 +02: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
6d1651452f
Add back the name query part
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-21 20:43:40 +02:00
Thomas Citharel
ecba3722da
Factorize query for searching contacts
2017-04-21 20:43:36 +02: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
Jan-Christoph Borchardt
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
gvmura
0d063c316a
avoid duplicate files in google with the same name
...
Signed-off-by: gvmura <gvmura@uniss.it>
2017-04-21 11:30:02 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
e9b00f84b8
Merge pull request #4406 from nextcloud/fix-unit-test-problems
...
Fix unit test problems
2017-04-21 09:35:01 +02:00
Roeland Jago Douma
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
Nextcloud bot
fb7663cefe
[tx-robot] updated from transifex
2017-04-21 00:07:37 +00:00
Morris Jobke
f5b900b654
Merge pull request #4412 from individual-it/master
...
deleted forgotten code in test
2017-04-20 18:04:32 -05:00
Morris Jobke
8a743e0359
Merge pull request #4404 from Ardinis/master
...
Remove json handling for files_external:config
2017-04-20 17:59:35 -05:00
Morris Jobke
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
Morris Jobke
5d18e4243d
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:01:26 -05:00
Artur Neumann
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
Björn Schießle
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
Morris Jobke
6c294c3407
fix typo
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
Morris Jobke
9d07ec5a96
Fix casing
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
Bjoern Schiessle
aa54d31bd2
fix unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:27 +02:00
Bjoern Schiessle
972b4c04e2
respect password policy for auto generated passwords
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle
428d7cdb5e
improve mail text
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
7a8f8cbb33
templates no longer needed
2017-04-20 16:33:26 +02:00
Bjoern Schiessle
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
Roeland Jago Douma
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
Joas Schilling
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
Joas Schilling
8c703c954d
Fix theming tests
...
Trying to configure method "shouldReplaceIcons" which cannot be configured
because it does not exist, has not been specified, is final, or is static
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:10:34 +02:00
Joas Schilling
a0ada9aab4
Don't use deprecated getMock() anymore
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:30:21 +02:00
Ardinis
71118214f9
reviewed
2017-04-20 11:31:04 +02:00
Joas Schilling
b469882595
Merge pull request #4212 from individual-it/master
...
validate file name before uploading in upload only folder
2017-04-20 10:50:56 +02:00
Joas Schilling
088f4422f9
Fix remaining "PHP Inspection" warnings
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 10:44:11 +02:00
Joas Schilling
62ef59616d
Add public access modifier to all methods
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 10:44:11 +02:00
Joas Schilling
c2d1e6e7ff
Restrict share handling to the owner only
...
Otherwise group members can remove the share for the complete group,
remove edit permissions and even single user shares for other users.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 10:44:11 +02:00
Nextcloud bot
adf316c3af
[tx-robot] updated from transifex
2017-04-20 00:07:36 +00:00
Morris Jobke
16b8397765
Fix clickable area in share permissions menu
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:41:26 -05:00
Morris Jobke
fbedea0807
Add PHPDoc and handle exception in ScanAppData as well
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:04:16 -05:00
Morris Jobke
16c4755e03
Rename renderHTML to renderHtml
...
* fixes #4383
* improves consistency
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 15:46:41 -05:00
Morris Jobke
4be923e459
Improve menu CSS
...
* fix mess with menus and actions in the files app
* reduces amount of !important usages
* keeps the behaviour on mobile as well as on desktop
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 12:42:23 -05:00
Roeland Jago Douma
ac9d0fd14c
Merge pull request #4385 from nextcloud/remove-unused-css
...
Remove unused CSS
2017-04-19 19:27:05 +02:00
Robin Appelman
ce2dba0796
show error when trying to scan non existing path
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-19 14:36:38 +02:00
Lukas Reschke
a3569a1452
Merge pull request #4382 from nextcloud/use-proper-reply-to
...
Add "Reply-To" on ShareByMailProvider mails
2017-04-19 12:04:18 +02:00
Lukas Reschke
b7fe28bba1
Fix indentation
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-19 12:03:54 +02:00
Roeland Jago Douma
ad24b86013
Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations
...
Adjust existing bruteforce protection code
2017-04-19 09:27:23 +02:00
Morris Jobke
74936e15d1
Remove unused CSS
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 20:36:54 -05:00
Nextcloud bot
febe01f571
[tx-robot] updated from transifex
2017-04-19 00:07:40 +00:00
Nextcloud bot
6b490f45fd
[tx-robot] updated from transifex
2017-04-18 23:08:43 +00:00
Morris Jobke
269600a04f
Merge pull request #4369 from nextcloud/fix-translations
...
Fix translations
2017-04-18 18:01:50 -05:00
Joas Schilling
1c0bffe87f
Fix translations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
Nextcloud bot
c40b7acb09
[tx-robot] updated from transifex
2017-04-18 20:47:45 +00:00
Lukas Reschke
203ef88509
Add "Reply-To" on ShareByMailProvider mails
...
Fixes https://github.com/nextcloud/server/issues/4209
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 22:23:07 +02:00
Artur Neumann
bf58d24b5c
remove accidently left over *f*it
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:53:49 +05:45
Artur Neumann
88f02f27a3
JS tests for upload only function
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:43:25 +05:45
Artur Neumann
cdb65eff34
refactor to make it easier to test
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:42:36 +05:45
Nextcloud bot
b072d2c49d
[tx-robot] updated from transifex
2017-04-18 00:07:25 +00:00
Nextcloud bot
df2235c71f
[tx-robot] updated from transifex
2017-04-17 00:07:33 +00:00
Nextcloud bot
69e0e2420c
[tx-robot] updated from transifex
2017-04-16 00:07:23 +00:00
Morris Jobke
10290eb006
Merge pull request #2834 from nextcloud/accesListToShareManager
...
Access list to share manager
2017-04-15 13:06:24 -05:00
Nextcloud bot
dafa9c740a
[tx-robot] updated from transifex
2017-04-15 00:07:36 +00:00
Ardinis
3db84ed90a
Remove json handling for files_external:config
...
#4347
2017-04-14 15:42:45 +02:00
Lukas Reschke
727688ebd9
Adjust existing bruteforce protection code
...
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-14 13:42:40 +02:00
Nextcloud bot
0f96d5a641
[tx-robot] updated from transifex
2017-04-14 00:07:36 +00:00
Morris Jobke
ec034757fa
Merge pull request #4337 from nextcloud/fix-adblock-share-icon
...
Fix AdBlock blocking share icon, ref #866
2017-04-13 12:10:37 -05:00
Morris Jobke
13c71203bb
Merge pull request #4341 from nextcloud/local-link-explanation
...
Explain local link
2017-04-13 12:01:57 -05:00
Jos Poortvliet
a8b09c860e
Explain local link
...
The local link is a clever thing and the clients should support this imho but it might not be clear to all users. For one, the term 'local link' is a bit odd. Local with respect to what? It links directly to the file or folder, so direct link seems to make more sense to me. And we should explain the difference with a public link. So this PR:
* renames local link to direct link
* adds a short explanation, noting it only works for users who have access to this file/folder.
As other links are called public link you could also consider calling this 'private link', I suppose. But the links we sent by mail to ppl could also be called 'private link' (they are for one user, who git it by email) so I think it might be confusing. What do @nextcloud/designers think?
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-13 12:01:45 -05:00
Lukas Reschke
f3dbfd68a2
Merge pull request #4336 from nextcloud/add-ratelimiting
...
Add support for ratelimiting via annotations
2017-04-13 18:53:56 +02:00
Roeland Jago Douma
cab41118f6
Mail shares trigger the public key
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 15:19:23 +02:00
Joas Schilling
629b7c0fc3
Adjust docs and make !$currentAccess simpler
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling
6c23a5fa35
Add unit tests for sharebymail provider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling
5df727d4ad
Fix federated file sharing
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling
3c1365c0d1
Fix returned paths for remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling
4bcb7d88b5
Return the token as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling
91e650791d
Return the paths for the users without setting them all up
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma
12afd7d1d5
Add mail element to access list
...
* Each provider just returns what they have so adding an element won't
require changing everything
* Added tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma
2cbac3357b
Offload acceslist creation to providers
...
* This allows for effective queries.
* Introduce currentAccess parameter to speciy if the users needs to have
currently acces (deleted incomming group share). (For notifications)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Lukas Reschke
51377f3d8c
Merge pull request #4313 from nextcloud/ldap-name-change
...
Change LDAP method names
2017-04-13 12:28:24 +02:00
Lukas Reschke
66835476b5
Add support for ratelimiting via annotations
...
This allows adding rate limiting via annotations to controllers, as one example:
```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```
Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
Lukas Reschke
06f8ea247b
Remove invalid route
...
Said file doesn't exist anymore and accessing it would just return a 500
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 11:05:44 +02:00
Nextcloud bot
396618fd19
[tx-robot] updated from transifex
2017-04-13 00:08:02 +00:00
Roeland Jago Douma
b3b24172e4
Merge pull request #4307 from nextcloud/sharing-emails
...
New emails for sharebymail
2017-04-12 21:23:11 +02:00
Morris Jobke
31024b7700
Merge pull request #4329 from nextcloud/move-out-shared-folder
...
Fix moving files out of a shared folder
2017-04-12 11:44:26 -05:00
Joas Schilling
983210de2e
Dont add click-button text for plaintext mails
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:27 +02:00
Joas Schilling
506c7731a6
Don't duplicate the sentence with the header
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
Morris Jobke
d0bae447fb
Use new email design for sharebymail emails
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
Morris Jobke
229d17e13b
Change LDAP method names
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 10:10:07 -05:00
Björn Schießle
b90e91144b
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
...
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
Jan-Christoph Borchardt
37145a275f
Fix AdBlock blocking share icon, ref #866
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-12 15:04:12 +02:00
Robin Appelman
2f949f4515
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:55:47 +02:00
Joas Schilling
a3c3124762
Allow file upload when storage is unlimited
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 12:27:47 +02:00
Björn Schießle
53787a29e1
Merge pull request #4317 from nextcloud/cleanup-files_trashbin-update
...
[files_trashbin] Remove unneeded update steps
2017-04-12 10:57:09 +02:00
Björn Schießle
35188899e9
Merge pull request #4316 from nextcloud/cleanup-files_sharing-update
...
[files_sharing] Remove unneeded update steps
2017-04-12 10:56:25 +02:00
Björn Schießle
49d8716eaa
Merge pull request #4312 from nextcloud/cleanup-name
...
Update comments to Nextcloud
2017-04-12 10:54:20 +02:00
Lukas Reschke
39468f627f
Merge pull request #4315 from nextcloud/cleanup-files_external-update
...
[files_external] Remove unneeded update steps
2017-04-12 10:16:42 +02:00
Lukas Reschke
feb594e212
Merge pull request #4314 from nextcloud/remove-not-needed-update.php
...
Remove update.php of files app
2017-04-12 10:14:04 +02:00
Morris Jobke
4f200040aa
[files_trashbin] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:52:27 -05:00
Morris Jobke
4d7c7b1816
[files_sharing] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:49:50 -05:00
Morris Jobke
83864d465e
[files_external] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:45:19 -05:00
Morris Jobke
5d444f493e
Remove update.php of files app
...
* contains only update steps for 8.1/8.2 to 9.0 update
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:35:12 -05:00
Morris Jobke
1729e4471f
Update comments to Nextcloud
...
* based on PR by @Ardinis
* see #4311
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
Nextcloud bot
633b952358
[tx-robot] updated from transifex
2017-04-12 00:07:44 +00:00
Morris Jobke
6bd1c50dc3
Merge pull request #4304 from nextcloud/add-email-template-to-ocp
...
Add IEMailTemplate to public OCP API
2017-04-11 15:09:27 -05:00
Roeland Jago Douma
8175ac6ecd
Merge pull request #4302 from nextcloud/test-integration-test
...
[Integration Tests] Clear opcode cache after config change
2017-04-11 21:29:58 +02:00
Lukas Reschke
4cf61481e5
Clear opcode cache after config change
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 18:57:40 +02:00
Michael Jobst
81b1dc4930
share api expanded by tags ( #26583 )
...
* share api expanded by tags
* Modified files_sharing JS Unit tests
* modified tests. renamed request parameter. refactoring
* Update Share20OCS.php
Added missing function description
* Update Helper.php
Added missing function description
* Update Helper.php
implicit boolean conversion to !empty()
* Update Share20OCSTest.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 11:54:13 -05:00
Morris Jobke
45a6e37699
Merge pull request #4293 from nextcloud/fix_4248
...
Do reload shared views
2017-04-11 11:53:01 -05:00
Lukas Reschke
280a075c9c
Adjust class references
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 17:35:59 +02:00
Roeland Jago Douma
53bca14a27
Do proper DI
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
3bc72f7224
give old end-points a seperate name
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
e2d7bffcda
fix constructor
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
449011dae7
remove discovery manager in favour of the OCSDiscoveryService
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
821e287805
adjust existing tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
d5dec527c9
get addressbook url and carddav user from remote server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
930c507d89
use discovered end-point for trusted servers
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Lukas Reschke
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
Roeland Jago Douma
8c01e45d6b
Do reload shared views
...
Fixes #4248
The magic introduced in #3686 caused the shared views not to be updated
properly. Thus we just overwrite the _onUrlChange method in the
sharedfilelist.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 09:33:27 +02:00
Morris Jobke
1846e1262d
Merge pull request #4289 from nextcloud/maintenance-mode-also-on-dav
...
Add missing maintenance plugin to new DAV endpoint
2017-04-11 00:44:20 -05:00
Morris Jobke
11d6fe1023
Merge pull request #4283 from nextcloud/shares-by-folder-quote
...
properly quota table names in getSharesInFolder
2017-04-10 19:39:19 -05:00
Nextcloud bot
4d90b0520e
[tx-robot] updated from transifex
2017-04-11 00:07:29 +00:00
Lukas Reschke
aacbb560ae
Add missing maintenance plugin to new DAV endpoint
...
The `/remote.php/dav/` endpoint was not implementing the MaintenancePlugin. Thus when the instance was put into maintenance mode the endpoints were still accessible and delivered empty content. Sync clients really do love this.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 01:31:57 +02:00
Morris Jobke
a045f3c4d7
Merge pull request #4146 from nextcloud/unread-comments-folder
...
Allow getting the unread comment count for an entire folder at once
2017-04-10 13:21:39 -05:00
Roeland Jago Douma
a750436ebc
Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilities
...
move share by mail capabilities to the share provider
2017-04-10 19:50:13 +02:00
Robin Appelman
a555672f21
properly quota table names in getSharesInFolder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:59:40 +02:00
Bjoern Schiessle
cbacca4202
move capabilities to share by mail app
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-10 17:18:13 +02:00
Roeland Jago Douma
e9c6fe2fd8
Merge pull request #4222 from nextcloud/dav-search-fileid
...
Allow searching file by fileid
2017-04-10 15:57:56 +02:00
Björn Schießle
235563f0a0
Merge pull request #4250 from nextcloud/disable-lookupserver-upload
...
allow admin to disable lookupserver upload
2017-04-10 11:04:19 +02:00
Lukas Reschke
09c66c93c5
Merge pull request #4266 from nextcloud/fix_missing_owner_on_public_calendars
...
don't remove owner property for public calendars
2017-04-10 10:41:13 +02:00
Bjoern Schiessle
78f0b5c19f
simplify return statement
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-10 09:44:23 +02:00
Morris Jobke
d83c8e0271
ThemingDefaults append cacheBusterCounter to logo URL by default
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:09 -05:00
Morris Jobke
5b4adf66e5
Move OC_Defaults to OCP\Defaults
...
* currently there are two ways to access default values:
OCP\Defaults or OC_Defaults (which is extended by
OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
it hard to work on theme values
* this extended the public interface with the missing
methods and uses them everywhere to only rely on the
public interface
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
Nextcloud bot
d25a96d921
[tx-robot] updated from transifex
2017-04-10 00:08:50 +00:00
Georg Ehrke
c99bdc9eb4
don't remove owner property for public calendars
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-09 21:20:59 +02:00
Nextcloud bot
16091f4424
[tx-robot] updated from transifex
2017-04-09 00:07:40 +00:00
Nextcloud bot
4b0f50c456
[tx-robot] updated from transifex
2017-04-08 00:07:45 +00:00
Morris Jobke
ca9d25169d
Merge pull request #4136 from nextcloud/expire-date-for-all-shares
...
Unified sharing options
2017-04-07 17:14:05 -05:00
Morris Jobke
8838ed4c2e
Merge pull request #4244 from nextcloud/welcome-email
...
New layout for welcome email
2017-04-07 14:52:28 -05:00
Morris Jobke
4c60360bf7
Merge pull request #4221 from nextcloud/provisioning-api-for-account-info
...
Allow to change account info via provisioning api
2017-04-07 12:48:44 -05:00
Lukas Reschke
281ad406e8
Add support for theming
...
Add support for theming in generated emails and simplify API
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Bjoern Schiessle
9afd160e66
allow to disable upload to lookup server, by default it is enabled
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 16:30:07 +02:00
Bjoern Schiessle
11b46389af
adjust to changes in the theming app
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
Bjoern Schiessle
3323d01db1
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Bjoern Schiessle
676a4c781a
update capabilities
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Joas Schilling
3d628783d9
Allow to change account info via provisioning api
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 12:50:47 +02:00
Roger Szabo
5fa218051b
unit test adjustment
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-07 18:06:50 +08:00
Nextcloud bot
536650c02f
[tx-robot] updated from transifex
2017-04-07 00:09:11 +00:00
Roger Szabo
0ea8729d1d
lower case for attributes
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 19:17:24 +08:00
Roger Szabo
f49ff74943
blizzz comments 03.04.2017 with caching
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 16:57:07 +08:00
Roger Szabo
33c8bf1857
blizzz comments 03.04.2017
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 16:26:41 +08:00
Joas Schilling
287bae8c5f
Merge pull request #4153 from nextcloud/fix-upload
...
Fix upload of folders in Chrome
2017-04-06 09:56:41 +02:00
Morris Jobke
6e72fd5f9f
Fix upload of folders in Chrome
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-06 00:50:58 -05:00
Morris Jobke
b084ceec3d
Merge pull request #4224 from nextcloud/dont-list-on-public-calendar-endpoint
...
Don't list on public calendar endpoints
2017-04-05 20:55:39 -05:00
Nextcloud bot
7d9688c89e
[tx-robot] updated from transifex
2017-04-06 00:07:50 +00:00
Lukas Reschke
63288ebc50
Don't list on public calendar endpoints
...
There is no need to allow listing here.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 22:43:05 +02:00
Robin Appelman
bb7e236e74
Allow searching file by fileid
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-05 15:22:53 +02:00
Roeland Jago Douma
00558de782
Merge pull request #3781 from nextcloud/fac-56-log-spam-with-external-storages
...
Also add the root of external storages to the file id list
2017-04-05 15:21:38 +02:00
Artur Neumann
3795636b90
validate file name before uploading in upload only folder
...
fixes #4211
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-05 13:26:40 +05:45
Nextcloud bot
84035862f7
[tx-robot] updated from transifex
2017-04-05 00:08:20 +00:00
Arthur Schiwon
30c95b51fb
fix fseek against string not resource by removing append support
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-04 20:25:59 +02:00
Roeland Jago Douma
da178db98e
Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12
...
Make public links work with master key
2017-04-04 11:46:13 +02:00
Joas Schilling
b6c1f3fc6d
Some more hardening
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-04 08:51:21 +02:00
SarthikaDhawan
62fb3bb3ef
file-upload.js modified : Remaining upload time corrected
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 08:51:20 +02:00
Nextcloud bot
ec5377306d
[tx-robot] updated from transifex
2017-04-04 00:07:46 +00:00
Morris Jobke
51bcb0bbe1
Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_shared_calendars
...
allow sharees to edit certain calendar properties for themselves
2017-04-03 13:12:56 -05:00
Roeland Jago Douma
455542d306
Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparency-on-calendars
...
Make sure transparency is an integer when saving a calendar
2017-04-03 12:46:00 +02:00
Bjoern Schiessle
dac6826ad7
setting to disable sending password by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle
b84fd7c361
set expire date for all share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
c191173d59
allow password protected mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00