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
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
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
a378dc5a7b
Fix scrollto= parameter in trashbin view
2015-11-02 10:31:06 +01:00
01adefaf50
Merge pull request #20181 from owncloud/files-fixdownloadspinner
...
Fix file action download spinner
2015-11-02 10:13:58 +01:00
b6ca23afe1
Merge pull request #20189 from owncloud/use-get-http-protocol
...
Use getHttpProtocol instead of $_SERVER
2015-11-02 10:13:41 +01:00
f04151f69b
Close the user menu when clicking it again
2015-11-02 10:09:13 +01:00
0a05b392ae
Merge branch 'master' into checkboxes-groups-enable
2015-11-02 13:43:55 +05:30
2afc14e195
[tx-robot] updated from transifex
2015-11-02 01:55:05 -05:00
2374a0df5d
[tx-robot] updated from transifex
2015-11-01 01:54:58 -04:00
7e2fe08778
new checkbox style in app settings
2015-10-31 17:07:07 +01:00
d7ed353814
[tx-robot] updated from transifex
2015-10-31 01:55:07 -04:00
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
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
61578a1042
Merge pull request #20193 from owncloud/redis-password
...
Add support for Redis password auth
2015-10-30 23:18:10 +01:00
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
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
16aa339475
add method to count users by loginname and use it for diagnose test, fixes #20151
2015-10-30 18:20:50 +01:00
bafb86fb9f
Use getHttpProtocol instead of $_SERVER
2015-10-30 18:05:30 +01:00
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
50b6a72cfd
Merge pull request #20169 from RealRancor/fix_contributing_links
...
Fix repo links in CONTRIBUTING.md
2015-10-30 15:30:41 +01:00
2d9d59def7
Merge pull request #20171 from owncloud/tags.js-remove-unneeded-vars
...
[tags] remove unneeded variables
2015-10-30 15:30:25 +01:00
27db39bd03
Merge pull request #20160 from owncloud/share-allowdeleteinshareoverview
...
Bring back delete permission in share overview
2015-10-30 15:30:05 +01:00
80cf4e84e3
Fix file action download spinner
2015-10-30 14:58:53 +01:00
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
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
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
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
a05ea0fb1e
remove unneeded icons from input fields to not distract from submit button, fix #18940
2015-10-30 11:11:37 +01:00
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
b32e6fbb62
[tags] remove unneeded variables
2015-10-30 10:02:15 +01:00
f46d531a4f
Replace some OC_Config calls with ILogger methods
2015-10-30 09:51:16 +01:00
df6d5f9c48
Fix repo links in CONTRIBUTING.md
2015-10-30 09:50:19 +01:00
a91572b7f3
Use proper statement to retrieve the IP of an docker instance
2015-10-30 09:28:33 +01:00
ef76998eda
Add warning for broken l10n json files
...
* makes it easier to spot broken l10n files
2015-10-30 09:10:16 +01:00
0c1a8c953a
Merge pull request #19680 from owncloud/ocs_sharing_api_integration_testing
...
[WIP] sharing feature tests
2015-10-30 08:57:26 +01:00
91b2cdc62b
[tx-robot] updated from transifex
2015-10-30 01:55:52 -04:00
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
dcfaf3afdc
Bring back delete permission in share overview
2015-10-29 17:56:54 +01:00
1e9abb4964
add tooltip to ldap server wizard
2015-10-29 17:44:46 +01:00
781bca2437
Fix everyone count for subadmins
...
Also moved the logic to the UsersController
2015-10-29 17:41:49 +01:00
fcc2a0c830
Upgrade behat to 3.0.x and use @BeforeScenario and @AfterScenario to clean up users
2015-10-29 17:10:52 +01:00
d11b69bfb9
added sharing feature file
...
added logic necessary for preconditions and postconditions of sharing tests
Added sharing by link tests and sharing with group
Added test which reproduces issue 19950 (adding expiration date)
refactored given and then statements to be preconditions and not operations
2015-10-29 17:10:49 +01:00
73d9699be9
Merge pull request #20135 from owncloud/check-if-null-subadmin
...
Drop OC_SubAdmin and replace usages
2015-10-29 17:07:45 +01:00
c30a68e2f8
Merge pull request #20060 from owncloud/cache-move-final-update-transaction
...
include the final update in the transaction when moving a folder in the cache
2015-10-29 16:45:59 +01:00
d7efb6d8b5
Merge pull request #20152 from owncloud/LukasReschke-patch-1
...
Remove invalid type-cast
2015-10-29 16:44:31 +01:00
860e31a333
dont trigger the scroll event of every single item we filter in the file list
2015-10-29 16:30:56 +01:00
774d069ff0
Merge pull request #20122 from owncloud/files-consolidateiconupdate
...
Fix icon update to be more consistent
2015-10-29 15:40:15 +01:00
a6f180f24e
Remove invalid type-cast
...
This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required.
Fixes https://github.com/owncloud/core/issues/20095
2015-10-29 15:19:02 +01:00
e3acc1243b
Revert "Specify PHP 5.4 as version for scrutinizer"
2015-10-29 14:30:14 +01:00
Thomas Müller
Joas Schilling
Raghu Nayyar
Jenkins for ownCloud
Hendrik Leppelsack
Lukas Reschke
Arthur Schiwon
Vincent Petry
Robin Appelman
Jan-Christoph Borchardt
Morris Jobke
RealRancor
Sergio Bertolin
Robin Appelman