Morris Jobke
4dd2a1e679
Merge pull request #2943 from nextcloud/kill_old_preview_code
...
Cleanup old preview code
2017-01-10 13:50:14 +01:00
Roeland Jago Douma
a5bf14ada3
Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares
...
share by mail should continue to work, even if public links are disabled
2017-01-10 13:06:20 +01:00
Roeland Jago Douma
3fa715c2ab
Merge pull request #3005 from nextcloud/dev-manual-12
...
fix dev manual link
2017-01-10 12:54:20 +01:00
Christoph Wurst
5a06dfaca1
fix dev manual link
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 11:02:05 +01:00
Morris Jobke
97a63ad689
Merge pull request #2982 from nextcloud/better-notification-links
...
Set the link of the notification on render instead of creation
2017-01-10 10:27:01 +01:00
Roeland Jago Douma
b847dfcee9
Merge pull request #2925 from nextcloud/remove-close-wrapper
...
replace close:// streamwrapper with CallBackWrapper
2017-01-10 10:21:10 +01:00
Morris Jobke
bc8e565e2a
Merge pull request #2998 from Loki3000/master
...
Default cache value for null user
2017-01-10 10:06:48 +01:00
Loki3000
135198bf0d
Default value for null user
...
For guest users on every request executes query:
SELECT `uid`, `displayname` FROM `users` WHERE LOWER(`uid`) = LOWER(null)
as I see, uid can't be equal to null by design.
2017-01-09 23:34:23 +03:00
Lukas Reschke
307d45e3bd
Merge pull request #2987 from nextcloud/no-empty-bundle
...
dont write a certificate bundle if the shipped ca bundle is empty
2017-01-09 21:10:11 +01:00
Morris Jobke
9a5b9d8555
Merge pull request #2992 from nextcloud/fix_subdir_install_style
...
Fix subdir install style
2017-01-09 18:37:08 +01:00
Robin Appelman
817e974c5f
dont write a certificate bundle if the shipped ca bundle is empty
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-09 16:51:27 +01:00
Lukas Reschke
05d27ec148
Merge pull request #2985 from nextcloud/fix-trusted-domain-error
...
Allow access to CSS resources
2017-01-09 16:29:09 +01:00
Roeland Jago Douma
dec4b26355
Fix subdir install style
...
* We need to pass the serverroot so that it can include the right files.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-09 16:19:54 +01:00
Joas Schilling
fee18d6c78
Merge pull request #2814 from nextcloud/appstore_etag_validation
...
Add ETag validation to appstore requests
2017-01-09 14:56:20 +01:00
Lukas Reschke
69f3430552
Allow access to CSS resources
...
Fixes https://github.com/nextcloud/server/issues/2984
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-09 12:53:58 +01:00
Joas Schilling
b29149402c
Fix update notification tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:09:47 +01:00
Joas Schilling
bb84db02cb
Cleanup comment tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:03:34 +01:00
Joas Schilling
315645ada3
Only add the link when the user can follow it.
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:24:09 +01:00
Joas Schilling
acbf0d151f
Set the link of the notification on render instead of creation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:59 +01:00
Joas Schilling
e675c2a66c
Set the comment link on render instead of creation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:33 +01:00
Nextcloud bot
4f9ff96f79
[tx-robot] updated from transifex
2017-01-09 08:24:58 +00:00
Roeland Jago Douma
6347d97c7f
Merge pull request #2512 from nextcloud/cleanup-system-tag-usage
...
Only allow admins to delete tags
2017-01-06 16:17:09 +01:00
Roeland Jago Douma
4a2fbe9a5b
Merge pull request #2930 from nextcloud/kill-group-restriction-when-not-applicable
...
Remove group restrictions when those are not allowed anymore
2017-01-06 15:38:13 +01:00
Robin Appelman
e40ecc1aa1
update autoloader
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:33 +01:00
Robin Appelman
5774d3e82c
replace close:// streamwrapper with CallBackWrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:32 +01:00
Morris Jobke
3ab22c2df5
Merge pull request #2948 from nextcloud/allow-global-composer-to-be-used
...
Allow to use a global composer instance
2017-01-06 15:31:24 +01:00
Roeland Jago Douma
73fcb69cad
Merge pull request #2934 from nextcloud/quota-stream-non-global
...
remove the need to register the quota streamwrapper globally
2017-01-06 15:25:20 +01:00
Morris Jobke
ced5fbcc9c
Merge pull request #2968 from nextcloud/update-3rdparty
...
Update 3rdparty
2017-01-06 15:21:56 +01:00
Roeland Jago Douma
ae934cbdab
Merge pull request #2966 from nextcloud/ldif-mime-support
...
recognize LDIF (and schema) file types
2017-01-06 14:42:17 +01:00
Morris Jobke
365fa45ced
Update 3rdparty after the merge of #2050
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-06 14:18:21 +01:00
Roeland Jago Douma
5ed4020215
Merge pull request #2050 from nextcloud/scss-switch-base
...
Switch to SCSS: base files
2017-01-06 14:15:38 +01:00
Roeland Jago Douma
ccab1168ce
Fix js tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 13:33:18 +01:00
Morris Jobke
5e02c7f7bd
Theme update pages via CSS
...
* SCSS on-the-fly generation isn't allowed during update
* fallback to plain CSS
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-06 12:36:16 +01:00
Arthur Schiwon
68a0f8e153
recognize LDIF (and schema) file types
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-06 12:25:16 +01:00
Roeland Jago Douma
b8ab062ef3
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:40 +01:00
John Molakvoæ (skjnldsv)
7b8c777b57
Fix css url prefix for IgnoreFrontController enabled configs
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv)
8bcad88c6f
ScssCcacher typo fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv)
6d3a890cb3
Camelcase fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
Lukas Reschke
7b8debc5d3
Remove webroot from file path
...
The webroot is already provided, otherwise this links to stuff like "/nextcloud/nextcloud/index.php" instead of "/nextcloud/index.php"
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-06 09:42:39 +01:00
Roeland Jago Douma
350b7ebc86
Adds CssControllerTests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv)
e3a57c1f07
Fix variables should be passed by reference
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv)
e1f018838e
Updated installation css for config error and update
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv)
a44c5244c3
Removed old css files
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv)
62f4c08bc7
3rdparty branch set
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv)
1c128e9391
Tooltip scss
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:15 +01:00
John Molakvoæ (skjnldsv)
5b302a9a67
Systemtags scss
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
59731acf38
Styles scss
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
f4ac735f98
Share scss
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
4cda23bb6a
Multiselect scss
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
62acac9b80
Jquery-ui-fixes scss
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00