508c46a112
Merge branch 'master' into master
2015-12-08 21:02:52 +01:00
13993c4a6d
Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entry
...
passing an empty base in this diagnosis call will not result in LDAP…
2015-12-08 16:24:50 +01:00
0dd111ca2e
Merge pull request #21018 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-12-08 14:51:57 +01:00
49095fa4bb
Merge pull request #21031 from owncloud/sanitize-findAppInDirectories
...
Sanitize the appId passed to `findAppInDirectories`
2015-12-08 13:52:04 +01:00
45fe8271ab
Merge pull request #21030 from owncloud/querybuilder-new-features
...
Querybuilder new features
2015-12-08 13:51:45 +01:00
85409b6701
Merge pull request #20786 from owncloud/systemtags-dav
...
DAV endpoint for system tags
2015-12-08 13:51:25 +01:00
b91c9851a3
passing an empty base in this diagnosis call will not result in LDAP errors
...
Neither in "Invalid DN syntax" nor in "Object not found"
2015-12-08 12:32:02 +01:00
9f98849306
Add a method to the get "to use" table and column name
2015-12-08 11:04:28 +01:00
fe8dc0bd5e
Merge pull request #21022 from owncloud/get-rid-of-by-reference
...
Get rid of by reference
2015-12-08 11:04:25 +01:00
c88438790c
Merge pull request #20979 from owncloud/settings-groups-entry
...
Add 'my groups' anchor to the personal page sidebar
2015-12-08 11:04:09 +01:00
ae2287e255
Merge pull request #21025 from owncloud/remove-legacy-trusted-domain-support
...
Remove legacy repair steps + do not cast trusted domains
2015-12-08 11:03:33 +01:00
fd356eadc6
Merge pull request #20951 from owncloud/Make_showing_logs_optional
...
Controlled arguments for run script
2015-12-08 10:15:28 +01:00
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
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
548a7f3c04
Adding a basic configuration for the mention bot
2015-12-07 16:35:20 +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
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
mbi
Thomas Müller
Arthur Schiwon
Joas Schilling
Lukas Reschke
Jenkins for ownCloud
Scrutinizer Auto-Fixer
Vincent Petry
Patrick Robertson