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
0da04fd284
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 22:54:08 +02:00
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
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
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
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
c1030a34a5
Merge pull request #4062 from nextcloud/downstream-26872
...
Adding dav resource for avatars
2017-03-29 10:30:22 -06:00
354a24e0aa
also rename defaultMailHeaderColor to defaultColorPrimary
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
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
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
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
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
4622bebded
Include tests for "default" and "none" quotas
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
3676189e05
Add comments in the updateQuota method to explain the behavior
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
ebd1a7d4b2
Add new testes to cover more cases
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
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
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
3345a72e7e
Correctly apply quota
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:11 +02:00
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
626d03e3d4
Merge pull request #4116 from nextcloud/swift-cache-token
...
Cache swift authentication token in memcache
2017-03-29 11:23:13 +02:00
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
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
784e06073b
Merge pull request #4129 from nextcloud/remove-verbose-error-message
...
Remove verbose error message
2017-03-29 10:01:17 +02:00
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
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
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
f9bc53146d
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-28 21:00:12 -06:00
19d3133ccf
Web app manifest
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-28 18:39:57 -06:00
58513255d2
[tx-robot] updated from transifex
2017-03-29 00:07:41 +00:00
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
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
dbf6b7ff86
Merge pull request #4127 from nextcloud/update-legacy-csp-policy
...
Update legacy CSP policy
2017-03-28 17:47:32 -06:00
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
16b8c0c691
Merge pull request #4070 from nextcloud/gzip_scss_js
...
GZip generated CSS/JS files
2017-03-28 17:11:17 -06:00
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
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
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
b052addaca
Use minified clipboard.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 00:27:50 +02:00
e8d068af1e
Update clipboard.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 00:26:05 +02:00
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
2a77727897
Fix PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-29 00:04:29 +02:00
f0850b266e
Fix inspection results
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 00:04:29 +02:00
836271e0fd
Adding AvatarNodeTest
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:04:29 +02:00
3e93f491f2
Adding AvatarHomeTest
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:04:29 +02:00
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
23aab05bda
Adding dav resource for avatars
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:04:29 +02:00
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
3a0ef65f33
Fix controller tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 23:42:20 +02:00
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
a40405531c
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 23:13:59 +02:00
Morris Jobke
Roeland Jago Douma
Roeland Jago Douma
Jan-Christoph Borchardt
Julius Härtl
David Toledo
Juan Pablo Villafáñez
Joas Schilling
Pierre Rudloff
Nextcloud bot
Lukas Reschke
Thomas Müller