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

39021 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
dea6edb066
Fix init 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 12:40:00 +02:00
Lukas Reschke
278637feb5 Merge pull request #4556 from nextcloud/downstream-ldap-78 
LDAP: only use proxy classes as backend
 2017-05-08 12:29:38 +02:00
Lukas Reschke
4d101ca2be Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detection 
Automatic mysql 4byte detection
 2017-05-08 12:18:40 +02:00
Lukas Reschke
7cc750fe37 Merge pull request #4617 from nextcloud/theming-plain-background 
Theming app: Add plain background color option
 2017-05-08 12:15:59 +02:00
Lukas Reschke
fecf72fb70 Merge pull request #4632 from nextcloud/login-logo-ratio 
show non landscape logos bigger on the login page
 2017-05-08 12:11:15 +02:00
Georg Ehrke
255442f281
fix PROPPATCH requests to read-only shared calendars 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-08 12:09:15 +02:00
Lukas Reschke
69c5bcd804 Merge pull request #4719 from nextcloud/error-page-theming 
ensure theming app is loaded when showing an error page
 2017-05-08 11:51:34 +02:00
Joas Schilling
3afad7fe40
Fix docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-08 11:34:47 +02:00
Roeland Jago Douma
92408390b0
Fix ImageExportPluginTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
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
Julius Härtl
2801f5139b
Adjust login button color and remove border 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-08 10:16:30 +02:00
Julius Härtl
510f7cf1b6
Fix tests for theming backgroundColor 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-08 10:16:30 +02:00
Julius Haertl
4199a56912
Theming app: Add plain background color option 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-05-08 10:16:29 +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
Robin Appelman
f12cd19c34
ensure theming app is loaded when showing an error page 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-06 17:50:48 +02:00
Robin Appelman
4fa8170394
polish user actions dropdown 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-06 16:22:25 +02:00
Daniel Calviño Sánchez
9313c9797f Add automatic handling of common command failures of Mink elements 
Commands executed on Mink elements may fail for several reasons.
ElementWrapper is introduced to automatically handle some of those
situations, like StaleElementReference exceptions and ElementNotVisible
exceptions.

StaleElementReference exceptions are thrown when the command is executed
on an element that is no longer attached to the DOM. When that happens
the ElementWrapper finds again the element and executes the command
again on the new element.

ElementNotVisible exceptions are thrown when the command requires the
element to be visible but the element is not. When that happens the
ElementWrapper waits for the element to be visible before executing the
command again.

These changes are totally compatible with the current acceptance tests.
They just make the tests more robust, but they do not change their
behaviour. In fact, this should minimize some of the sporadic failures
in the acceptance tests caused by their concurrent nature with respect
to the web browser executing the commands.

However, the ElementWrapper is not a silver bullet; it handles the most
common situations, but it does not handle every possible scenario. For
example, the acceptance tests would still fail sporadically if an
element can become staled several times in a row (uncommon) or if it
does not become visible before the timeout expires (which could still
happen in a loaded system even if the components under test work right,
but obviously it is not possible to wait indefinitely for them).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-06 12:37:55 +02:00
Daniel Calviño Sánchez
64f9c56224 Extract element finding to a command object 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-06 12:37:55 +02:00
Daniel Calviño Sánchez
7642a4b727 Make internal find methods static 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-06 12:37:55 +02:00
Daniel Calviño Sánchez
16e3e81635 Add missing type hints 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-06 12:37:55 +02: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
Bjoern Schiessle
327cddc157
reset verification state if max tries are reached 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-04 14:53:24 +02: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