Commit graph

38456 commits

Author SHA1 Message Date
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
Morris Jobke
6d35827bf6
Fix position of triangle in app menu
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:48:13 -06:00
Morris Jobke
3329f44a76
Address comments
* fix URL to documentation
* improve logic of UTF8mb4 check
* fix connection parameter creation - it's done already in ConnectionFactory::createConnectionParams
* remove unused attributes of MDB2SchemaReader

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:42:42 -06:00
Morris Jobke
1aef2f417b
Adjust tests as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:42:42 -06:00
Morris Jobke
713f684a8b
Adding tests for 4 byte unicode characters
* success on SQLite and Postgres
* failure on MySQL due to the limited charset that only supports up to 3 bytes

Add config option to update charset of mysql to utf8mb4

* fully optional
* requires additional options set in the database

only disable unicode test on mysql

Fixing ctor call

Adding docker based unit test execution for mysql utf8mb4

Add mysqlmb4 test configuration to Jenkinsfile

fix collation on utf8mb4

Properly setup charset and collation in the doctrine connection

Allow files containing 4-byte chars in case the database supports it

During setup of a mysql database we try to detect if charset 'utf8mb4' can be used

Fix mysql settings

Add console command to migrate the charset

Set ROW_FORMAT before setting collation to mb4

Also select tables with wrong collation

Faster MySQL docker

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:42:12 -06:00
Morris Jobke
1084cdb613
fix path
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 15:33:28 -06:00
Roeland Jago Douma
67909cf87b
Make DI work for all apps
As stated in https://github.com/nextcloud/server/pull/3901#issuecomment-288135309
appid's don't have to match the namespace.

Work around this

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 20:53:37 +01:00
Morris Jobke
d2b1b02244 Merge pull request #3937 from nextcloud/downstream-27234
fix typo in sftp public key
2017-03-21 13:18:19 -06:00
Morris Jobke
a85d7e6f98 Merge pull request #3975 from nextcloud/remove-dead-code
Remove test code
2017-03-21 13:17:11 -06:00
Lukas Reschke
99bf437640
Remove test code
This seems to have been commited by mistake with 6dbe417c51

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 16:59:10 +01:00