Skip to content
This repository was archived by the owner on Mar 17, 2020. It is now read-only.

Conversation

zero-24
Copy link
Member

@zero-24 zero-24 commented Feb 21, 2017

Pull Request for Issue # .

Summary of Changes

$ git remote -v
cms     git@github.com:joomla/joomla-cms.git (fetch)
cms     git@github.com:joomla/joomla-cms.git (push)

git pull cms staging

// Merge conflicts for
- tests/changelog -> deleted
- readme.md -> replaced with original from this repo
- .travis.yml -> replaced with original from this repo 

git commit -am 'merge conflicts'

Sync to staging

Testing Instructions

Sync to staging

Documentation Changes Required

None

infograf768 and others added 30 commits January 20, 2017 15:10
…rl paths absolute (#11266)

* Fix SEF plugin some times breaking HTML while trying to make inline background url paths absolute

* Added handling of " and '

* Code style, fix too long line

* Removed redudant pipe character

* Update sef.php
* Properly merge tag params

* Fixing a typo and yet another bug (wrong parameter read)
* Clean up JControllerForm

* Clean up JModelAdmin

* Clean up JModelList class
* Deprecate PSR-0 class loading

* Fix typo

* Add PSR4 support, not just the deprecated message

* Fix deploy version

* Throwing exceptions when invalid type is passed

* Return type specific namespaces

* Fix the test errors

* Travis

* Please travis be nice to me

* Last try otherwise I go to the bar

* Small tweaks

* Update loader.php
* Leave numeric field empty if not required and not set

* Numeric field might be empty if not required

* Allow empty value if field is not required

* Test adapted to code change

Due to the code change in `libraries/joomla/form/fields/number.php` (set field value to the minimum value only if the field is required and a minimum value is given and there is no value given) the "Min" test needs a change, moreover a new test "MinRequired" wit the former result of the "Min" test was introduced.

* Forgot to change the expected result

The code `required aria-required="true"` was missing in the expected result - added.

* Replace "and" with "&&"

* Replace "and" with "&&"

* Replace "and" with "&&"

* use type=number for port fields in configuration

* Added clean line before the if

* smtpport field: hint added

* LDAP port field: hint added
* Remove unneeded fields from com_fields

* Remove columns from installation
* [com_newsfeed] - "Filter field" parameter in "List News Feeds in a Category" 

fix "Filter field" parameter in "List News Feeds in a Category"  behaviour

* fix for filter fields and table headings 1/3

fix for filter fields and table headings 1/3

* fix filter fields and table headings 2/3

fix for filter fields and table headings

* fix for filter fields and table headings 3/3

fix for filter fields and table headings 3/3

* removed 2nd layout

removed 2nd layout as requested

* removed 2nd layout

removed 2nd layout
csthomas and others added 27 commits February 18, 2017 17:26
* alpha order com_users.ini

* thnaks @infograf768
… (#14113)

* Add missing defaults in contact_details table for sqlsrv

* Sync contact_details table accross all databases, add default
Pull Request for Issue #14148 .

Testing Instructions

Easy fix
Test on code review

(sorry, I didn't succeded to commit the 3 in one PR directly from GitHub 😮 )
Pull Request for Issue #14148 .

### Testing Instructions

Easy fix
Test on code review
Following the issue #14148

Easy fix
Test on code review
…10 categories. (#14094)

* Category selection. disable_search_threshold to 0

* just one space to much ;)
* Update user.php

* Update en-GB.com_users.ini

* Prevent notice

Fix notice Undefined index: groups in E:\www\cms\administrator\components\com_users\models\user.php on line 208 when administrator update his own account

* Sorry, wrong logic

* Remove unnecessary nested if

* Add full stop as suggested. Thanks @tonypartridge
@zero-24
Copy link
Member Author

zero-24 commented Feb 21, 2017

ERROR: Call to undefined method joomla_projects\robo\WaitForSeleniumStandaloneServer::getOutput() looks like another error / Problem?

@810 810 merged commit ba70164 into joomla-projects:staging Feb 21, 2017
@zero-24 zero-24 deleted the 370 branch February 21, 2017 19:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.