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
7b9bc721e9
Add CSP header to static resources
...
Fixes https://github.com/owncloud/core/issues/16164
2015-12-07 15:50:09 +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
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
9c550a07ed
OC.FilePath has still a valid use case when generating paths to static files what for generateUrl cannot be used for - closes #15604
2015-12-07 12:23:42 +01:00
820c3b852d
Add a unit test for single user case as well
2015-12-07 12:01:02 +01:00
5b87413792
Allow sending a share email to multiple users
2015-12-07 10:49:34 +01:00
e44b164f40
Merge pull request #20569 from owncloud/issue_20427
...
Show external storage status in file list + prompt credentials if different
2015-12-07 10:27:35 +01:00
22843fc6e3
Merge pull request #20796 from owncloud/cleanup-trashbin-code
...
Cleanup trashbin expire code
2015-12-07 10:24:09 +01:00
00b592f2a6
Merge pull request #20581 from owncloud/public-page-preview-hidpi-scale
...
Fix hidpi previews on public page
2015-12-07 10:23:58 +01:00
cd6bc79c40
Merge pull request #20530 from owncloud/icons-more
...
add icons for disabled checkbox, radio button, error and colored checkmark
2015-12-07 10:22:49 +01:00
30bd915c0e
Merge pull request #20480 from owncloud/css-prefixes
...
CSS prefixes
2015-12-07 10:21:35 +01:00
764b2932ff
Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContent
...
Remove OC_Util::getUrlContent and replace by proper usage of public i…
2015-12-07 10:21:16 +01:00
f3d49a89fe
Merge pull request #11131 from owncloud/use-phpini-wrapper
...
Replacing ini_get instances with inigetwrapper usages
2015-12-07 10:20:59 +01:00
0c3d97921f
Merge pull request #20904 from owncloud/view-mime-filter
...
Fix mimetype filter in getDirectoryContent
2015-12-07 10:20:43 +01:00
35ab7f0e64
Improving fopen behaviour for Swift backend
2015-12-07 10:20:09 +01:00
e1f2965e54
Merge pull request #20949 from owncloud/fix_20892
...
[Sharing] Properly check if a group already has access
2015-12-07 10:20:05 +01:00
085f3f58fa
Merge pull request #20954 from owncloud/settings_user_only_load_avatar_if_available
...
Settings user only load avatar if available
2015-12-07 10:19:38 +01:00
c1fb9fa483
Merge pull request #20957 from owncloud/use-correct-method-signature
...
Use correct method signature
2015-12-07 10:18:03 +01:00
c9069d5711
Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntry
...
Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
2015-12-07 10:17:44 +01:00
884946276e
[tx-robot] updated from transifex
2015-12-07 01:54:35 -05:00
d14f128329
[tx-robot] updated from transifex
2015-12-06 01:54:33 -05:00
f0b1ba713d
[tx-robot] updated from transifex
2015-12-05 01:55:14 -05:00
4548a0aa90
Remove OC_Util::getUrlContent and replace by proper usage of public interfaces
2015-12-04 18:02:47 +01:00
46a6c6d70b
remove OC_App::getActiveNavigationEntry - not unsed anymore
2015-12-04 17:26:28 +01:00
e6d4496fc2
Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
2015-12-04 17:23:51 +01:00
d522797227
Use correct method signature
...
This function takes only one parameter
2015-12-04 15:52:42 +01:00
8c9a3ccefc
Do not request an avatar if there is none
2015-12-04 14:56:49 +01:00
a619629ac0
Only try to load avatars in the user list if there is any
2015-12-04 14:56:49 +01:00
e91eba4b5b
Merge pull request #20370 from owncloud/external-db-config
...
Move files_external mount config to the database
2015-12-04 14:42:50 +01:00
a1898dc2bf
db config backend for files_external
2015-12-04 13:48:21 +01:00
98bb8372f7
Merge pull request #20947 from owncloud/delete-users-from-system-addressbook
...
Delete no longer existing users from system addressbook
2015-12-04 13:44:40 +01:00
5750a85e84
Merge pull request #20946 from robinkanters/patch-1
...
Fixed small typo in README
2015-12-04 12:26:19 +01:00
11d8b336e2
[Sharing] Properly check if a group already has access
...
The old code check was to liberal resulting in wrong matches if a user
with the same name as the group already had access.
Fixes 20892
2015-12-04 12:22:21 +01:00
Thomas Müller
Lukas Reschke
Vincent Petry
Scrutinizer Auto-Fixer
Joas Schilling
Tim Dettrick
Jenkins for ownCloud
Morris Jobke
Roeland Jago Douma
Robin Appelman