Commit Graph

37935 Commits

Author SHA1 Message Date
Juan Pablo Villafáñez e9b96062e6
Adjust current tests to match the expectations
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez f9832ff347
Check if the user exists before trying to set the quota
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez 3345a72e7e
Correctly apply quota
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:11 +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
Roeland Jago Douma 00839a5ac5 Merge pull request #4066 from nextcloud/always-fix-the-values-live
Directly fix invalid values of DTEND and DTSTART
2017-03-29 10:13:10 +02:00
Joas Schilling a88edce54f Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-p
Replace unecessary unescaped prints with print
2017-03-29 10:02:10 +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 ac7ca1c3a8 Merge pull request #4060 from nextcloud/shared_by_for_own_calendars
fix bug with shared_by for own calendars if shared
2017-03-29 00:29:54 -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
Morris Jobke f9bc53146d
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-28 21:00:12 -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 9e1fdf4da5 Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebar
Better styling of the empty content messages in the sidebar
2017-03-28 17:50:10 -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 4f09dc71e0 Merge pull request #4121 from nextcloud/split-sharing-integration-tests
Split long running features/sharing-v1.feature into two smaller parts
2017-03-28 17:24:40 -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
Morris Jobke 6901b28f07
Split long running features/sharing-v1.feature into two smaller parts
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-28 16:46:56 -06:00
Lukas Reschke 99675b46e9
Replace unecessary unescaped prints with print
There's no need to have those unescaped from what I can see.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-29 00:43:44 +02: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 3a0ef65f33
Fix controller tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 23:42:20 +02:00
Joas Schilling b91bacf141
Better styling of the empty content messages in the sidebar
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-28 23:26:10 +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
Joas Schilling 2c682ad34d Merge pull request #4054 from nextcloud/inlinejsfirst
Moving the inline js before the CSS
2017-03-28 22:36:50 +02:00
Roeland Jago Douma 1ae56b054b
Moving the inline js before the CSS
This allows browsers to do smarted parallel downloads

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 22:02:22 +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 de83bda777
update rackspace/opencloud to 1.16.0
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 12:37:36 -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
Morris Jobke 401a5d896d Merge pull request #4101 from nextcloud/header-detail
show active indicator on current app even when hovering other icons
2017-03-28 08:57:09 -06: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
John Molakvoæ f88a578f8e Merge pull request #4082 from nextcloud/fix-menu
Fix pop over menu opacity
2017-03-28 09:47:48 +02:00
Nextcloud bot 6309b9ec1d
[tx-robot] updated from transifex 2017-03-28 00:07:53 +00:00
Morris Jobke b673d1d8c4 Merge pull request #4107 from nextcloud/users-settings-label
add Settings label to users settings for consistency
2017-03-27 17:45:40 -06:00
Jan-Christoph Borchardt f47cb96753 add Settings label to users settings for consistency
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-28 01:18:16 +02: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
Jan-Christoph Borchardt 3da45ec375 show active indicator on current app even when hovering other icons
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 20:18:37 +02:00
Morris Jobke 56243e07cb Merge pull request #4083 from nextcloud/update-strengthify
Update strengthify and fix password strength
2017-03-27 10:06:54 -06:00
Morris Jobke afcb41886e
Update strengthify and fix password strength
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-27 10:06:30 -06:00
Morris Jobke 0037d18aee Merge pull request #4094 from nextcloud/ldap-description
Fix LDAP description
2017-03-27 09:52:02 -06:00
Morris Jobke 27527adfd7 Merge pull request #4092 from nextcloud/theme-favicon-mask-color
use theming colors for favicon on macOS
2017-03-27 09:50:21 -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
Marius Blüm 690aec26bb Merge branch 'master' of https://github.com/nextcloud/server 2017-03-27 16:32:45 +02:00
Marius Blüm 0e058a9a94
Fix LDAP description
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-03-27 16:30:29 +02:00