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

38178 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
9039b71a23 Merge pull request #4000 from nextcloud/backport-27216 
allow configuring authType for DAV backend
 2017-03-23 19:28:49 +01:00
Joas Schilling
3c1e7e5ada
Make deleting a group compatible with ocs v2 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-23 19:24:02 +01:00
Joas Schilling
88015bc51f
Fix type hints and doc blocks 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-23 17:52:47 +01:00
Robin Appelman
a12ec5ec77
set cache to failedcache when shared storage init fails 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-23 15:01:23 +01:00
Robin Appelman
76d8699c0f
Allow using '/' as external storage root 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-23 14:03:22 +01:00
Roeland Jago Douma
03d688d6ac
Handlebars is already loaded by core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-23 13:40:30 +01:00
Roeland Jago Douma
588f47d498
Add CI step to verify merged vendor js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-23 13:40:30 +01:00
Roeland Jago Douma
eda98ed3df
Merge vendor js 
There is a bunch of javascript we always load from vendors. This
combines this into 1 javascript file. Which reduces the number of
request by ~10.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-23 13:40:23 +01:00
Joas Schilling
394a61f1e6
Fix workflow engine mimetype detection when creating a directory 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-23 12:45:36 +01:00
Lukas Reschke
f38d36a161 Merge pull request #3995 from nextcloud/files_scan_appdata 
Add files:scanAppData command
 2017-03-23 12:28:55 +01:00
Lukas Reschke
1f210bf273 Merge pull request #3948 from nextcloud/downstream-27271 
Tooltip in trashbin with previous location
 2017-03-23 11:57:34 +01:00
Lukas Reschke
9675bbd830 Merge pull request #3978 from nextcloud/scss_deps_memcache 
Cache SCSS dependency file in memcache
 2017-03-23 11:56:35 +01:00
Lukas Reschke
1a80960a27 Merge pull request #3989 from nextcloud/files-external-save-button 
replace autosave with a save button for external storage configuration
 2017-03-23 11:55:36 +01:00
Lukas Reschke
d6cff564f6 Merge pull request #3994 from nextcloud/only_init_backbone_once 
Only initialize backbone once
 2017-03-23 11:54:54 +01:00
Roeland Jago Douma
17cf8dc450 Merge pull request #3997 from nextcloud/backport-27353 
Update davclient.js to 0.1.1
 2017-03-23 08:36:23 +01:00
Morris Jobke
9e2588f2cb Merge pull request #3999 from nextcloud/backport-27262 
Updated UI messages relating to the encryption functionality
 2017-03-23 00:25:59 -06:00
Vincent Petry
89c42a76c3
Remove SharedCache::getNumericStorageId to let CacheWrapper do it 
The CacheWrapper will properly forward the call to the wrapped cache.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 00:02:48 -06:00
Piotr M
5c7079f8c6
Ensure that FileInfo return values as required by its phpdoc. 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 20:03:46 -06:00
Nextcloud bot
39ac804899
[tx-robot] updated from transifex 2017-03-23 01:07:52 +00:00
Jörn Friedrich Dreyer
9eca1da1dd
allow configuring authType for DAV backend 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 18:13:42 -06:00
Matthew Setter
d7c9e2b841
Updated UI messages relating to the encryption functionality 
The reason for updating these messages, is that grammatically they're
not quite correct. They showed a combination of:

- Related phrases, which could be either separated or joined better
- Related sentences, but which should be expressed as separate ones

They were also missing full-stops to end the them.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 18:06:55 -06:00
Juan Pablo Villafáñez
713faa0fc0
Use the expected method depending on the target being a file or folder 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 18:02:09 -06:00
Vincent Petry
b1c98404d0
Update davclient.js to 0.1.1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 17:58:52 -06:00
Morris Jobke
fbf3bfa3ea
improve file transfer code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 17:40:36 -06:00
Morris Jobke
fb87aa61e7
fix path for files from root folder 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 17:17:37 -06:00
Morris Jobke
b26c8f8bd3
Use proper name and code style 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 15:59:55 -06:00
Roeland Jago Douma
e4d4fb5352
Only initialize backbone once 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 22:48:58 +01:00
Nextcloud bot
d551b8e6fd
[tx-robot] updated from transifex 2017-03-22 21:14:04 +00:00
Roeland Jago Douma
e3f8e416e6
Add files:scanAppData command 
Fixes https://github.com/nextcloud/server/issues/3041

Add a dedicated command to scan the special appdata dir

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 21:30:44 +01:00
Roeland Jago Douma
35a21b4180
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 20:14:18 +01:00
Roeland Jago Douma
e3925ba2a1
Cache SCSS dependency file in memcache 
Since reading a file from disks can be costly. Lets store the dependency
json also in memcache.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 20:14:08 +01:00
Morris Jobke
e25b997d0b Merge pull request #3497 from nextcloud/mount-shared-last 
mount shared mounts last
 2017-03-22 13:12:54 -06:00
Roeland Jago Douma
8b75e9b8a0 Merge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todo 
Remove the ownCloud Root Authority file as well
 2017-03-22 20:10:05 +01:00
Morris Jobke
7281b240aa Merge pull request #3992 from nextcloud/revert-3795-bundle_vendor_js 
Revert "Bundle vendor js"
 2017-03-22 12:11:45 -06:00
Morris Jobke
f4ead7c7d3
Fix autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 12:08:41 -06:00
Robin Appelman
1e707ef1db
add integration test to ensure that shares dont overwrite external storages 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-22 18:00:12 +01:00
Robin Appelman
714f198a5d
mount shared mounts last 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-22 17:15:42 +01:00
Roeland Jago Douma
4518a28924 Revert "Bundle vendor js" 2017-03-22 17:01:54 +01:00
blizzz
0b5e1814be Merge pull request #3977 from nextcloud/di_ng2 
Make DI work for all apps
 2017-03-22 15:36:52 +01:00
Joas Schilling
2e78aa6232
Remove the cert as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-22 15:17:19 +01:00
Robin Appelman
11ee0b14bb
replace autosave with a save button for external storage configuration 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-22 14:32:26 +01:00
Roeland Jago Douma
ec3f5aa6e2 Merge pull request #3795 from nextcloud/bundle_vendor_js 
Bundle vendor js
 2017-03-22 13:34:21 +01:00
Roeland Jago Douma
11c4875190 Merge pull request #3983 from nextcloud/remove-owncloud-root-cert-as-per-todo 
Remove ownCloud Root Authority as per todo
 2017-03-22 12:33:24 +01:00
Joas Schilling
9667ac2b8e
Register the namespace with the autoloading to allow reverse recovery 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-22 11:55:04 +01:00
Joas Schilling
3f86f1276f
Also cache the namespace from appinfo 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-22 11:50:31 +01:00
Roeland Jago Douma
8b94fbe014
Add the AppContainer 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 11:24:16 +01:00
Joas Schilling
5695a4ec92
Don't do a recursive search 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-22 10:44:13 +01:00
Joas Schilling
9208f6379c
buildAppNamespace already has the fallback 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-22 10:13:14 +01:00
Roeland Jago Douma
d83b15cd85 Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip 
Remove tooltip of delete button for systemtags
 2017-03-22 09:24:40 +01:00
Roeland Jago Douma
d2a2cef4cc
Handlebars is already loaded by core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 09:01:47 +01:00