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

38943 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
747990b03a
No more XSS 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
3ab53d000f
Clear cache on vcard change/delete 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
34d97aa51c
Request proper size for contacts menu 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
dd430c2fd7
Cache the carddav photo endpoint 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
303c0dd6a8
Always dispatch Carddav events 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:47 +02:00
Morris Jobke
4d7a96bc85 Merge pull request #4551 from nextcloud/external-storages 
Fix name of external storages
 2017-05-08 00:36:10 -05:00
Jan-Christoph Borchardt
010b9c4609 Fix name of external storages 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-05-08 00:33:45 -05:00
Nextcloud bot
6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Nextcloud bot
56bb8745df
[tx-robot] updated from transifex 2017-05-07 00:07:31 +00:00
Nextcloud bot
59ee22101f
[tx-robot] updated from transifex 2017-05-06 00:07:33 +00:00
Robin Appelman
af4b792d88 Merge pull request #4710 from nextcloud/skeleton-read-only 
handle permissions errors when copying the skeleton for a read only user
 2017-05-05 17:21:02 +02:00
Roeland Jago Douma
57275e9944 Merge pull request #4701 from nextcloud/enforce-type 
Enforce type hints in dav app
 2017-05-05 15:33:35 +02:00
Morris Jobke
ee2dfb24e0 Merge pull request #4703 from nextcloud/improve-memcache-test 
Make cache tests a bit more clear
 2017-05-05 09:53:20 -03:00
Robin Appelman
2b0da0f218
handle permissions errors when copying the skeleton for a read only user 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-05 14:44:51 +02:00
Roeland Jago Douma
15f43b2635 Merge pull request #4707 from nextcloud/fix-invalid-theming-urls 
Fix invalid theming URLs
 2017-05-05 12:47:50 +02:00
Morris Jobke
ac04fb8277 Fix invalid theming URLs 
* logo and background image had the cache buster applied twice:
  background-image: url(http://192.168.99.100/server/core/img/logo.svg?v=0?v=0);

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-05 00:37:32 -03:00
Nextcloud bot
619d09529c
[tx-robot] updated from transifex 2017-05-05 00:07:28 +00:00
Morris Jobke
0896d2b006 Make cache tests a bit more clear 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-04 19:37:40 -03:00
Morris Jobke
49e958fa12 Enforce type hints in dav app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-04 19:32:22 -03:00
Roeland Jago Douma
8dc2749296 Merge pull request #4588 from nextcloud/update-redirection-login-flow 
Update login flow redirection
 2017-05-04 21:06:04 +02:00
Roeland Jago Douma
c3117f4e55 Merge pull request #4700 from nextcloud/redis-cluster-compatibility 
Compatibility with Redis and RedisCluster
 2017-05-04 21:03:02 +02:00
Mario Danic
e4aac15a92
Update login flow redirection 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-04 19:21:22 +02:00
Morris Jobke
7f46898dad Compatibility with Redis and RedisCluster 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-04 12:42:58 -03:00
Christoph Wurst
fb3ac32915 Merge pull request #4694 from nextcloud/fix_4676 
Load proper fonts in guest.css
 2017-05-04 17:21:07 +02:00
Morris Jobke
7bb63d6a4d Merge pull request #4681 from nextcloud/link_radio 
Make read/write options in sharing view radiobuttons
 2017-05-04 11:26:01 -03:00
Roeland Jago Douma
b66dfa909b Merge pull request #4693 from nextcloud/fix_4644 
Do not reload the filelist on first open
 2017-05-04 14:37:45 +02:00
Roeland Jago Douma
1a8befa447
Load proper fonts in guest.css 
Fixes #4676

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 13:42:58 +02:00
Morris Jobke
ea2a7d5b0a Merge pull request #4690 from nextcloud/fix-igroup-since 
Documentation fix IGroup::getDisplayName is available since version 12
 2017-05-04 08:42:00 -03:00
Roeland Jago Douma
8d66e325a9
Do not reload the filelist on first open 
Fixes: #4644

Without this patch the filelist would always reload. However since not
all the correct data was set yet it would often:

1. fireoff a propfind to ../webdav/
2. fireoff a propfind to ../webdav/<PATH>

When just opening the file list those are the same so the result is just
fine. However if opening a direct link it means that there is a race
condition on which finishes first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 13:29:49 +02:00
Björn Schießle
4965f02bf4 Merge pull request #4689 from nextcloud/fix-password-protected-mail-shares 
check password for mail shares as well
 2017-05-04 12:19:36 +02:00
Julius Härtl
d72706861d
IGroup::getDisplayName is available version 12, not 11 (9.2) 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-04 12:06:03 +02:00
Bjoern Schiessle
c053a275d7
check password for mail shares as well 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-04 11:20:20 +02:00
Roeland Jago Douma
2216e5dcd0
Fix event firing 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 09:22:28 +02:00
Morris Jobke
b04102aab3 Merge pull request #4684 from nextcloud/revert-4623-fileinfo-mount-permissions 
Revert "fix permissions of mountpoints"
 2017-05-04 00:09:27 -03:00
Morris Jobke
70a0e9c2d3 Revert "fix permissions of mountpoints" 2017-05-04 00:09:09 -03:00
Morris Jobke
61379c9165 Merge pull request #4682 from nextcloud/try-to-start-browser-sessions-again-when-they-fail-in-acceptance-tests 
Try to start browser sessions again when they fail in acceptance tests
 2017-05-04 00:02:18 -03:00
Nextcloud bot
806aeae71d
[tx-robot] updated from transifex 2017-05-04 00:07:29 +00:00
Felix A. Epp
6f2cc42885 Add radio class to read/write sharing options and 1px left adjustment 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2017-05-04 01:34:29 +02:00
Felix A. Epp
758576f608 Fix read-only label id 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2017-05-04 01:33:03 +02:00
Roeland Jago Douma
2e32ab945b Make files drop more permanent 
Implement the suggestions from #2207

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 00:30:51 +02:00
Daniel Calviño Sánchez
1a83c4c5c3 Set timeout multiplier to 10 for acceptance tests run by Drone 
Sometimes, acceptance tests run by Drone fail due to a timeout when
starting the web browser sessions. Increasing the timeout should
minimize the possibility of the failure happening, although it can not
guarantee that it will not happen. A timeout multiplier of 10 was set
just because it looks like a reasonable margin of time, although it is
not based on any hard data.

The timeout multiplier affects too the timeout used when finding
elements. Like when starting a session, increasing the find timeout
simply gives the acceptance tests more time to find the objects before
giving up, so it does not change their behaviour when successful and can
also prevent failures due to default timeouts being too low for a
strained system.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-03 23:18:40 +02:00
Daniel Calviño Sánchez
4fc9a7146b Add option to acceptance test runners to set a custom timeout multiplier 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-03 23:18:40 +02:00
Daniel Calviño Sánchez
b10478ff19 Try again to start browser sessions when they fail 
Starting a session for an Actor can fail, typically, due to a timeout
connecting with the web browser. Now if the session fails to start it
will be tried again up to "actorTimeoutMultiplier" times in total before
giving up.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-03 23:18:40 +02:00
Daniel Calviño Sánchez
e355e953b5 Generalize attribute name 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-03 12:45:52 +02:00
Daniel Calviño Sánchez
97bedb94af Fix exponential increase of timeout when finding ancestor elements 
The timeout passed to the "find" method was multiplied by the
"findTimeoutMultiplier" attribute. However, as "find" used
"findAncestor" and "findAncestor", in turn, used "find" itself the
timeout was increased exponentially for ancestor elements. Now "find"
was split in "find" and "findInternal"; the first method is the public
one and modifies the given parameters as needed and then calls the
second method, private, that performs the find itself.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-03 12:34:04 +02:00
Nextcloud bot
3dbf30c220
[tx-robot] updated from transifex 2017-05-03 00:07:31 +00:00
Morris Jobke
dbe11916fa Merge pull request #4662 from nextcloud/remove-named-selectors-from-acceptance-tests 
Remove named selectors from acceptance tests
 2017-05-02 20:44:23 -03:00
blizzz
4e4bc17ff5 Merge pull request #4545 from individual-it/access-control-3726 
show error message when "files-drop" upload fails
 2017-05-03 00:21:40 +02:00
Morris Jobke
aa39f9b8fc Merge pull request #4623 from nextcloud/fileinfo-mount-permissions 
fix permissions of mountpoints
 2017-05-02 17:28:33 -03:00
Morris Jobke
a94c706f26 Merge pull request #4667 from nextcloud/split-up-more-integration-tests 
Split up sharing-v1-part2.feature to avoid timeouts
 2017-05-02 17:27:37 -03:00