Morris Jobke
dbf6b7ff86
Merge pull request #4127 from nextcloud/update-legacy-csp-policy
...
Update legacy CSP policy
2017-03-28 17:47:32 -06:00
Morris Jobke
51e5c0766c
Fix check for cache value in JSCombiner
...
* fixes following log output, because there was empty string
stored in the cache
Invalid argument supplied for foreach() at lib/private/Template/JSCombiner.php#108
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-28 17:43:39 -06:00
Morris Jobke
16b8c0c691
Merge pull request #4070 from nextcloud/gzip_scss_js
...
GZip generated CSS/JS files
2017-03-28 17:11:17 -06:00
Lukas Reschke
49ba822fef
Remove verbose error message
...
There's no need to have this included in the error message.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-29 00:34:33 +02:00
Lukas Reschke
3a90ab7e0a
Update legacy CSP policy
...
Aligns it with the one enforced by the AppFramework
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-28 23:55:31 +02:00
Roeland Jago Douma
a40405531c
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 23:13:59 +02:00
Roeland Jago Douma
4821c00ea8
Merge pull request #4004 from nextcloud/backport-27172
...
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
2017-03-28 21:56:44 +02:00
Roeland Jago Douma
54f9b35f71
Allow to gzip CSS/JS files
...
Since in production the SCSS files are compiled once and the javascript
files are combined once we can just as well gzip them aggresively.
This means that once they are requested and the browser supports gzip we
can just serve the gzipped file saving precious bandwidth.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 21:46:23 +02:00
Robin Appelman
6991b79d40
serialize the token to json instead of using php's serialize
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 21:33:07 +02:00
Robin Appelman
205d5586e8
cache swift tokens in memcache
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 12:37:41 -06:00
Robin Appelman
e26f138fc5
Merge pull request #4112 from nextcloud/swift-config
...
Better error messages for objectsack swift configuration
2017-03-28 17:51:18 +02:00
Joas Schilling
644b37c7e4
Change the order on merging activities so the newest item is first
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-28 17:19:34 +02:00
Robin Appelman
8dbca71a77
better error messages for invalid regions, urltypes and service names
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 17:00:11 +02:00
Robin Appelman
5062d0ac50
better error messages when swift authentication fails
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 11:02:18 +02:00
Nextcloud bot
6309b9ec1d
[tx-robot] updated from transifex
2017-03-28 00:07:53 +00:00
Morris Jobke
da11931815
Merge pull request #4084 from nextcloud/fix-log-spam-with-too-few-navigation-items
...
Don't spam the log with "Undefined index showInHeader"
2017-03-27 15:53:08 -06:00
Morris Jobke
f76a3b532d
Merge pull request #4096 from nextcloud/touch-floor
...
round the mtime in touch
2017-03-27 09:46:10 -06:00
Robin Appelman
8de4209c3e
round the mtime in touch
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-27 17:07:48 +02:00
Georg Ehrke
fc044caab1
Merge pull request #4072 from nextcloud/move-x-frame-options-into-php
...
Move X-Frame-Options into PHP
2017-03-27 15:05:22 +02:00
Joas Schilling
81d87b01fe
Don't spam the log with "Undefined index showInHeader"
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-27 10:24:10 +02:00
Nextcloud bot
d9ebc2626f
[tx-robot] updated from transifex
2017-03-27 00:07:55 +00:00
Joas Schilling
8d3c461151
Allow to specify the id
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 23:07:54 +02:00
Joas Schilling
918f6fd10b
Make sure help is always after users
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 22:32:12 +02:00
Morris Jobke
900f11fd91
Fix order as @jancborchardt requested
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 14:30:21 -06:00
Joas Schilling
0229c16e5f
Don't use the dropdown for one item only
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:23:18 +02:00
Joas Schilling
e0b040d623
Allow multiple navigation links from info.xml
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:15:25 +02:00
Joas Schilling
7cc5130e82
Allow apps to register a setting via info.xml
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 20:37:39 +02:00
Joas Schilling
433958e2e3
Move app management to the settings menu
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 20:26:05 +02:00
Joas Schilling
054e161eb5
Manage the right side menu via the navigation manager as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 19:40:41 +02:00
Joas Schilling
ec330c7ac4
Register the app management in the normal way
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 19:08:51 +02:00
Lukas Reschke
bff6c8aafc
Move X-Frame-Options into PHP
...
The public calendar view should be embeddable and we can't do that if the .htaccess sets a global X-Frame-Options.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 17:26:11 +02:00
Joas Schilling
3668673d7b
Create a notification when the update server couldn't be reached for some days
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 10:59:58 +02:00
Nextcloud bot
0981f9a18a
[tx-robot] updated from transifex
2017-03-26 01:07:03 +00:00
Lukas Reschke
d81cdcbe88
Don't run JSCombiner when not installed
...
When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-25 15:25:06 +01:00
Morris Jobke
2f7669179e
Merge pull request #4043 from nextcloud/merge-js-for-template-prepend
...
Merge JS for template prepend
2017-03-24 15:42:08 -06:00
Lukas Reschke
6a470e5935
Merge JS for template prepend
...
Shaves off 14 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:37:13 +01:00
Lukas Reschke
4d68324ba6
Merge sharing backend JS
...
Removes 8 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:17:38 +01:00
Roeland Jago Douma
be6acbeb52
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 16:11:54 +01:00
Roeland Jago Douma
b5299b1403
Add return
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Roeland Jago Douma
90910290d1
Add debug mode
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Roeland Jago Douma
242f8964cf
Add caching
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Roeland Jago Douma
8e89ad21a2
[PoC] JS Combiner
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:10 +01:00
Lukas Reschke
f94bc6f8bb
Merge pull request #4013 from nextcloud/bundle_vendor_js
...
Bundle vendor js
2017-03-24 10:49:57 +01:00
Morris Jobke
1397b84777
Merge pull request #3928 from nextcloud/downstream-17978
...
Adjust 4 byte MySQL code to upstream
2017-03-23 23:45:43 -06:00
Morris Jobke
d197f609a8
Merge pull request #3889 from nextcloud/downstream-26950
...
Sharing dialog: make autocomplete sorting case insensitive
2017-03-23 23:45:28 -06:00
Nextcloud bot
e18d928d9b
[tx-robot] updated from transifex
2017-03-24 01:08:00 +00:00
Morris Jobke
dbaebc53b0
fix sorting in the backend
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 15:41:25 -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
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
88015bc51f
Fix type hints and doc blocks
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 17:52:47 +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
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
d6cff564f6
Merge pull request #3994 from nextcloud/only_init_backbone_once
...
Only initialize backbone once
2017-03-23 11:54:54 +01: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
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
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
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
Morris Jobke
f4ead7c7d3
Fix autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 12:08:41 -06: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
Roeland Jago Douma
ec3f5aa6e2
Merge pull request #3795 from nextcloud/bundle_vendor_js
...
Bundle vendor js
2017-03-22 13:34:21 +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
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
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
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
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
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
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
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
Joas Schilling
348d97dfd6
Merge pull request #3844 from nextcloud/unshare_event
...
Unshare event
2017-03-21 16:57:09 +01:00
Roeland Jago Douma
92f50c7d87
Core is also a special app
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 10:42:33 +01:00
Roeland Jago Douma
48c34522ed
Move a lot of stuff over to the ServerContainer
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 10:29:59 +01:00
Roeland Jago Douma
c92b9ce2c4
Fix settings tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma
21641302a9
Add DI intergration tests
...
* Moved some interface definitions to Server.php (more to come)
* Build/Query only for existing classes in the AppContainer
* Build/Query only for classes of the App in the AppContainer
* Offload other stuff to the servercontainer
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma
7cece61ff6
Extend DI tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma
246e9ce547
More elegant handling of recursion
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma
df14684817
PoC of moving the interface classes to the servercontainer
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma
886202123c
Update query method for DIContainer
...
To align with https://github.com/nextcloud/server/issues/2043#issuecomment-287348294
This would mean that AppContainers only hold the AppSpecific services
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:17 +01:00
Nextcloud bot
fd0e42e093
[tx-robot] updated from transifex
2017-03-21 01:08:16 +00:00
Lukas Reschke
21cf1b22e9
Merge pull request #3530 from nextcloud/scss-variables
...
Implement scss variables
2017-03-20 19:49:53 +01:00
Christoph Wurst
03a92eaf74
Merge pull request #3957 from nextcloud/downstream-27307
...
Follow up to #3949 (app exists on enable)
2017-03-20 18:10:05 +01:00
Roeland Jago Douma
1565177fb5
Revert "Add a magic wrapper to allow phpunit4 to run the code again "
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-20 14:25:43 +01:00
Julius Härtl
29ec58f1b5
Add tests for SCSSCacher
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 14:12:35 +01:00
Lukas Reschke
450a899f01
Merge pull request #3945 from nextcloud/downstream-27298
...
Adding file, line, class and function to the query logger (#27298 )
2017-03-20 13:16:10 +01:00
Julius Haertl
4fbf9a4feb
Add tests for SCSSCacher
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 12:49:08 +01:00
Julius Haertl
2bd06e0d37
Add variables.scss and import it for each scss file
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:05 +01:00
Joas Schilling
85a5c24934
Merge pull request #3939 from nextcloud/downstream-27159
...
Fix malformed logging in exception
2017-03-20 12:46:48 +01:00
Joas Schilling
257fbd85eb
Merge pull request #3929 from nextcloud/downstream-27068
...
cache loadUser if not exists
2017-03-20 12:44:54 +01:00
Joas Schilling
35f6b8716e
Merge pull request #3884 from nextcloud/downstream-26956
...
Skip null groups in group manager
2017-03-20 12:27:38 +01:00
Lukas Reschke
a3739906f6
Merge pull request #3924 from nextcloud/preview_fixes
...
Do not generate the max preview twice
2017-03-20 11:45:51 +01:00
Lukas Reschke
ac1aff7d92
Merge pull request #3950 from nextcloud/downstream-27149
...
Forbid to upload part files via web UI
2017-03-20 11:44:57 +01:00