Commit Graph

28229 Commits

Author SHA1 Message Date
Jenkins for ownCloud 82f3590fd0 [tx-robot] updated from transifex 2015-11-03 01:58:43 -05:00
Thomas Müller 0559b2092c Merge pull request #20232 from owncloud/error-button-color
fix button text color
2015-11-02 21:48:50 +01:00
Thomas Müller 1018d6115a Merge pull request #20045 from owncloud/dbal-2.5.2
Bump 3rdparty for dbal-2.5.2
2015-11-02 20:22:52 +01:00
Roeland Jago Douma 7ac8ce7aa0 Bump 3rdparty for dbal-2.5.2 2015-11-02 19:44:47 +01:00
Jan-Christoph Borchardt 0a8cefaeb1 fix button text color 2015-11-02 17:58:37 +01:00
Thomas Müller 620dc7ce22 Merge pull request #20196 from owncloud/use-actual-mimetype-detection-instead-of-oath
Use actual mimetype detection instead of extension
2015-11-02 17:36:13 +01:00
Raghu Nayyar 56b537271e Global Classes for Core.
Move up the global styles up the hierarchy.

Adds Clear Left, Right and both.

New CSS file for Global Styles.
2015-11-02 20:54:02 +05:30
Thomas Müller 44f4de1526 Merge pull request #20191 from owncloud/fix-20151
add method to count users by loginname and use it for diagnose test, …
2015-11-02 14:51:54 +01:00
Vincent Petry 52e213f026 Fix TagList namespace in property map 2015-11-02 14:19:01 +01:00
Thomas Müller 053effaa51 Merge pull request #20220 from owncloud/keep-search-open
Keep searchbox open if it is in action
2015-11-02 13:58:10 +01:00
blizzz 83d3c94590 Merge branch 'master' into fix-20151 2015-11-02 13:32:24 +01:00
Hendrik Leppelsack 9669a2be78 keep searchbox open if it is in action 2015-11-02 12:14:54 +01:00
Thomas Müller a8641fdc95 Merge pull request #20192 from owncloud/fix-20090
if a user that is flag as deleted shows up again, remove that flag. F…
2015-11-02 11:28:28 +01:00
Thomas Müller c5caebbd1f Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibn
Fix scrollto= parameter in trashbin view
2015-11-02 11:27:49 +01:00
Thomas Müller be5552981a Merge pull request #20215 from owncloud/issue-20178-close-user-menu-on-reclick
Close the user menu when clicking it again
2015-11-02 11:27:29 +01:00
Joas Schilling a378dc5a7b Fix scrollto= parameter in trashbin view 2015-11-02 10:31:06 +01:00
Thomas Müller 01adefaf50 Merge pull request #20181 from owncloud/files-fixdownloadspinner
Fix file action download spinner
2015-11-02 10:13:58 +01:00
Thomas Müller b6ca23afe1 Merge pull request #20189 from owncloud/use-get-http-protocol
Use getHttpProtocol instead of $_SERVER
2015-11-02 10:13:41 +01:00
Joas Schilling f04151f69b Close the user menu when clicking it again 2015-11-02 10:09:13 +01:00
Raghu Nayyar 0a05b392ae Merge branch 'master' into checkboxes-groups-enable 2015-11-02 13:43:55 +05:30
Jenkins for ownCloud 2afc14e195 [tx-robot] updated from transifex 2015-11-02 01:55:05 -05:00
Jenkins for ownCloud 2374a0df5d [tx-robot] updated from transifex 2015-11-01 01:54:58 -04:00
Hendrik Leppelsack 7e2fe08778 new checkbox style in app settings 2015-10-31 17:07:07 +01:00
Jenkins for ownCloud d7ed353814 [tx-robot] updated from transifex 2015-10-31 01:55:07 -04:00
Lukas Reschke 40ae54d60a Use actual mimetype detection instead of extension
We cannot rely on the extension as the file may also be a valid TAR or ZIP file without such content. Especially when getting resources from the ownCloud appstore.
2015-10-31 00:55:37 +01:00
Thomas Müller d4af369e60 Merge pull request #19940 from owncloud/ldap-server-wizard-tooltip
Add tooltip to ldap server wizard
2015-10-31 00:43:30 +01:00
Thomas Müller 61578a1042 Merge pull request #20193 from owncloud/redis-password
Add support for Redis password auth
2015-10-30 23:18:10 +01:00
Lukas Reschke 78cad94ff4 Add support for Redis password auth
For enhanced security it is recommended to configure Redis to only accept connections with a password. (http://redis.io/topics/security)

This is especially critical since Redis supports the LUA scripting language and thus a simple SSRF vulnerability (as proven in http://benmmurphy.github.io/blog/2015/06/04/redis-eval-lua-sandbox-escape/ for example) may lead to a remote code execution.
2015-10-30 20:19:23 +01:00
Arthur Schiwon a2f2ffb8db if a user that is flag as deleted shows up again, remove that flag. Fixes #20090 2015-10-30 19:20:42 +01:00
Arthur Schiwon 16aa339475 add method to count users by loginname and use it for diagnose test, fixes #20151 2015-10-30 18:20:50 +01:00
Lukas Reschke bafb86fb9f Use getHttpProtocol instead of $_SERVER 2015-10-30 18:05:30 +01:00
Thomas Müller 6911d8f0a4 Merge pull request #20175 from owncloud/login-arrow
remove unneeded icons from input fields to not distract from submit button, fix #18940
2015-10-30 15:56:13 +01:00
Thomas Müller 50b6a72cfd Merge pull request #20169 from RealRancor/fix_contributing_links
Fix repo links in CONTRIBUTING.md
2015-10-30 15:30:41 +01:00
Thomas Müller 2d9d59def7 Merge pull request #20171 from owncloud/tags.js-remove-unneeded-vars
[tags] remove unneeded variables
2015-10-30 15:30:25 +01:00
Thomas Müller 27db39bd03 Merge pull request #20160 from owncloud/share-allowdeleteinshareoverview
Bring back delete permission in share overview
2015-10-30 15:30:05 +01:00
Vincent Petry 80cf4e84e3 Fix file action download spinner 2015-10-30 14:58:53 +01:00
Thomas Müller b7f0524f2f Merge pull request #20167 from owncloud/fix-docker-ip-retrieval
Use proper statement to retrieve the IP of an docker instance
2015-10-30 13:57:03 +01:00
Thomas Müller c041176dc1 Merge pull request #20170 from owncloud/remove-some-oc_config-calls
Replace some OC_Config calls with ILogger methods
2015-10-30 13:55:52 +01:00
Robin Appelman 3c01386a50 Merge pull request #20156 from owncloud/files-filter-triger-once
dont trigger the scroll event of every single item we filter in the file list
2015-10-30 12:52:04 +01:00
Thomas Müller 2e5c1f3c8f Merge pull request #20149 from owncloud/revert-19797-specify-php-5-4
Revert "Specify PHP 5.4 as version for scrutinizer"
2015-10-30 11:46:30 +01:00
Jan-Christoph Borchardt a05ea0fb1e remove unneeded icons from input fields to not distract from submit button, fix #18940 2015-10-30 11:11:37 +01:00
Thomas Müller d0364194fd Merge pull request #20166 from owncloud/error-message-l10n-failure
Add warning for broken l10n json files
2015-10-30 10:51:50 +01:00
Morris Jobke b32e6fbb62 [tags] remove unneeded variables 2015-10-30 10:02:15 +01:00
Morris Jobke f46d531a4f Replace some OC_Config calls with ILogger methods 2015-10-30 09:51:16 +01:00
RealRancor df6d5f9c48 Fix repo links in CONTRIBUTING.md 2015-10-30 09:50:19 +01:00
Morris Jobke a91572b7f3 Use proper statement to retrieve the IP of an docker instance 2015-10-30 09:28:33 +01:00
Morris Jobke ef76998eda Add warning for broken l10n json files
* makes it easier to spot broken l10n files
2015-10-30 09:10:16 +01:00
Thomas Müller 0c1a8c953a Merge pull request #19680 from owncloud/ocs_sharing_api_integration_testing
[WIP] sharing feature tests
2015-10-30 08:57:26 +01:00
Jenkins for ownCloud 91b2cdc62b [tx-robot] updated from transifex 2015-10-30 01:55:52 -04:00
Thomas Müller 17dc482e8f Merge pull request #20051 from otetard/feature/newfilemenu_extend
Allow Owncloud apps to add new items to the “new” file menu.
2015-10-29 23:49:57 +01:00