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

42817 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
8867629cf1
Merge pull request #8359 from nextcloud/swift-v3 
Support swift v3 authentication
 2018-02-26 18:30:00 +01:00
Morris Jobke
4076c09195
Merge pull request #8463 from kyrofa/bugfix/8462/theming_app_outside_root 
theming: handle not being in the serverroot
 2018-02-26 18:27:54 +01:00
Morris Jobke
a60d7a8563
Merge pull request #8541 from nextcloud/translate-permission-error-page 
Provide translated error message for permission error
 2018-02-26 17:50:21 +01:00
Morris Jobke
67a76b00e8
Merge pull request #6481 from nextcloud/occ-app-install-enable 
add enable flag to occ app:install
 2018-02-26 17:49:37 +01:00
Morris Jobke
955e136fd9
Fix appname 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-26 17:47:42 +01:00
Morris Jobke
950e7e0467
Merge pull request #8455 from nextcloud/proper_mount_type_external 
Properly set the mount type for external storages
 2018-02-26 17:19:54 +01:00
Morris Jobke
612e875f60
Merge pull request #8355 from nextcloud/fix-comments-num-index 
Fix comments (and systemtags) when involving users with numerical ids
 2018-02-26 17:12:57 +01:00
Morris Jobke
cf35c4b03a
Provide translated error message for permission error 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-26 17:00:29 +01:00
sualko
84f6477ce5
enable app by default after occ app:install 
Signed-off-by: Klaus Herberth <klaus@jsxc.org>
 2018-02-26 16:34:52 +01:00
sualko
323eb2e8ba
add enable flag to occ app:install (fix #5834) 
Signed-off-by: Klaus Herberth <klaus@jsxc.org>
 2018-02-26 16:34:52 +01:00
Morris Jobke
4154a56536
Merge pull request #8412 from agates/master 
Add mtime and storage_mtime to db:convert-filecache-bigint
 2018-02-26 16:33:58 +01:00
Morris Jobke
452e96e2a7
Merge pull request #8390 from dasisdormax/master 
Add indeterminate state to share permission checkbox
 2018-02-26 16:17:35 +01:00
Morris Jobke
a3c09f51c6
Merge pull request #8203 from Cybso/split-move-copy 
Split move and copy operations
 2018-02-26 16:06:20 +01:00
Morris Jobke
07a6821ab2
Merge pull request #8511 from nextcloud/ext-storage-error-warning-fix 
Ext storage error warning fix
 2018-02-26 15:36:46 +01:00
Robin Appelman
d40c61a71a
adjust external storage config format to the one used in primary storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-26 14:54:30 +01:00
Roeland Jago Douma
3afc41a49b
Kill objectstore CI if we can't create a file 
This is more of a hack. But one of the nodes won't properly run this. No
sense in waiting 60 minutes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:27 +01:00
Roeland Jago Douma
ae720b3881
Some swift v3 example config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:24 +01:00
Roeland Jago Douma
9a201bd7fa
Use username + pass in config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:21 +01:00
Roeland Jago Douma
812ea354d0
User proper username + pass 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:18 +01:00
Roeland Jago Douma
fe05ecfd16
Other config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:15 +01:00
Roeland Jago Douma
4bcc282a48
Add v3.0 auth run 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:12 +01:00
Robin Appelman
31dd6d6aae
add support for v3 swift auth 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-26 14:54:08 +01:00
Robin Appelman
4d380d21b5
Merge pull request #8539 from nextcloud/openstack-304 
update php-opencloud/openstack to 3.0.4
 2018-02-26 14:52:12 +01:00
Robin Appelman
205a18f018
update php-opencloud/openstack to 3.0.4 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-26 14:35:07 +01:00
Roeland Jago Douma
0c4c3676f6
Merge pull request #8504 from nextcloud/bugfix/noid/well-its-not-an-array 
Dont use $info as array when its not an array
 2018-02-26 13:44:57 +01:00
Joas Schilling
226e63695f
Merge pull request #8026 from nextcloud/feature/noid/allow-custom-html-in-html-emails 
Allow custom HTML in HTML Emails
 2018-02-26 13:38:39 +01:00
John Molakvoæ (skjnldsv)
0f229d23f7
fixup! Fixed icons padding 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-26 13:03:44 +01:00
John Molakvoæ (skjnldsv)
da2aafa5cf
Fixed icons padding 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-26 13:02:07 +01:00
Joas Schilling
695e32d0a6
Merge pull request #8491 from nextcloud/strict_request 
Make Request strict
 2018-02-26 11:02:30 +01:00
Morris Jobke
2f12094ea8
Merge pull request #8522 from nextcloud/fix-groupmembers-numids 
Fix retrieval of group members with numerical uids from LDAP
 2018-02-26 09:01:38 +01:00
Kyle Fazzari
8dcbea124e
Remove null check 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2018-02-25 07:08:59 -08:00
Kyle Fazzari
25c89a6feb
Add mock to setup 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2018-02-24 08:16:42 -08:00
Roeland Jago Douma
7144d7a1e3
Merge pull request #8497 from nextcloud/relax_l10n 
Relax what t accepts so we don't break it all
 2018-02-24 16:26:36 +01:00
Nextcloud bot
a210247559
[tx-robot] updated from transifex 2018-02-24 01:12:16 +00:00
Morris Jobke
cf959af8eb
Merge pull request #8519 from nextcloud/fix-l10n-exception 
Use array in t() calls in exception template
 2018-02-23 13:08:26 +01:00
John Molakvoæ (skjnldsv)
fdfa934078
Updated error message 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-23 12:13:10 +01:00
Arthur Schiwon
238c3a5201
fix retrieving group members with numerical uids from LDAP 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-02-23 12:05:50 +01:00
Arthur Schiwon
72af741e78
tests for retrieving group members with numerical uids 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-02-23 12:04:48 +01:00
Julius Härtl
74325f1f94
Use array in t() calls in exception template 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-23 11:18:29 +01:00
Morris Jobke
e01e1696da
Merge pull request #8507 from nextcloud/fix-change-icon 
Add some whitespace around change.svg icon
 2018-02-23 10:36:32 +01:00
Morris Jobke
98baf8915d
Merge pull request #8502 from nextcloud/properly-show-hints-in-ocs 
Show hint in OCS API for user creation
 2018-02-23 10:02:31 +01:00
Joas Schilling
69c88ad075
Fix unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-23 09:06:43 +01:00
Nextcloud bot
68187e6036
[tx-robot] updated from transifex 2018-02-23 01:12:16 +00:00
Morris Jobke
930aad5aaa
Merge pull request #8499 from nextcloud/avoid-fruitless-login-attempts 
Avoid fruitless login attempts
 2018-02-22 19:19:40 +01:00
John Molakvoæ (skjnldsv)
4a429cc810
Fixed default urls 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-22 18:17:42 +01:00
John Molakvoæ (skjnldsv)
887241b355
Show error if no external storage configured 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-22 18:14:19 +01:00
John Molakvoæ (skjnldsv)
47af421e80
fixup! Add vselect theming into server 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-22 17:03:35 +01:00
John Molakvoæ (skjnldsv)
5c3672ae36
Add vselect theming into server 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-22 17:00:00 +01:00
Marin Treselj
83227b6a61 Update the change.svg icon in the Settings app 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2018-02-22 16:02:50 +01:00
blizzz
627023e9c3
Merge pull request #8416 from nextcloud/bugfix/8401/usermanagement-popover 
Fix hiding and event propagation issues with the user management popover
 2018-02-22 15:57:43 +01:00