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

44230 commits

This branch
This branch
All branches
Author SHA1 Message Date
Georg Ehrke
9aca92c441
hook up calendar resource managers/backends with server container 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-25 04:58:08 +02:00
Georg Ehrke
c83629674e
update resource booking interfaces and add managers 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-25 04:58:08 +02:00
Georg Ehrke
b832edabbf
apply group restrictions to resources 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-25 04:58:07 +02:00
Georg Ehrke
2da510af0b
add resource / room principals 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-25 04:58:07 +02:00
Georg Ehrke
29b777e7d1
add resource and room interfaces 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-25 04:58:07 +02:00
Nextcloud bot
a431cc3b58
[tx-robot] updated from transifex 2018-06-25 00:11:48 +00:00
Nextcloud bot
a4b5ff8420
[tx-robot] updated from transifex 2018-06-24 00:12:06 +00:00
Nextcloud bot
5428cd2f50
[tx-robot] updated from transifex 2018-06-23 00:12:41 +00:00
Roeland Jago Douma
1f1bd36af8
Merge pull request #9967 from nextcloud/replace-wd-host-directly-in-behat-yml-instead-of-through-behat-params 
Replace "wd_host" directly in "behat.yml" instead of through "BEHAT_PARAMS"
 2018-06-22 22:10:06 +02:00
Daniel Calviño Sánchez
e9012021fe Fix documentation 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-06-22 19:47:46 +02:00
Daniel Calviño Sánchez
d70b6bc94b Set "wd_host" directly in "behat.yml" instead of through "BEHAT_PARAMS" 
The "wd_host" parameter of Selenium2 sessions specify the URL used by
the Selenium driver to connect with the Selenium server. Thus, when the
Selenium server is at a different host or port than the default one (for
example, when run on Drone) the "wd_host" parameter must be set for each
of the Selenium2 sessions defined in "behat.yml".

The "BEHAT_PARAMS" environment variable, which extends the "behat.yml"
configuration file, was used for that. However, this required adding to
the "BEHAT_PARAMS" in "run-local.sh" each new session added to
"behat.yml", including those added in the acceptance tests of apps.

To address that limitation, this commit introduces a simulated variable,
"selenium.server"; just before the acceptance tests are run the
"selenium.server" variable in the "wd_host" parameter is replaced in the
"behat.yml" file used by the acceptance tests. Note that the file that
is modified is the one inside the Docker container used to run the
acceptance tests, so the original file is not touched.

Note that a simulated variable is needed because Behat does not support
overridding nor setting configuration parameters with environment
variables.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-06-22 19:46:44 +02:00
Roeland Jago Douma
082646f7e5
Merge pull request #9955 from nextcloud/bug/noid/onedrive_propfind 
Request a valid property for DAV opendir
 2018-06-22 15:02:20 +02:00
Morris Jobke
144d1aa29d
Merge pull request #9965 from nextcloud/bugfix/8402/do-not-log-if-user-was-deleted-already 
Use info log level to inform about a deleted user and thus the verification is not needed anymore
 2018-06-22 14:48:40 +02:00
Morris Jobke
dc12f24f73
Use info log level to inform about a deleted user and thus the verification is not needed anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-22 14:11:25 +02:00
Morris Jobke
ebea6d37c3
Merge pull request #9964 from nextcloud/bugfix/noid/typo-tripl-dot-instead-of-ellipsis 
Use ellipsis instead of triple dot
 2018-06-22 14:02:17 +02:00
Joas Schilling
6eb2653897
Use ellipsis instead of triple dot 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-06-22 11:08:26 +02:00
Julius Härtl
11e73b7a4f
Merge pull request #9962 from nextcloud/polish-user-list 
Added icons to users list and improved design
 2018-06-22 10:54:32 +02:00
John Molakvoæ (skjnldsv)
006deecb00
removed debug 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-22 09:50:17 +02:00
John Molakvoæ (skjnldsv)
bd4cba4fb2
Added icons to users list and improved design 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-22 09:48:19 +02:00
Nextcloud bot
e4551106f5
[tx-robot] updated from transifex 2018-06-22 00:12:11 +00:00
Roeland Jago Douma
45018a0e83
Merge pull request #9921 from nextcloud/resetpassword-login-prefill 
prefill userid for login after password reset
 2018-06-21 23:45:22 +02:00
Morris Jobke
7ab0335eaf
Merge pull request #9954 from nextcloud/search-form-preventdefaults 
Prevent search form submit
 2018-06-21 23:37:14 +02:00
Morris Jobke
1bedfce928
Merge pull request #9578 from nextcloud/smb-3.0.0 
update icewind/smb to 3.0.0
 2018-06-21 23:21:43 +02:00
Roeland Jago Douma
ed29984501
Merge pull request #9868 from nextcloud/user-backend-table 
make table name configurable for db user backend
 2018-06-21 19:23:23 +02:00
Roeland Jago Douma
54c4d95a11
Request a valid property for DAV opendir 
Apperently Sabre and Onedrive are not friends when requesting a single
404 property. I need to dig deeper on why this is. Anyways requesting a
valid property makes it work like a charm.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-21 19:01:27 +02:00
Morris Jobke
5efd5cee48
Merge pull request #9925 from nextcloud/select-only-visible-files 
Select only searched files
 2018-06-21 18:40:48 +02:00
John Molakvoæ (skjnldsv)
f4e988c314
Prevent search form submit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-21 18:06:41 +02:00
Robin Appelman
60816a2e4a
use DAV instead of SMB for deletion tests 
SMB storages can't be constructed on drone because of missing dependencies

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-21 16:03:57 +02:00
Robin Appelman
4a424f86db
update icewind/smb to 3.0.0 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-21 16:02:51 +02:00
John Molakvoæ
912a657d94
Merge pull request #9951 from nextcloud/navigation-accessibility 
Fix navigation keyboard accessibility
 2018-06-21 15:45:30 +02:00
Robin Appelman
8ed50d4b63
prefill userid for login after password reset 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-21 15:18:07 +02:00
Jan-Christoph Borchardt
c6aff097c6
Fix navigation keyboard accessibility 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-06-21 14:35:22 +02:00
John Molakvoæ
a10690c1e9
Merge pull request #9946 from nextcloud/bugfix/noid/files-external-settings-layout 
Fix files_external settings layout
 2018-06-21 13:59:53 +02:00
Julius Härtl
effee32bb7
Fix files_external setings layout 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-21 13:34:13 +02:00
Morris Jobke
f996da45d1
Merge pull request #9941 from nextcloud/browserstack 
Add browserstack logo
 2018-06-21 12:16:29 +02:00
Roeland Jago Douma
8ebc3d90a0
Merge pull request #9518 from nextcloud/feature/5986/public_share_controller_middleware 
Public share middleware & controller
 2018-06-21 10:09:20 +02:00
John Molakvoæ (skjnldsv)
de7275becd
Remove debug 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-21 09:34:05 +02:00
Nextcloud bot
f9c98d8621
[tx-robot] updated from transifex 2018-06-21 00:12:47 +00:00
John Molakvoæ (skjnldsv)
ae6bbbdfb8
Fix folder selection 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 22:37:59 +02:00
Roeland Jago Douma
a5d8f50ab2
Add browserstack to tools we use 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 20:02:56 +02:00
Morris Jobke
9b6f235015
Merge pull request #9723 from nextcloud/css4-variables 
Css4 variables migration
 2018-06-20 19:54:10 +02:00
John Molakvoæ (skjnldsv)
b188b2d133
Rebase settings build 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:22:48 +02:00
John Molakvoæ (skjnldsv)
6d5cb3503f
revert unwanted changes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:22:07 +02:00
Daniel Calviño Sánchez
2cfb3832fa
Adjust theming acceptance tests to new header colour transition 
Before, the acceptance tests checked the header colour just once, as the
header colour was immediately changed once the new theming colour was
saved. This is no longer the case, as currently a transition is used to
change between the original colour and the new one, so now the
acceptance tests check repeteadly for the expected header colour until
it matches or the timeout expires.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-06-20 19:21:54 +02:00
John Molakvoæ (skjnldsv)
e01f004a13
Fixed tests and improved app-navigation-caption 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:21:54 +02:00
John Molakvoæ (skjnldsv)
938553ab07
IE11 css vars compatibility 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:21:54 +02:00
John Molakvoæ (skjnldsv)
4f0a318e02
Fixed theming tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:20:51 +02:00
Julius Härtl
80efb51a1a
[theming] reload css variables instead of the whole server css 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-20 19:20:51 +02:00
John Molakvoæ (skjnldsv)
b69d345677
More default variables fallbacks 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:20:51 +02:00
John Molakvoæ (skjnldsv)
1dc76f2f6b
More vars fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:20:51 +02:00