wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
38201 commits 157 branches 562 tags 714 MiB
Commit graph

38201 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Roeland Jago Douma
b052addaca
Use minified clipboard.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-29 00:27:50 +02:00
Roeland Jago Douma
e8d068af1e
Update clipboard.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-29 00:26:05 +02:00
Roeland Jago Douma
7cc96c2121
Don't output jpeg if we request png 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-29 00:05:04 +02:00
Lukas Reschke
2a77727897
Fix PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-29 00:04:29 +02:00
Roeland Jago Douma
f0850b266e
Fix inspection results 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-29 00:04:29 +02:00
Thomas Müller
836271e0fd
Adding AvatarNodeTest 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-29 00:04:29 +02:00
Thomas Müller
3e93f491f2
Adding AvatarHomeTest 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-29 00:04:29 +02:00
Thomas Müller
73007255ce
Return last modification time to allow proper listing in cadaver 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-29 00:04:29 +02:00
Thomas Müller
23aab05bda
Adding dav resource for avatars 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-29 00:04:29 +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
Joas Schilling
4bae7ef96d
Allow to reset the password with the email as an input 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-28 21:17:37 +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
7d3b0adf0a adjust opacity of search and gear icons in header 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-27 23:30:09 +02:00
Jan-Christoph Borchardt
ef07f27628 add pointer finger to full clickable app icon area 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-27 20:24:28 +02: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
Jan-Christoph Borchardt
1c4603a376 show triangle below user menu too when an entry inside there is active 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-27 20:17:03 +02:00
Georg Ehrke
242bb746b9
OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackend 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-03-27 19:15:51 +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