Joas Schilling
ce973929e8
Merge pull request #3075 from nils/debug-no-versionhash
...
Do not add version hash in debug mode
2017-01-17 11:44:50 +01:00
Joas Schilling
30b9262a5a
Make sure the spreed TURN server secret stays a secret
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:29:10 +01:00
Joas Schilling
aea1b72f54
Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions
...
Markdown support for app descriptions
2017-01-17 11:11:16 +01:00
Christoph Wurst
012708e1ba
Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs
...
Filter out sensitive appconfig values
2017-01-17 11:01:42 +01:00
Nils
ba3506c431
[Enhancement] Do not add version hash in debug mode
...
Signed-off-by: Nils <git@to.nilsschnabel.de>
2017-01-15 13:29:32 +01:00
Joas Schilling
fcfb4205bc
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:43 +01:00
Joas Schilling
587eca3ccd
Remove the magic parsing of the description
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:42 +01:00
Joas Schilling
91beb178a7
Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation
...
Change the row-format before changing the collation
2017-01-13 14:43:06 +01:00
Morris Jobke
622101f2dd
Merge pull request #2918 from nextcloud/encryption-recovery-improvements
...
create new encryption keys on password reset and backup the old one
2017-01-13 11:28:43 +01:00
Joas Schilling
77b5d7bc86
Change the row-format before changing the collation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 16:54:29 +01:00
Joas Schilling
77577b952b
Make sure different webroots use different cached paths
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 15:58:18 +01:00
Vincent Petry
e667b28298
Fix files node API failed rename/copy
...
Whenever a rename or copy operation failed on the view, we must throw
an exception instead of just ignoring.
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-12 13:52:59 +01:00
Joas Schilling
5dc6899d1a
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 10:49:22 +01:00
Christoph Wurst
140555b786
always allow remembered login
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
21d3fe5883
do not hard-require the token provider
...
The provider might need DB access and therefore depenedency
resolution fails on the setup page where we cannot inject
the db implementation.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
6f74ecd94a
use login hook credentials as fallback
...
If no session token is available, we can use the credentials provided
by the login hook.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
3316a9d294
fix @since annotations (9.1->12)
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
46adb3eced
replace session implementation if it changes at runtime
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
a6dca9e7a0
add login credential store
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:09 +01:00
Vincent Petry
eb5ea0e260
Refactor files node API for more code reuse
...
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-11 14:53:42 +01:00
Roeland Jago Douma
005ce8aaf6
Merge pull request #3007 from Loki3000/master
...
Remove non required db requests
2017-01-11 12:37:54 +01:00
Joas Schilling
ce7836378c
Filter out sensitive appconfig values
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-11 11:42:36 +01:00
Roeland Jago Douma
447e388ce9
Merge pull request #2744 from nextcloud/oc_26324
...
[downstream] Fix DAV stat cache to properly cache 404
2017-01-11 08:16:40 +01:00
Roeland Jago Douma
f515c6db4a
Merge pull request #2745 from nextcloud/oc_26590
...
[downstream] Skip local shares in bkg scan and occ files:scan (#26590 )
2017-01-11 08:16:12 +01:00
Roeland Jago Douma
a90cbb0f09
Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully
...
Handle log_type "nextcloud" more gracefully
2017-01-11 08:14:24 +01:00
John Molakvoæ (skjnldsv)
e4b3ba6590
Create unified css file and merge all needed data into this file
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-10 17:50:29 +01:00
Bjoern Schiessle
fcda3a20f4
create new encryption keys on password reset and backup the old one
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-10 17:04:32 +01:00
Roeland Jago Douma
00b17c3af5
Only check for local shared storages
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-10 16:14:21 +01:00
Vincent Petry
706655ef20
Skip local shares in bkg scan and occ files:scan ( #26590 )
...
Local shares should only be scanned when doing it for the owner to
avoid repeatedly rescanning the same shared storage over and over again
for every recipient.
2017-01-10 16:11:45 +01:00
Loki3000
7e06f051c9
remove non required sql requests
...
```
SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = '';
```
2017-01-10 17:16:56 +03:00
Loki3000
8ab16f87ac
spaces added
2017-01-10 16:44:14 +03:00
Loki3000
6a74f7db11
spaces added
2017-01-10 16:43:43 +03:00
Loki3000
5c77923360
allowed '0' uid
2017-01-10 16:39:10 +03:00
Loki3000
b7e6c5ecdf
allowed '0' uid
2017-01-10 16:37:18 +03:00
Morris Jobke
30689f338f
Merge pull request #2914 from nextcloud/logrotate-logfile
...
Get the logfile location while running the logrotate cron job instead…
2017-01-10 14:28:09 +01:00
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
Joas Schilling
7fa063ceca
Better fallback for unknown log types
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:59:13 +01:00
Loki3000
74a2938f8e
fix spaces
2017-01-10 14:21:23 +03:00
Loki3000
5262779101
fix brackets
2017-01-10 13:29:35 +03:00
Loki3000
b0ff59d42f
remove non required db requests
2017-01-10 13:09:33 +03:00
John Molakvoæ (skjnldsv)
67467873c2
Removed jquery scss
...
- Switched to setup.css
- Disable scss when displaying the update page
- Improved setup css
- Fixed loading failure of other styles on setup & update page
- Improved scss compiler with an ignore scss compilation option
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-10 11:06:03 +01:00
Loki3000
33259b41cd
remove non required db requests
2017-01-10 13:05:21 +03: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
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
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
Joas Schilling
e7ff1ba548
Add tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 10:55:40 +01:00
Robin Appelman
54f96e5f58
Get the logfile location while running the logrotate cron job instead of when registering the job
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 16:10:07 +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
5774d3e82c
replace close:// streamwrapper with CallBackWrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:32 +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
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
Roeland Jago Douma
203143e26a
Fix typo
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
Roeland Jago Douma
7bd9087f9e
Inject SCSSCacher
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
Roeland Jago Douma
d64d661ef5
Make SCCCacher injectable
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
Roeland Jago Douma
d9eaed5ffa
Formatting
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
Roeland Jago Douma
1e44a15dd1
No need for the CssManager
...
* It is a simple wrapper we can always add it later if needed
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
bd5bcd2d8d
Installation css & template edit
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
763814f057
Css installation page fallback
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
Roeland Jago Douma
95d85ba8eb
Do not add ICssManager to OCP
...
We can add it later if needed
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:13 +01:00
Roeland Jago Douma
2816177ecb
Code cleanup
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
1f769e6e76
Fix php docs
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
6380d503af
Css cache folder name fix, route fix and various fixes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
35b13b856b
Appdata location fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
9a21d98824
Regex fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
3b62003c9c
Injection fix and log appname fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
2f5f1096ad
Since fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
6697bae6aa
Url generator fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
12717bfd72
log app name fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
1caaa7f4cd
Appdata integration 2
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
3a7d6846fa
Appdata integration 1 & log fix 2
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
cf73e71ff1
Debug log fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
31f75e50b6
Cache and compile base
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
Morris Jobke
eeb5ea85f7
Merge pull request #2817 from nextcloud/fix-invalid-share-perms
...
Fix invalid share perms
2017-01-05 15:52:23 +01:00
Joas Schilling
64097aece9
Merge pull request #2946 from nextcloud/kill-apc
...
Kill APC because it requires PHP 5.4 or lower
2017-01-05 15:25:48 +01:00
Joas Schilling
ba7f5105f0
Merge pull request #2797 from nextcloud/issue-2734-sudo-password-with-ldap
...
Use login name to fix password confirm with ldap users
2017-01-05 15:15:04 +01:00
Robin Appelman
cb32d21682
Merge pull request #2922 from nextcloud/fopen-only-simple-modes
...
log a warning when trying to use a non basic fopen mode
2017-01-05 14:49:55 +01:00
Joas Schilling
9e95a89ab7
Merge pull request #2535 from nextcloud/allow-to-reuse-admin-as-install-name-like-on-mysql
...
Allow to reuse the same name when installing a new instance on postgres
2017-01-05 14:31:37 +01:00
Joas Schilling
22e74cf5ac
Use the new expression
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 14:30:25 +01:00
Joas Schilling
4128a08333
Add bitwise AND and OR to the expression builder
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 14:30:25 +01:00
Lukas Reschke
5d01004368
Adjust version to Nextcloud
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-05 14:30:25 +01:00
Vincent Petry
7baa4ea1a4
Add repair step to fix file share permissions
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-05 14:30:22 +01:00
Roeland Jago Douma
fc04779a26
Add ETag validation to appstore requests
...
* If the ETag if present store it
* If a stored ETag is present then pass it along (with the original
response) to get
* Add tests
* Added files to classmap
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-05 14:26:09 +01:00
Joas Schilling
7573fa3148
Handle log_type "nextcloud" more gracefully
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 12:47:27 +01:00
Joas Schilling
5aa388bbe2
Make sure the loginname is set when logging in via cookie
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 12:17:30 +01:00
Joas Schilling
57c65c3ec6
Make sure old instances don't break
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 11:57:18 +01:00
Joas Schilling
bf043deba3
Kill APC because it requires PHP 5.4
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 10:58:34 +01:00
Vincent Petry
6d4abdab8f
Fix DAV stat cache to properly cache 404
...
404 errors were not properly cached due to catching the wrong
exception. Now catching ClientHttpException and checking the error
code. In case of 404, adjust the stat cache accordingly.
2017-01-05 09:39:07 +01:00
Robin Appelman
72a3ea6073
log a warning when trying to use a non basic fopen mode
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-05 08:49:04 +01:00
Roeland Jago Douma
e723363053
Remove old preview code
...
* \OC\Preview is no more
* \Test\PreviewTests is no more
* PreviewHooks in base.php are gone
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-04 20:14:16 +01:00
Roeland Jago Douma
9bbfb5ffeb
Rewrite old preview endpoint for PreviewManager
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-04 16:51:44 +01:00