Morris Jobke
e8f2ee769b
Merge pull request #4142 from nextcloud/numeric_avatar
...
Allow avatars for full numeric users
2017-03-29 17:17:19 -06:00
Morris Jobke
d17678b5b2
Merge pull request #4141 from nextcloud/ldap-downstream-9
...
Convert the group limit to match the same behaviour as the user search
2017-03-29 15:47:28 -06:00
Roeland Jago Douma
0da04fd284
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 22:54:08 +02:00
Roeland Jago Douma
0315e2ea36
Merge pull request #4145 from nextcloud/ldap-downstream-54
...
Add tooltips to LDAP wizard special attributtes
2017-03-29 19:31:35 +02:00
Roeland Jago Douma
6d8e447895
Merge pull request #4108 from nextcloud/color-variable-rename
...
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
2017-03-29 19:13:36 +02:00
Roeland Jago Douma
636575e3de
Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid
...
Ldap no memberof with memberuid
2017-03-29 19:12:51 +02:00
Morris Jobke
c1030a34a5
Merge pull request #4062 from nextcloud/downstream-26872
...
Adding dav resource for avatars
2017-03-29 10:30:22 -06: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
David Toledo
a4b9bd29a9
Add tooltips to LDAP wizard special attributtes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Update settings.php
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Update settings.php
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Update settings.php
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 14:38:01 +02:00
Roeland Jago Douma
54c68519ce
Allow avatars for full numeric users
...
Fixes #4087
Because of fancy javascript if a full numeric uid was used javascript
would convert this to an int. Now we just convert everything to a string
first.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 13:39:48 +02:00
Juan Pablo Villafáñez
9e2e0c4c30
Convert the group limit to match the same behaviour as the user search
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 12:49:08 +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
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
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