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

38960 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
02f3b74409
fix sizing of logo in header 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-08 15:08:30 +02:00
Robin Appelman
6acae94a02 Merge pull request #4716 from nextcloud/user-settings-dropdown 
polish user actions dropdown
 2017-05-08 14:25:52 +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
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
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
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