Commit Graph

13595 Commits

Author SHA1 Message Date
Christoph Wurst cbe44043be Merge pull request #4131 from nextcloud/fix-jscombiner
Fix check for cache value in JSCombiner
2017-04-03 11:27:39 +02:00
Nextcloud bot d56f6399eb
[tx-robot] updated from transifex 2017-04-03 00:08:20 +00:00
Björn Schießle 85da9378c0 Merge pull request #4140 from nextcloud/no_encryption_no_wrapper
Don't add the Encryption Storage Wrapper if there are no encryption modules
2017-03-31 14:49:38 +02:00
Nextcloud bot 6a6300b1f2
[tx-robot] updated from transifex 2017-03-31 00:08:35 +00:00
Roeland Jago Douma 548871a9f3 Merge pull request #3832 from nextcloud/fix_1303
Do not clear CSRF token on logout (fix for #1303)
2017-03-30 18:25:50 +02:00
Joas Schilling a51e4dd259 Merge pull request #4150 from nextcloud/capped-memcache-push
support pushing to CappedMemoryCache
2017-03-30 15:16:33 +02:00
Robin Appelman 0aeb595784
user ids are strings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:24:46 +02:00
Robin Appelman dc4b983639
support pushing to CappedMemoryCache
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:21:32 +02:00
Robin Appelman d4a7cfec7c
rename fun to func
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:06 +02:00
Robin Appelman fee818f493
Add tests for query builder (i)like
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:03 +02:00
Robin Appelman 3355fd549f
dont double escape
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:59 +02:00
Robin Appelman 07449a4885
update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:56 +02:00
Robin Appelman 4125bdeb93
fix licence headers
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:52 +02:00
Robin Appelman 4b7bc2af0e
Move all children of a folder in a single query
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:48 +02:00
Robin Appelman 4279b13270
Add function builder to the query builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:26 +02:00
Robin Appelman a65652fc1e
add support for escaping like parameters when using the query builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:22 +02:00
Robin Appelman 83f3990e06
Add MD5() to sqlite
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:19 +02:00
Lukas Reschke 1ee7e1c0b1 Merge pull request #4132 from nextcloud/fix-safari-gzip
Fix gzip files for Safari
2017-03-30 10:47:28 +02:00
Nextcloud bot f984cf0987
[tx-robot] updated from transifex 2017-03-30 00:07:41 +00:00
Roeland Jago Douma 111c9f7563
Don't add the Encryption Storage Wrapper if there are no encryption modules
fixes #4125

If there is no encryption module enabled it makes no sense to setup the
encryption wrapper (because we can't do anything anyway).

This saves reading the header of files.
Especialy on external storage/objectstore this should improve
performance

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 18:57:56 +02:00
Jan-Christoph Borchardt 354a24e0aa
also rename defaultMailHeaderColor to defaultColorPrimary
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
Julius Härtl 698396a927
Add fallback to getMailHeaderColor so we don't break existing themes
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-29 18:23:23 +02:00
Jan-Christoph Borchardt 9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
Roeland Jago Douma 626d03e3d4 Merge pull request #4116 from nextcloud/swift-cache-token
Cache swift authentication token in memcache
2017-03-29 11:23:13 +02:00
Joas Schilling 784e06073b Merge pull request #4129 from nextcloud/remove-verbose-error-message
Remove verbose error message
2017-03-29 10:01:17 +02:00
Morris Jobke 9813023aab
Fix gzip files for Safari
* Safari support gzip only if the filename does not
  end on .gz - so this renames them to .gzip

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:11:51 -06:00
Morris Jobke 05f2596311 Merge pull request #4091 from nextcloud/Rudloff-manifest
Web app manifest for adding to Android home screen
2017-03-28 21:36:54 -06:00
Pierre Rudloff 19d3133ccf
Web app manifest
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-28 18:39:57 -06:00
Nextcloud bot 58513255d2
[tx-robot] updated from transifex 2017-03-29 00:07:41 +00:00
Morris Jobke 1f7124a57b Merge pull request #4120 from nextcloud/newest-item-first-in-activity
Change the order on merging activities so the newest item is first
2017-03-28 17:51:30 -06:00
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