c93664468c
Merge pull request #21028 from owncloud/fix-php-doc-for-storage-config
...
Use proper PHPDoc reference
2015-12-08 10:04:41 +01:00
715f89a9d9
Sanitize the appId passed to `findAppInDirectories`
...
Would have prevented quite some security bugs in the past. Nice hardening for now.
2015-12-08 10:03:22 +01:00
a3391248e4
Add select distinct to the query builder
2015-12-08 09:49:21 +01:00
f55a56ff6c
Use proper PHPDoc reference
2015-12-08 09:45:20 +01:00
f2c7acb3c0
Allow getting the last insert id without much hassle
2015-12-08 09:40:20 +01:00
5453daab03
More fixes to the docs
2015-12-08 09:11:50 +01:00
6d3eb7673d
Add unit test for nested arrays
2015-12-08 09:07:38 +01:00
4b293dffe5
Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTML
2015-12-08 08:56:47 +01:00
70c228a7cc
Get rid of passing a reference
...
Fixes https://github.com/owncloud/core/issues/14643
2015-12-08 08:56:46 +01:00
8289943a0f
Do not trust casting
2015-12-08 08:50:00 +01:00
451ba4ddaa
Remove unused repair steps
...
These ones are not necessary anymore for the new major release.
2015-12-08 08:46:41 +01:00
6ea7410041
Remove legacy check
...
This one is not required anymore as we have the RepairConfig repair step since November 2014.
2015-12-08 08:44:42 +01:00
d6276faff6
Merge pull request #21014 from owncloud/share-unsharelinkpapercut
...
Fix unshare link click element
2015-12-08 08:39:33 +01:00
8903afec26
Don't write directives from CLI
2015-12-08 08:17:04 +01:00
0a89073c47
Run .htaccess updates in any case
...
This is the same what we also do in updater.php and thus this aligns the code. Makes the code paths more consistent.
2015-12-08 08:16:24 +01:00
235094ab54
Remove version check out of .htaccess
...
This can now be achieved using the new code signing.
2015-12-08 08:16:23 +01:00
3bce1b20fe
Add DirectorySlash to dynamic .htaccess write
...
When `DirectorySlash off` is set then Apache will not lookup folders anymore. This is required for example when we use the rewrite directives on an existing path such as `/core/search`. By default Apache would load `/core/search/` instead `/core/search` so the redirect would fail here.
This leads however to the problem that URLs such as `localhost/owncloud` would not load anymore while `localhost/owncloud/` would. This has caused problems such as https://github.com/owncloud/core/pull/21015
With this change we add the `DirectorySlash off` directive only when the `.htaccess` is writable to the dynamic part of it. This would also make `localhost/owncloud` work again as it would trigger the 404 directive which triggers the redirect in base.php.
2015-12-08 08:10:55 +01:00
736e133c04
[tx-robot] updated from transifex
2015-12-08 01:56:19 -05:00
0f1be1b601
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 20:08:20 +00:00
b15d77c934
Merge pull request #21015 from owncloud/update-redirecttocorrectpage
...
Redirect to correct URL after updating
2015-12-07 19:55:45 +01:00
4100263bd6
Merge pull request #20996 from owncloud/issue-12215-remove-password-reset-when-not-possible
...
Issue 12215 remove password reset when not possible
2015-12-07 19:55:26 +01:00
69ab047f89
Redirect to correct URL after updating
...
Now requires a trailing slash to make sure we don't land on the
forbidden page.
2015-12-07 18:08:00 +01:00
5567b6cee2
Fix unshare link click element
...
When clicking on the unshare link (trash icon), the correct link element
needs to be used instead of whatever child was clicked. Then, that
element might contain a visible loading icon.
This fixes the spinner detection and also prevents a full page reload in
case the spinner was visible.
2015-12-07 17:58:17 +01:00
bec34f1275
Merge pull request #21006 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-12-07 17:49:43 +01:00
77958bb601
Merge pull request #21009 from owncloud/share-forbidlinkshare-duplicatefield
...
Fix duplicate bogus share field when link sharing is not allowed
2015-12-07 17:49:24 +01:00
0f30908aa3
Merge pull request #21011 from owncloud/allow-ico
...
Allow .ico files
2015-12-07 17:49:03 +01:00
000523a7fe
Merge pull request #18212 from ryno83/treat_LDAP_users_not_available_by_user_filter_as_deleted
...
treat LDAP users not available by user filter as deleted
2015-12-07 17:47:10 +01:00
37efc1d1e1
Allow .ico files
...
Makes `/core/img/favicon.ico` accessible again via web.
2015-12-07 17:15:04 +01:00
939ba745ee
Merge pull request #20991 from owncloud/disabled-checked-checkbox-css-rules
...
Disabled checked checkbox css rules
2015-12-07 17:11:26 +01:00
48cc4b4511
Merge pull request #21004 from owncloud/adding-mention-bot
...
Adding a basic configuration for the mention bot
2015-12-07 17:11:01 +01:00
6735005be0
Fix duplicate bogus share field when link sharing is not allowed
...
Whenever link share is not allowed, it was outputting a bogus sharing
field which name would conflict with the regular sharing field.
This fix makes sure that the bogus sharing field with "Resharing not
allowed" message only appears when triggered by removed share
permissions.
2015-12-07 16:53:56 +01:00
7dd1874188
Merge pull request #20980 from owncloud/UoM-ResPlat-DevOps-swift-improved-fopen
...
Improving fopen behaviour for Swift backend
2015-12-07 16:50:07 +01:00
453e1bf66e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 15:43:36 +00:00
780d80d7c3
The ajax code path unshares a link share when updating the password
...
In order to not mess up existing shares if the password gets verified we
should first fire this validation.
2015-12-07 16:38:49 +01:00
548a7f3c04
Adding a basic configuration for the mention bot
2015-12-07 16:35:20 +01:00
d38949f423
Update parent when moving share into recieved share
...
Fixes #20769
When I receive a share and move a share of myself into that share (which
is allowed currently) I effectively hand over ownership of the files I
move. So we need to update the share I move to have as a parent the
share I move it into. Else our mounting system gets confused.
2015-12-07 16:28:33 +01:00
e4c5bf790d
Merge pull request #20987 from owncloud/dont-deprecate-OC.filePath-master
...
OC.FilePath has still a valid use case when generating paths to stati…
2015-12-07 16:25:53 +01:00
3c0b584093
Merge pull request #20998 from owncloud/add-csp-header-to-static-resources
...
Add CSP header to static resources
2015-12-07 16:23:38 +01:00
663f31b127
Merge pull request #20993 from owncloud/issue-20666-language-always-overwritten
...
Do not overwrite the language when it's just missing for one app
2015-12-07 16:19:21 +01:00
96a83a783f
Add 'my groups' anchor to the personal page sidebar
2015-12-07 16:16:12 +01:00
eec4f82cf0
Dont set the string storage id to the numeric storage id for personal mounts
2015-12-07 16:15:37 +01:00
7b9bc721e9
Add CSP header to static resources
...
Fixes https://github.com/owncloud/core/issues/16164
2015-12-07 15:50:09 +01:00
87bc02c6cd
Allow specifying a custom reset-password-url
2015-12-07 15:41:40 +01:00
857030d139
Merge pull request #20988 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-12-07 15:17:38 +01:00
a9e5faf7d0
Merge pull request #20981 from owncloud/issue-19848-multiple-emails-for-sharelink
...
Allow sending a share email to multiple users
2015-12-07 15:17:19 +01:00
952f1f3e60
ensure multiselect always receives an array when setting its value, fixes #18734
2015-12-07 15:14:57 +01:00
f8f3c9ecf9
Remove password reset when the user can not change the password
2015-12-07 15:14:19 +01:00
57cd5209ca
Add rules for checked+disabled and disabled checkbox style
2015-12-07 14:57:03 +01:00
c6dbe8ac63
Do not overwrite the language when it's just missing for one app
2015-12-07 14:46:53 +01:00
97f9213da9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 12:05:27 +00:00
Thomas Müller
Lukas Reschke
Joas Schilling
Jenkins for ownCloud
Scrutinizer Auto-Fixer
Vincent Petry
Roeland Jago Douma
Patrick Robertson
Robin Appelman
Arthur Schiwon