Commit Graph

37771 Commits

Author SHA1 Message Date
Morris Jobke 656528d6f8
Update dependencies
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-24 11:09:26 -06:00
Morris Jobke 49d0507f5d Merge pull request #3879 from nextcloud/downstream-26915
Added integration tests for sharees using v2.php
2017-03-23 16:12:24 -06:00
Morris Jobke 71c80433c2 Merge pull request #4007 from nextcloud/backport-27155
Change showTemporary notifications for closable ones
2017-03-23 15:56:18 -06:00
Morris Jobke a5a29ee27a Merge pull request #3953 from nextcloud/downstream-27027
Ignore NoUserException for shares from ghosts
2017-03-23 15:26:43 -06:00
Morris Jobke b59f6dcca4 Merge pull request #3850 from nextcloud/search-order
Fix search ordering
2017-03-23 15:25:27 -06:00
Robin Appelman 2d02a4735c
Fix search ordering
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 15:24:50 -06:00
Morris Jobke d2654c8aea Merge pull request #3965 from nextcloud/downstream-27343
Providing --path option to transfer-ownership
2017-03-23 15:20:53 -06:00
Roeland Jago Douma 6e6cbae37c Merge pull request #3998 from nextcloud/backport-27032
Use the expected method depending on the target being a file or folder
2017-03-23 21:59:39 +01:00
noveens 40228c0c2b
added quit option in commentstabview.js
added quit option in notif in app.js

added quit option in notif in file-upload.js

added quit option in notif in fileinfomodel.js

added quit option in notif in filelist.js

added quit option in notif in filelist.js

added quit option in notif in tagsplugin.js

added quit option in notif in statusmanager.js

added quit option in notif in external.js

added quit option in notif in versionstabview.js

added quit option in notif in notification.js

changes according to the latest review.

timeout removed since there is a button to close it

translation capability added

typo fixed

test files updated

small errors fixed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:12:29 -06:00
Morris Jobke eee7e97a6e Merge pull request #4001 from nextcloud/backport-27389
Ensure that FileInfo return values as required by its phpdoc.
2017-03-23 13:00:49 -06:00
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
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
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
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