mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,012 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

38012 Commits

Author SHA1 Message Date
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
Roeland Jago Douma a427e130ae
When debug don't load the bundled file 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 08:58:28 +01:00
Joas Schilling 5a6e29e4a8
Remove ownCloud Root Authority as per todo 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-22 08:54:40 +01:00
Roeland Jago Douma 1f7b86297a
No need to exit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 08:52:49 +01:00
Roeland Jago Douma 2337e11d88
Bump core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 08:49:39 +01:00
Roeland Jago Douma 12de9ad655
Add CI step to verify merged vendor js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 08:49:03 +01:00
Roeland Jago Douma 98a14909e1
Bundle more default vendor js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 08:49:03 +01:00
Roeland Jago Douma 7195a9323d
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-22 08:48:10 +01:00
Roeland Jago Douma 16a0bccefa Merge pull request #3972 from nextcloud/merge-some-more-css 
Merge some CSS files using our SCSS compiler
 2017-03-22 08:46:10 +01:00
Christoph Wurst c6c5896474 Merge pull request #3980 from nextcloud/fix-app-menu-triangle 
Fix position of triangle in app menu
 2017-03-22 08:43:45 +01:00
Morris Jobke c3f08ab151
Remove tooltip of delete button for systemtags 
* fixes #3967

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 21:49:25 -06:00
Nextcloud bot cae8702ab2
[tx-robot] updated from transifex 2017-03-22 01:07:53 +00:00
Morris Jobke e46ffe82f7 Merge pull request #3974 from nextcloud/fix-reshare-activity-message 
Fix reshare with user activity message
 2017-03-21 16:55:15 -06:00
Joas Schilling 20a0a18fbd
Fix reshare with user activity message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-21 16:54:28 -06:00