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
1ce911d2f9
Merge pull request #19592 from owncloud/availability-root-always-exists
...
The root of a storage always exists
2015-10-29 14:14:56 +01:00
b840fc7c58
Merge pull request #20134 from owncloud/pass-with-skipping
...
Make Travis CI pass when DAV was not touched
2015-10-29 14:14:36 +01:00
054d4aeb89
Merge pull request #20141 from owncloud/checkboxes-settings-users
...
Apply new checkbox style in users settings
2015-10-29 14:14:15 +01:00
d2f0055af4
apply new checkbox style in users settings
2015-10-29 13:03:55 +01:00
9c9158e6b7
Fix icon update to be more consistent
...
Makes the details bar show the same icon as in the list.
2015-10-29 12:59:51 +01:00
675c6963ba
Merge pull request #20144 from owncloud/gitignore-clover.xml
...
ignore any clover.xml - which is generated by some phpunit calls
2015-10-29 12:35:38 +01:00
01d3393b7b
include the final update in the transaction when moving a folder in the cache
2015-10-29 12:34:49 +01:00
c35c498315
ignore any clover.xml - which is generated by some phpunit calls
2015-10-29 12:21:23 +01:00
530f7229e7
Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename
...
On rename, also refresh storage_mtime of the target file
2015-10-29 11:57:00 +01:00
c6f6a8758b
Drop OC_SubAdmin and replace usages
2015-10-29 11:31:18 +01:00
9ab44f1f00
Merge pull request #11509 from owncloud/internal_email_template
...
Allow separate templates for internal and external share notifications
2015-10-29 11:27:05 +01:00
7d96f82659
Merge pull request #19000 from UoM-ResPlat-DevOps/swift-squelch-expected-404-errors
...
Don't log expected Swift 404 responses in files_external
2015-10-29 11:26:24 +01:00
911613f711
Merge pull request #19100 from owncloud/ext-tooltip-unavailable
...
Display external storage status as tooltip
2015-10-29 11:25:52 +01:00
c7f409713e
Merge pull request #20140 from owncloud/provisioning_killappphp
...
Kill empty app.php in provisioning_api
2015-10-29 11:25:26 +01:00
33eb13e415
The root of a storage always exists
2015-10-29 11:21:50 +01:00
16e3f4de07
Kill empty app.php in provisioning_api
2015-10-29 11:08:39 +01:00
f000edb636
Merge pull request #19871 from owncloud/issue-19583-invalid-shares
...
Issue 19583 invalid shares
2015-10-29 10:43:50 +01:00
3dade2db77
Merge pull request #20120 from owncloud/sharee-list-view-tests
...
Add sharee list view js tests
2015-10-29 10:43:04 +01:00
Lukas Reschke
Thomas Müller
Vincent Petry
Robin Appelman
Jan-Christoph Borchardt
Morris Jobke
RealRancor
Jenkins for ownCloud
Hendrik Leppelsack
Sergio Bertolin
Robin Appelman
Joas Schilling