Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Proposal] Code standards change for more readability #13438

Closed
frankmayer opened this issue Dec 31, 2016 · 15 comments
Closed

[Proposal] Code standards change for more readability #13438

frankmayer opened this issue Dec 31, 2016 · 15 comments

Comments

@frankmayer
Copy link
Contributor

frankmayer commented Dec 31, 2016

Subject of proposal

I propose a change to code standards, concerning specific cases. This is intentionally posted here and not in the code standards repo, as I believe it will gain more attention and comments, here.

The changes affect:

Why

It improves readability when either the implements or method arguments are many or the declaration in general is long.
Conforming to the current standard for method arguments, a method looks like this:

	public static function getContentLanguages($checkPublished = true, $checkInstalled = true, $pivot = 'lang_code', $orderField = null,
		$orderDirection = null)
	{

The same code is more readable like this:

	public static function getContentLanguages(
		$checkPublished = true,
		$checkInstalled = true,
		$pivot = 'lang_code',
		$orderField = null,
		$orderDirection = null
	){

Thank you for your comments and Happy New Year everybody! 🎆

@mbabker
Copy link
Contributor

mbabker commented Dec 31, 2016

I'm all for it personally.

@jeckodevelopment
Copy link
Member

in favour

@PhilETaylor

This comment was marked as abuse.

@chrisdavenport
Copy link
Contributor

If you have a method signature that requires splitting across multiple lines then I would consider it a code smell and you should fix the underlying problem rather than try to make it look pretty.

@frankmayer
Copy link
Contributor Author

@PhilETaylor That's a valid argument, but what about people that don't have such IDE's. Or if on the road with a tablet or a phone and wanting to do some urgent necessary changes? ...just throwing some edge cases in here for the sake of argument.
@chrisdavenport Agreed, but let's make them pretty first, to be easier to read and then work on code smell. The work to reduce code smell is a much tougher job in most cases. Let's try to make things better in steps. Cannot magically clean up the code base in on go. ;)

@PhilETaylor

This comment was marked as abuse.

@mbabker
Copy link
Contributor

mbabker commented Jan 1, 2017

I hate it. This is why you invest in a decent IDE that makes it easier to view method signatures.

By that argument arbitrary line length rules are pointless too (like our 150 character max that has zero flexibility at all)

If you have a method signature that requires splitting across multiple lines then I would consider it a code smell and you should fix the underlying problem rather than try to make it look pretty.

Yes and no. You could probably refactor to use an array holding all of the arguments, but personally I consider THAT a code smell over lengthy method signatures (you no longer have a properly declared signature, it's for all intents and purposes a magical black box). Any way you spin it though, the intent here is for readable code and right now the way our multi-line method signatures split is not very readable. This is more of a convenience thing in the long run anyway (same as aligning => in multi-line arrays or the equals sign when you have variable assignments in a row).

As for the IDE argument, IMO it is unfair to state that all code changes must be made in a fully functional development environment which includes an IDE tuned to that environment. In Joomla there are a lot of contributors who by your claims aren't "professional developers" because they use the GitHub web interface to make their contributions, does that make what they offer less valid than a change proposed by you or me?

@PhilETaylor

This comment was marked as abuse.

@Bakual
Copy link
Contributor

Bakual commented Jan 1, 2017

It's still a good length because noody likes to read texts across the whole screen width :)

As for the multiline arguments, I don't care either way. However anything we do, should be supported by IDEs like PHPStorm so we don't have to manually adjust it each time.

@frankmayer
Copy link
Contributor Author

The multi-line method arguments are supported by PHPStorm. The example above was formatted with PHPStorm 2016.3.2.

However PHPStorm currently has an issue with implements/extends, which is reported here: https://youtrack.jetbrains.com/issue/WI-24143 . So I guess, this might be a show-stopper for the multiline implements. Pls vote for it, if you're interested.

There is also an issue for PHPDoc formatting and the multiple spaces in between the tag parameters. If enough Joomla PHPStorm users vote for that, they might implement it faster... https://youtrack.jetbrains.com/issue/WI-24129

I don't know about the other editors. Anyone?

@photodude
Copy link
Contributor

photodude commented Jan 2, 2017

I believe this kind of multiline alignment can be "automatically fixed with PHPCS 2.x if we decide to make a change to the Joomla code standards. (Check out the current PHPCS 2/3 version of the code standards check with auto fixers https://github.com/joomla/coding-standards/)

@frankmayer
Copy link
Contributor Author

@photodude That would be great! Lets see how it goes.

@tonypartridge
Copy link
Contributor

I find this a bit of an awkward one. I agree with @PhilETaylor and personally use phpStorm it does a fantastic job of rendering the functions and making them readable. Also multiple lines means less code to fill the whole screen, so you are focusing on a tall but narrow screen with the above implementation, whereas most screens these days are widescreen which the exception of macs which tend to provide an exceptional amount of extra working space are the opposite way of this implementation. Therefore more code is in your view area which makes it easier to understand at a glance.

Even without an IDE you should be able to set your editor to highlight variables which make them stand out at a glance.

So I am therefore against this.

@mbabker
Copy link
Contributor

mbabker commented Jan 3, 2017

If you focus solely on an IDE environment, then honestly a lot of the code style rules don't apply. Remember though, the code doesn't only exist in the IDE. It is browsed here on GitHub, edited here on GitHub and through other "non-professional" tools, and if I had configured the phpDocumentor job to do so the code could also be visible inline on the API documentation site.

I don't think there's anything wrong with disagreeing with the idea, but personally, I disagree with the notion that the code should only be formatted to be consumed in an IDE. It's about it being consistently reviewable regardless of the environment. I can participate in code reviews on a mobile device while traveling when looking at a well formatted code base, this particular change makes that experience a little easier (and ya that might be an edge case but it goes to demonstrate there is more to the code than whether or not you can drop it in PhpStorm, Eclipse, or Sublime and the tooling makes everything pretty and usable).

zero-24 pushed a commit that referenced this issue Jan 3, 2017
This issue was highlighted in @phpstorm when researching #13438 :-) (Then to add to the irony I used Github to edit the file haha)
dneukirchen added a commit to joomla-projects/media-manager-improvement that referenced this issue Feb 12, 2017
commit 612f6a4505f7fe23d82049447f89c02ab3fb71a9
Merge: 4077cd0 3833aa0
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Sat Jan 28 14:54:11 2017 +0000

    Merge branch 'staging' into milestone1

commit 3833aa0671bd056f8e3c4690c3b0e44b7a1e7f25
Author: marrouchi <marrouchi.mohamed@gmail.com>
Date:   Sat Jan 28 11:41:34 2017 +0100

    [Improvement] Backend menu item edit form : Add Itemid to the alias link value (#13776)

    * Add Itemid to the alias link value

    The link field of an alias menu item displays "index.php?Item=" without the actual item id.

    * Remove extra white space

    * CodeSniffer fix : Blank line before new comment

commit 3d3e2d6ca722c1169484460c01091aec1f2b7dcc
Author: Luca Marzo <luca.marzo@live.com>
Date:   Fri Jan 27 22:26:18 2017 +0100

    3.8.x description proposal (#13782)

    I tried to change the wording about the 3.8.x branch.

commit 6f20a8c2d633fa8bd7b1f68fb8d008497ff88082
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Fri Jan 27 22:12:37 2017 +0100

    Remove from global option for the display functionality (#13773)

commit 7dc3d68365a07cdec8c29bf08fdc3ec1298c8606
Merge: 7c1cc9d 14c6fcb
Author: Luca Marzo <luca.marzo@live.com>
Date:   Fri Jan 27 20:55:51 2017 +0100

    Merge pull request #13758 from rdeutz/move_checkout_to_helper

    [com_associations] moved "checked out" check to a helper function

commit 7c1cc9d24a01c72f3e2db8883e0eac4739ba9810
Author: Ciaran Walsh <ciaran@joomla51.com>
Date:   Fri Jan 27 18:29:13 2017 +0000

    [com_fields] Responsive subform.repeatable-table (#13769)

    * Responsive table subforms

    * RTL support

    * Wrap in media query

    * Final tweaks

    * Query fix

commit 67a60716044106310d86d4b5244c58473b6a04f2
Author: Tomasz Narloch <csthomas@users.noreply.github.com>
Date:   Fri Jan 27 19:28:23 2017 +0100

    Remove semicolon before UNION ALL (#13767)

commit 6be6bd64c907d2b89ea1c6daaa8b0ca29dd7de66
Author: Peter van Westen <info@regularlabs.com>
Date:   Fri Jan 27 19:27:36 2017 +0100

    Fixes: EXTRA_QUERY not added to update record (#13756)

commit 959fc6b1487fa335cb04c7b54e3864e168960118
Author: Roberto Segura <roberto@phproberto.com>
Date:   Fri Jan 27 19:26:47 2017 +0100

    [fix] using core categories system should not be mandatory to use core tag system (#13737)

commit 2d82f4cc2d2577aa42e1e2cbd85c96cb083010c3
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Fri Jan 27 19:24:41 2017 +0100

    Add a parameter to trigger the additional plugin events in the news module (#13703)

commit 2a859660c9718548691ddfb56dd41d212d9c5be1
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Fri Jan 27 19:23:32 2017 +0100

    Add "id" attribute to <input> element (#13610)

commit 1b036c6f7bc4e57ad362ae988ce18ac0b778d8f2
Author: Tomasz Narloch <csthomas@users.noreply.github.com>
Date:   Fri Jan 27 19:22:40 2017 +0100

    Speed up of saving new articles (#13505)

    * Fast table reorder for mysql, postgresql, mssql and sqlite

    * Two versions of selectRowNumber for postgreSQL

commit 7f402748ca66b213cf10f4aabd329696d5b3443f
Author: zero-24 <zero-24@users.noreply.github.com>
Date:   Fri Jan 27 19:21:44 2017 +0100

    [com_fields] Custom Fields Media Field if class is empty still class is shown as attribute (#13462)

    * fixes #13400 dont let the class tag alone if no class is set

    * Update imagelist.php

    * Update media.php

    * Update imagelist.php

    * Update imagelist.php

    * Update media.php

    * Update media.php

    * Update imagelist.php

commit bc9dcd36e6228ddca395e02ef553a202b2e21433
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Fri Jan 27 18:18:38 2017 +0000

    [com_contact] review config global default options (#12970)

    * config.xml

    * Update joomla.sql

    * Update joomla.sql

    * Update joomla.sql

    * sincronize with staging

    * fix conflicts

    * fix show_user_custom_fields

commit a3194fa5985575dc517a8d0ff7d2a80c99f15ba6
Author: Tomasz Narloch <csthomas@users.noreply.github.com>
Date:   Fri Jan 27 19:17:44 2017 +0100

    3.7 Improve Cache Controller (#12312)

    * Improve Cache Controller

    * PHPCS fix

commit d7eb53581f616a843fb194c88cfddc2d2ea6a3c7
Author: Tomasz Narloch <csthomas@users.noreply.github.com>
Date:   Fri Jan 27 19:17:13 2017 +0100

    Fix item alias (#11343)

commit d525244dc030dd9dc3cb6c1f703e91eccabf2c63
Author: Klas <klas.berlic@gmail.com>
Date:   Fri Jan 27 14:18:59 2017 +0100

    JUserTest needs to clear JAccess stats for allowed test. ALso JUserTest::testGetGroupsByUser() has expected and actual reversed. (#13777)

commit 14c6fcbf365d0d06d2d75950ba333b287befeed2
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Fri Jan 27 11:21:46 2017 +0100

    fix for checked out items

    If the item at the left is checked out nothing can be done till the item is checked in

commit 5104562e13195562072caac980b0d167e534d29c
Merge: 12257e5 c421382
Author: Luca Marzo <luca.marzo@live.com>
Date:   Thu Jan 26 23:37:06 2017 +0100

    Merge pull request #13759 from Bakual/SQLNotSql

    [com_fields] SQL not Sql

commit 12257e51f9993c6f93167facdaab9790468ecb32
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Thu Jan 26 13:29:43 2017 +0100

    [com_fields] Load language files from components (#13745)

    * Load language files from components

    * Add JPath::clean()

commit e0fbf61c6cd4def712dfbd744d4b104b18bf658e
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Thu Jan 26 13:24:19 2017 +0100

    [com_fields] Default the gallery directory when empty (#13761)

    * Default the gallery directory when empty

    * Fix comment

commit 61189b3188474314761894086a13ef242ebb5efa
Author: infograf768 <infografjms@gmail.com>
Date:   Thu Jan 26 09:48:46 2017 +0100

    [com_associations] Display only site menu types on searchTools (#13763)

    merged on review

commit 8f567003c6c4e72a749882628a60a6994949bd05
Author: Izhar Aazmi <izharaazmi@gmail.com>
Date:   Thu Jan 26 13:28:12 2017 +0530

    Give protected menu items container its own place independent of heading type. (#13749)

    * Give protected menu items container its own place independent of heading type.

    * Added missed client id check for container menu type.

commit c4213828398502f66979290fdff3e4feacc0622d
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Wed Jan 25 22:51:16 2017 +0100

    SQL not Sql

commit 6e67ba17183e165fe126bc0863518bb9b36d154b
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Wed Jan 25 22:02:37 2017 +0100

    moved checked our check to a helper function for less gussing

commit f04e15c8c48e272d5cfbd6d0ec19abd7d13afc5b
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Wed Jan 25 18:05:28 2017 +0100

    Remove unneded properties for fields render layout (#13750)

commit b455cf6dd3ae8b69f89a29af295475f0332654bd
Author: Ciaran Walsh <ciaran@joomla51.com>
Date:   Wed Jan 25 12:13:57 2017 +0000

    Remove max-width on login lang field (#13740)

commit dc7e6157b23feea20d8453562a35d3f65fcfe18a
Author: Izhar Aazmi <izharaazmi@gmail.com>
Date:   Wed Jan 25 13:04:01 2017 +0530

    Fixed issue - backend menu manager checks for important menu items in top level only (#13650)

commit 23704123a22ed6aee5536777f7beb0e7653c74e9
Author: infograf768 <infografjms@gmail.com>
Date:   Wed Jan 25 08:33:37 2017 +0100

    [com_fields] Improving fields dropdown for Translation (#13710)

commit 4635900088efcd3b78640d5fbabb0588d22aa3e2
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Tue Jan 24 13:39:14 2017 +0000

    Revert previous commit

commit 7c25d368c8fdb905798d607263bdb5f23def7cb1
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Tue Jan 24 13:38:56 2017 +0000

    legacy libs

commit d151ef4ce7cb68898bc56eb25d8e888647aea9a9
Author: Nicola Galgano <optimus4joomla@gmail.com>
Date:   Tue Jan 24 09:18:20 2017 +0100

    [com_newsfeeds] - "Filter field"  in News Feeds - list layout (#11899)

    * [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

commit 8b0b5129381de26c69f5a01daa3fd0bf9d9a54a2
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Mon Jan 23 22:47:54 2017 +0100

    fix for a failing install (#13727)

commit c437fce02ce86a8506369208b767593125445907
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Mon Jan 23 19:56:53 2017 +0100

    [com_fields] Remove unneeded fields from com_fields (#13621)

    * Remove unneeded fields from com_fields

    * Remove columns from installation

commit 57277287cef077b694d02eaf28eaba6fc36c3ce5
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Mon Jan 23 18:27:49 2017 +0000

    Use bootstrap tooltips (#13713)

commit 465ff03b6ebfba189fe8992addd295064a7b5ca6
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Mon Jan 23 13:51:45 2017 +0100

    Another typo

    Thanks @brianteeman

commit e83ac894b290c6dc4a640dd7ebc2147b7d3f2139
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Mon Jan 23 13:34:55 2017 +0100

    Typo in CONTRIBUTING.md

commit 6e6edfcc01d3eba29022c3a63125038072fb5151
Author: zero-24 <zero-24@users.noreply.github.com>
Date:   Mon Jan 23 11:48:10 2017 +0100

    Adding the 3.8.x branche with the definitions by @wilsonge

commit 0e4b98fa9f21de6ed1c3d03a744b9985d1ba708a
Author: jo-sf <jo-sf@users.noreply.github.com>
Date:   Mon Jan 23 10:10:03 2017 +0100

    Always save validated data in the session (#11491)

commit 91e6de5195e208e5105d65b898c4da90a43fdf1e
Author: jo-sf <jo-sf@users.noreply.github.com>
Date:   Sun Jan 22 15:58:32 2017 +0100

    Use type="number" in TCP port configuration fields (#11492)

    * 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

commit f3dc74bd349e4142e15684bb5600bd1258132f03
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Sun Jan 22 15:57:17 2017 +0100

    Changes the contact user groups form field to fieldgroups (#13607)

commit 293d57e531af7b04c561ed0e45875fa4e7f7e912
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Sun Jan 22 15:53:39 2017 +0100

    Fixing ACL inheritance for fields and fieldgroups (#13676)

commit af71e6036e719c2dff7940095fe15d1c2c0affec
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Sun Jan 22 15:52:58 2017 +0100

    Adding proper disabled and readonly properties to the color formfield layouts (#13677)

commit 4370ef7bd630fa88f05bcbce3a1db65265da3f4c
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Sun Jan 22 13:50:26 2017 +0000

    fix IE 11 error (#13685)

commit f38dfcbcfc4174cebb88908e7645b62337a49ff4
Merge: 81127c3 f0d9270
Author: wilsonge <georgejameswilson@googlemail.com>
Date:   Sun Jan 22 11:41:16 2017 +0000

    Merge branch 'staging' of github.com:joomla/joomla-cms into staging

commit f0d927051091a6725cc6bfe1e3b5ba13b81b8b4c
Author: zero-24 <zero-24@users.noreply.github.com>
Date:   Sun Jan 22 12:41:06 2017 +0100

    Fix CS issues introduced with https://github.com/joomla/joomla-cms/pull/13672

commit 81127c3bcdb7b035a1f02c49932c4154b9be8583
Merge: 7d34d41 4d44c25
Author: wilsonge <georgejameswilson@googlemail.com>
Date:   Sun Jan 22 11:41:03 2017 +0000

    Merge branch '3.7.x' into staging

commit baef935fa1cf872091f7b708cf87682462749a79
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Sun Jan 22 12:33:45 2017 +0100

    Deprecate PSR-0 class loading (#13672)

    * 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

commit 6efb945b964850e8f15a6d10db86771bfc5d4b41
Author: Martijn Maandag <martijn@reisverslagen.net>
Date:   Sun Jan 22 11:43:51 2017 +0100

    Update en-GB.com_languages.sys.ini (#13681)

commit f81a1ee697447953e1c25e25b7e9148f0ee30cbd
Author: Tuan Pham Ngoc <github@joomdonation.com>
Date:   Sun Jan 22 17:24:08 2017 +0700

    Clean up legacy controller + model classes (#13679)

    * Clean up JControllerForm

    * Clean up JModelAdmin

    * Clean up JModelList class

commit b222a8dcdacb38efd16968137db49583b965f508
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Sat Jan 21 20:08:59 2017 +0100

    Properly merge tag params (#13643)

    * Properly merge tag params

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

commit 7d34d41223bfe41799cd2c08b339e3c382a400d6
Author: Georgios Papadakis <ggppdk@users.noreply.github.com>
Date:   Fri Jan 20 22:24:15 2017 +0200

    Fix SEF plugin breaking HTML while trying to make inline background url paths absolute (#11266)

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

    * Added handling of &#34; and &#39;

    * Code style, fix too long line

    * Removed redudant pipe character

    * Update sef.php

commit 339eb9afbc272efa599d379d2c842c66a6519525
Author: infograf768 <infografjms@gmail.com>
Date:   Fri Jan 20 15:10:29 2017 +0100

    [com_fields] Useless strings (#13659)

commit 483abb81381907aadb3834a1d55c7eb41e27f6d7
Author: Tuan Pham Ngoc <github@joomdonation.com>
Date:   Fri Jan 20 17:25:27 2017 +0700

    Clean up JControllerAdmin (#13635)

commit f2d72e5f3a85e7601274df8e938c8b354d43a47b
Author: infograf768 <infografjms@gmail.com>
Date:   Fri Jan 20 11:17:04 2017 +0100

    Correcting Notice when saving Global Configuration (#13612)

    * Correcting Notice

    * simplifying. thanks joomladonation

commit b4b08b2e3a17998b7266c3331f5038d3dc6d2d1b
Author: zero-24 <zero-24@users.noreply.github.com>
Date:   Wed Jan 18 21:49:32 2017 +0100

    Fix dev status and move it from beta to dev as we are currently in the dev mode for the beta release

commit cdeee8bf59a2bc858799b2a8489eaeebcff9732b
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Wed Jan 18 21:29:06 2017 +0100

    bump version for development

commit 71a1c5ec9c13bf6b6c98acd973c8324f0c3e9487
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Wed Jan 18 20:25:12 2017 +0100

    prepare 3.7.0-alpha2 release

commit c9f4ce5d30e2b0d34dae39f5b21d854400eb06fb
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Wed Jan 18 15:24:44 2017 +0100

    update for menu (#13619)

commit a9f872e543bb549d429805007e7f11894a726362
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Wed Jan 18 15:22:26 2017 +0100

    [com_fields] Inherit url scheme restriction from fields plugin (#13554)

    * Type safe null check for plugin inheritance parameter

    * Remove default scheme to allow any valid scheme

    * Revert changes from conflict

commit 382766735c251377185352b8955acbd15c047bf7
Author: Jelle Kok <schumacher1986@hotmail.com>
Date:   Wed Jan 18 15:11:36 2017 +0100

    Fix CS  on com_admin script (#13636)

    * Fix CS  on com_admin script

    * revert to 1.x changes

commit 100c5a4e49f278af3ceae13695014fbe7d2ee2f5
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Wed Jan 18 12:01:50 2017 +0000

    Fix typo

commit 853f9af7a85845ab12fbee74a98c22e0f94cb70b
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Wed Jan 18 12:55:04 2017 +0100

    prepare update script for 3.7

    Added pre and postfight functions to handle installation of a menu item

commit 1d177d5b144cb299ff33c690ba29d7bb19be615a
Author: Nicola Galgano <optimus4joomla@gmail.com>
Date:   Wed Jan 18 12:33:21 2017 +0100

    [com_fields]- mssql installation fieldsplugin (#13626)

    * [plugins] - fields mssql installation

    plugins  fields mssql installation #13616

    * [com_fields] - mssql updates #13319

    [com_fields] - mssql updates #13319

    * remove duplicate extension id 462 for mssql

    removed id 462 to avoid duplicated id with #13626

    cause now fields are managed with plugins

    Pull Request for Issue #13616 (comment)

commit 38ae97ea48e217201ebcfa3142d73ded595c8634
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Wed Jan 18 12:26:32 2017 +0100

    fixed an obvius wrong use of $this-parent

commit b9d0d32defe49a890b0130432c4e08151c4b34aa
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Wed Jan 18 09:06:26 2017 +0000

    Fix typo (Thanks Dario)

commit 0daf6f75207c1083cfcf98e2849296a28fe19c02
Author: infograf768 <infografjms@gmail.com>
Date:   Tue Jan 17 18:56:53 2017 +0100

    Updating install.xml en-GB administrator (#13623)

commit 77af51f7391f4d7f50eccbe622d81af084f0ebc8
Author: Tomasz Narloch <csthomas@users.noreply.github.com>
Date:   Tue Jan 17 14:47:12 2017 +0100

    Routing: Remove IDs from tags URLs, use menu item of tags view as default for tag view (#11166)

    * Remove id from tags, use tags list menu item as default for tag

    * Code style, remove useless code, feature: first Itemid for tags view, second Itemid for default tag view

commit 326036f0bdc5d163d30a2f31284da86444655432
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Tue Jan 17 13:59:34 2017 +0100

    sync admin menu menutype (#13618)

commit f3780c5f2b3d4dc1b897dec96a9ae6525df6b4ee
Author: Raghav Jajodia <jajodia.raghav@gmail.com>
Date:   Tue Jan 17 18:29:01 2017 +0530

    [com_fields] Improved description in the "description" tooltip Fixes #13392 (#13557)

    * Fixes #13195: Added margin bottom to sidebar menu

    * Fixes #13392: Changed description field tooltip

    * Fixes #13392: Changed description field tooltip

    * Fixes #13392: Changed description field tooltip

commit 56ad6aa5779d15953b35ccd058a8c9344745c58a
Author: Nicola Galgano <optimus4joomla@gmail.com>
Date:   Tue Jan 17 13:42:50 2017 +0100

    [com_associations] - mssql updates (#13617)

    the missed mssql updates for #13537

commit 4a5ee882cd55948782137e7ca845a99a23ff9581
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Tue Jan 17 12:46:25 2017 +0100

    Adding the Multilanguage Associations Manager (#13537)

    * Merge Associations rewrite

    * updated searchtool with the new way

    * udpated edit view title

    * added contact associationshelper class

    * temp fix

    * fix for category filter

    * added newsfeeds associations helper

    * CAPS for params

    * lang tag and added a helper function

    * added land tags

    * code style fix

    * better title in associations view

    * better title

    * use the usual naming

    * fix language tag, thanks to brian teeman and twitter :-)

    * initial review

    * on simple change

    * on simple change 2

    * simple

    * some more helper changes

    * Update associations.php

    * Update associations.php

    * app isn’t set a model property

    * correct return value

    * simplify code adn use helper method

    * use typename directly

    * changed the tooltip position

    * Correct menu helper

    * remove unreacable code

    * correcting checked_out

    * com_menus

    * fixed not supportted message

    * installation

    * fix menu install

    * Spaces -> tabs

commit 40cf34d4c04ff4785d16d4a0e41af420dc5a8356
Author: Nick Savov <nicksavov@users.noreply.github.com>
Date:   Tue Jan 17 05:42:23 2017 -0600

    Add SMS to External URL menu item type (#13615)

    Allows data like sms://+15555555555 to be used instead of getting "Save Not Permitted"

commit 4e156fa0ad46cfcbc089311a66fe8b99d21b49eb
Author: Izhar Aazmi <izharaazmi@gmail.com>
Date:   Tue Jan 17 16:11:40 2017 +0530

    Menu manager for Joomla Backend Menu (#13036)

    * Added client id column to menu_type table.
    Allow creating and editing of "menutype" records with client_id = 1
    Add client_id filters in menu and menu items list views
    Sync menu type filter and client_id filter allowing only menu type in the URL query parameter (B/C)
    Both Lists now also filtered by client id.
    Client id selection updates the menu type list options to show choices only for that client id

    TBD:
    Reserved menu types: main & menu

    * In modal list view we currently hide client_id filter and show only site menu types, will be updated once we have more clear vision.
    Menu type assignment to backend mod_menu config from both menu manager and module manager. Though that is not functional within the module itself.

    * Add/edit menu item redirect with clientId from list filter.
    Load menu item form based on active client id
    Menu type dropdown choices limited to active client id value
    Show menu-item-type choices (modal) trigger with client id parameter in the url
    Switch edit layout based on client id

    * Menu item type loading from component metadata xml or mvc not identifies backend and frontend application separately. Not yet able to load menu item type from backend so returns empty list. Front-end is still intact and unaffected.

    * Edit menu item and create menu item set to follow client id and menu type value consistenty.
    When creating menu item alias, the referenced menu must also belong to same client id.
    Client id field removed from form, this should be auto-calculated from the menu type when saving.

    * Adding layout metadata xml in backend to reference menu item types as it was in front-end.
    Removed unnecessary admin specific layout added earlier as it is so far same as original edit.php, may be added back when needed.
    Remove page specific meta data fields from backend component type menu items.
    For now disable/unsupport association for backend menu items.
    Disallow change of client id for existing menu items, unexpected conflicts may occur if allowed so better be safe.

    Ref to #2

    * Created each backend menu items using menu manager as a replica of existing Joomla backend menu. These are to be used for testing during upgrading menu module.
    language keys are not yet translated. Translation will be done as we are ready with most new or modified language keys application wide.
    Backend menu items does not require all those parameters as that with front-end menu items. Therefore segregated entire menu item xml for backend/frontend.

    Ref #2

    * [a11y] Protostar back to top (#12446)

    * [a11y] Protostar - back to top link

    * Oops Andre was right

    * add anchor for non-js enabled browsers

    * Restructure mod_menu to load preset menu items as an option (default). Other options will be the menu-type and will cause us to load from database. Ref #2

    * Disallow editing and set to home of protected menu type menu items viz. 'main' and 'menu'
    Allow explicit filtering by protected menu type choices in menu items list view. Not limited to #__menutypes table entries only. Unfiltered list still excludes those menu items. (B/C ok)
    Menu items created during installation of a component are now saved as published. When unpublished we won't load it in customised menu's component menu container. They will still be loaded irrespective of state as previously when preset is in use. (B/C ok)
    Home page can now be set one per client instead of one overall.
    Menu module only loads item from 'main' and 'menu' type menu items when requested for component menu items. This filter is now required because we are now going to have other custom menu types for backend which should not be included.

    Ref #2

    * Load menu items from databases in correct hierarchy. Remove any extra separator type menu items created due to exclusion of certain menu items based on various conditions.
    Populate menu items loaded from db into the AdminCssMenu object for final rendering.
    Load new installed components menu items dynamically under the specified menu item with “components container” flag. Any unpublished menu items from the protected menutypes (viz. “main” and “menu”) will be skipped.
    When loading from system preset menu items, these components menu items are all included regardless of their published state. (B/C ok).

    Ref #2

    * View manifests for menu item type and related language key updates. ref #2

    * Minor mistake fix.

    * Translate menu item titles in list view. Ref #2

    * Reset the preset menu structure to be same as the current J37 branch state, dropping implicit inclusion of joomla/joomla-cms#10657 improvement. Ref #2

    * Allow the existing components to leverage the menu/submenu entries in their install manifest for admin menu manager menu link types.
    This provides ability to create links for then without requiring them to add layout manifests. Hence, full B/C solution. Ref #2

    * Minor fix

    * Remove temporary dev phase files

    * Preparing for PR, database and install script updates.
    Ref #2

    * Minor fix

    * Codestyle fix

    * CS fix

    * Don’t sort menu items

    * Sort lang keys
    Allow ‘component’ as first level alias in admin menu items
    Fix lang key
    Remove ‘home’ setting from admin menu items

    * apply in hathor

    * menu item alias check for site only

    * Post merge fixes.

    * Fixes as suggested by @infograf768

    1. Group menu types by client id in lists and default admin menu
    2. Hide association tab for admin menu items.
    3. Hide client id filter for association mapping modal.

    * Add recovery mode for menu where the selected admin menu does not contain link to module manager and/or menu manager.

    * minor bug fix

    * Remove assoc column for admin menu items.
    Make recovery mode message more straight forward.
    Change radio to toggle buttons.

commit 72dfde2a2c756c7f0cb4cf582fda3c83b32d9966
Author: Raghav Jajodia <jajodia.raghav@gmail.com>
Date:   Tue Jan 17 16:10:15 2017 +0530

    Fixes #13177: Added where clause with block status (#13545)

commit e8043e836f7cddd58b6bf56db03476362c76956c
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Mon Jan 16 10:55:51 2017 +0100

    [com_fields] Add base list plugin class which activates the list plugin (#13546)

    * Add base list plugin class

    * Update fieldslistplugin.php

commit 0bc385d7e1ddf3d72c1143ff5d8f3d06a5df8dab
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Sun Jan 15 21:09:47 2017 +0000

    Delete UCM content entries when Joomla articles are deleted (#13592)

commit 44779442a19c9dfe99b772f890154dec197c0d5e
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Sun Jan 15 22:08:19 2017 +0100

    Show text "No Information Entered" in users profile when no value is set (#13589)

commit caa0b7579ef1fe12be78fa0694577795fc86d5df
Author: Vio Cassel <viocassel@users.noreply.github.com>
Date:   Mon Jan 16 00:07:59 2017 +0300

    Update jQuery Autocomplete to 1.2.27 (#13282)

commit 07da22f8927755aa8e36541ead69ea0f02c2686e
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Sun Jan 15 19:45:50 2017 +0000

    Fix issue where fields is false (#13574)

commit 678deb148dd69626513364c04f82c1c1ae8131de
Author: Michael Babker <mbabker@flbab.com>
Date:   Sun Jan 15 14:40:35 2017 -0500

    Make clear Exception messages in JTable (#13603)

commit cff76a11fa89521a279cf5b2c5ba4ac10b3ab03e
Author: joomlabeat <jotsib@gmail.com>
Date:   Sun Jan 15 19:55:50 2017 +0200

    Fix for Issue #13588 - mod_articles_categories - Fatal error: Class 'ContentHelperRoute' not found... (#13590)

    * Update helper.php

    Remove JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');

    * Update mod_articles_categories.php

commit 88e5c18d0eccc794577630835552b409c2945acf
Author: infograf768 <infografjms@gmail.com>
Date:   Sun Jan 15 16:24:43 2017 +0100

    Correcting sidebar display LTR and RTL (replaces #13548) (#13593)

commit 8176c702775b777dd3a841473e91f8e680e19f1c
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Sun Jan 15 13:44:48 2017 +0000

    PHPMailer update (#13575)

commit 9fee146dd160daf09d6e60b3c1133757e55b5f4c
Author: Yves Hoppe <yves@compojoom.com>
Date:   Sun Jan 15 12:56:03 2017 +0100

    Added css classes to the mod_login submit buttons (#13379)

    * Added css classes to the mod_login submit buttons

    * Added css classes to the mod_login submit buttons

    * Changed class to login-button in both modules

commit f495ce0b0ba5103e9edb18e6648473b0780300c4
Author: Frank Mayer <frank@frankmayer.net>
Date:   Sun Jan 15 13:54:37 2017 +0200

    Fix for issue #13531 (#13535)

    * Fix for issue #13531
    - [AND] and [OR] operators were not functioning correctly. Fixed.
    - some cleanup of whitespaces in XML file and removal of rulers when the encapsulated fields are not showing.

    * Removed $key, as it was an unused leftover

    * CS Fix

    * Whitespace Fix

    * Whitespace Fix

    * Whitespace Fix#2

    * Conflict resolution (hopefully, Don't have a complete dev-environment right now.)

commit 8cd1c25dbaec5591e7ffaa99949a454fd1da3f97
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Sun Jan 15 02:49:48 2017 +0100

    TranslateFormat in all other forms (#13158)

    * TranslateFormat in all other forms

    * Revert for tracks filter bar

commit 417fdbd44f76389eb4a9b5ed7798c665487a6739
Author: Tomasz Narloch <csthomas@users.noreply.github.com>
Date:   Sun Jan 15 00:58:00 2017 +0100

    PostgreSQL - return the same string each time of call __toString() on update query (#13284)

commit 4f537745adedefc543ec1e1f06e383bbe12f9d17
Author: Georgios Papadakis <ggppdk@users.noreply.github.com>
Date:   Sat Jan 14 22:17:55 2017 +0200

    [com_fields] Add Joomla loading overlay when form submit is triggered by category selector change (#13320)

    * Added overlay box and message box for submit and reload form after category change

    * Removed commented testing code

    * Added language strings

    * CS fix, added missing spaces

    * Used Joomla logo spinner instead of fixed message

    * Reverted changes in admin lang file

    * CS

    * Revert frontend lang changes

    * Added Joomla loading overlay to new field form when changing field type

    * Added Joomla.loadingLayer show to typeHasChanged JS method too

commit cc5d44010d9271311b090e18a75c4c6fff4b4f4a
Author: Fedir Zinchuk <getthesite@gmail.com>
Date:   Sat Jan 14 22:17:00 2017 +0200

    Make the calendar work in the subform field (#13153)

commit 494a0ba4a353d3d98d4b20eeb45d79b40c5f36af
Author: Tuan Pham Ngoc <github@joomdonation.com>
Date:   Sun Jan 15 03:15:52 2017 +0700

    Clean up ModulesModelModule class (#13380)

commit 7ea954613877ace996abb1d80fe8d514f9220c1d
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Sat Jan 14 21:12:20 2017 +0100

    $field->assigned_cat_ids may not exist. (#13570)

commit 830cda6217ecbd50ecb51de37fae93ede55c74e2
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Sat Jan 14 20:58:04 2017 +0100

    Fixing Showon in plugins/modules/templates (#13549)

    * Adding field group to JFormHelper::parseShowOnConditions and rearranged argument order.

    * codestyle

commit ca6928e11224c7b073e5d621bf78f806096b67d9
Author: Ciaran Walsh <ciaran@joomla51.com>
Date:   Sat Jan 14 19:56:57 2017 +0000

    Fix BS grid (#13560)

commit 28d0f53e8f60078b32a83dc7828e224020436962
Author: Ciaran Walsh <ciaran@joomla51.com>
Date:   Sat Jan 14 19:54:29 2017 +0000

    Rsponsive article edit fields (#13586)

commit 4e5e000641e9496affaf90dbfdb8fb4d4c8db253
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Fri Jan 13 19:27:08 2017 +0000

    Add more email cloaking unit tests and fix email cloaking bug (#13446)

commit 4077cd0bcb7e1d26efd7abf74e316b0d43817818
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Fri Jan 13 08:53:34 2017 +0100

    Readd wrongly deleted controller during merge from staging

commit 0482905ac32aa95fe3e1c21cff89d063aed49b03
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Fri Jan 13 08:46:08 2017 +0100

    Happy new year 2017!

commit b66c2c699f027fba4693adc4ea2dbe16e5b837a6
Merge: a9a3081 d016a6c
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Fri Jan 13 08:45:19 2017 +0100

    Merge branch 'staging' into milestone1

    Conflicts:
    	administrator/components/com_media/controllers/file.json.php
    	administrator/components/com_media/controllers/file.php
    	administrator/components/com_media/controllers/folder.php
    	administrator/components/com_media/helpers/media.php
    	administrator/components/com_media/layouts/toolbar/deletemedia.php
    	administrator/components/com_media/layouts/toolbar/newfolder.php
    	administrator/components/com_media/layouts/toolbar/uploadmedia.php
    	administrator/components/com_media/models/list.php
    	administrator/components/com_media/models/manager.php
    	administrator/components/com_media/views/images/tmpl/default.php
    	administrator/components/com_media/views/images/view.html.php
    	administrator/components/com_media/views/imageslist/tmpl/default.php
    	administrator/components/com_media/views/imageslist/tmpl/default_folder.php
    	administrator/components/com_media/views/imageslist/tmpl/default_image.php
    	administrator/components/com_media/views/imageslist/view.html.php
    	administrator/components/com_media/views/media/tmpl/default_folders.php
    	administrator/components/com_media/views/media/tmpl/default_navigation.php
    	administrator/components/com_media/views/media/view.html.php
    	administrator/components/com_media/views/medialist/tmpl/default.php
    	administrator/components/com_media/views/medialist/tmpl/details.php
    	administrator/components/com_media/views/medialist/tmpl/details_docs.php
    	administrator/components/com_media/views/medialist/tmpl/details_folders.php
    	administrator/components/com_media/views/medialist/tmpl/details_imgs.php
    	administrator/components/com_media/views/medialist/tmpl/details_up.php
    	administrator/components/com_media/views/medialist/tmpl/details_videos.php
    	administrator/components/com_media/views/medialist/tmpl/thumbs.php
    	administrator/components/com_media/views/medialist/tmpl/thumbs_docs.php
    	administrator/components/com_media/views/medialist/tmpl/thumbs_folders.php
    	administrator/components/com_media/views/medialist/tmpl/thumbs_imgs.php
    	administrator/components/com_media/views/medialist/tmpl/thumbs_up.php
    	administrator/components/com_media/views/medialist/tmpl/thumbs_videos.php
    	administrator/components/com_media/views/medialist/view.html.php

commit d016a6c2aede57915c8517b5fce2aca98ec172da
Author: Tomasz Narloch <csthomas@users.noreply.github.com>
Date:   Thu Jan 12 19:30:55 2017 +0100

    Clean up old code in cache.php file (#12183)

    * Clean up in cache - part 1

    * Remove old php4 style to catch exception which currently is useless.
    * Add shorten version of ternary pperators.

    * Add fix for contains()

commit aa059af809e9bf3c6ddb6660f56f79967b8ce50b
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Thu Jan 12 19:07:39 2017 +0100

    Fixing search for MySQL (#13571)

    * Use $query->castAsChar instead of casting to integer

    * Codestyle

commit 6ab2a6e9010e7e04c260b9eba17dc76e866dd3e6
Author: Frank Mayer <frank@frankmayer.net>
Date:   Thu Jan 12 15:15:09 2017 +0200

    Unnecessary double quotes in  /libraries/joomla (#13372)

    * Replace unnecessary double quotes in /libraries/joomla

    * Formatting

    * CS Fix

    * Fixes, based on @andrepereiradasilva's comments.

    * Change remove string concatenations for some occurrences.

    * Fixes, based on @andrepereiradasilva's comments.

    * Fixes, based on @andrepereiradasilva's comments.

    * Fixes, based on @andrepereiradasilva's comments.

commit 435222909af7f27f385dab381a1d0c1ce35ed947
Author: Frank Mayer <frank@frankmayer.net>
Date:   Thu Jan 12 14:52:31 2017 +0200

    Some improvements in tests #3: (#13402)

    * Some improvements in tests #3:
    - call static methods correctly

    * Fix T_PAAMAYIM_NEKUDOTAYIM (for all PHP 5.x)

    * Remove forgotten call

    * Changed a few things after conversation with @mbabker

    * Fixes according to @andrepereiradasilva's comments

commit 6e07ca6fadd8a5d1db3337cf0357d782646f5411
Merge: 7a9c907 f4e07d8
Author: Luca Marzo <luca.marzo@live.com>
Date:   Thu Jan 12 13:26:01 2017 +0100

    Merge pull request #13573 from wilsonge/copyright

    It's 2017. Happy New Year

commit f4e07d895496acea9be233e78c6bffb50e5fc429
Author: wilsonge <georgejameswilson@googlemail.com>
Date:   Thu Jan 12 12:16:47 2017 +0000

    It's 2017. Happy New Year

commit 7a9c90760881c014f0cbe0a52967ba83bfdf55ea
Merge: 24f3b4f 17821a0
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Thu Jan 12 12:12:39 2017 +0000

    Merge pull request #13481 from dgt41/+++++++tinymce_update

    Update tinymce 4.5.2

commit 24f3b4f943d5cbb3f321b328f7910a51e4c267d2
Merge: 0fbd154 2e8ad39
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Thu Jan 12 12:12:18 2017 +0000

    Merge pull request #13556 from Digital-Peak/calendar-field-default-value

    [com_fields] Remove default value from the field params to inherit from plugin

commit 0fbd1546240e21cd14ccaa05cc30127cc14db1a7
Merge: cc0ce55 1acd6b7
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Thu Jan 12 11:17:44 2017 +0000

    Merge pull request #13485 from joomdonation/patch-13

    Clean up JModelForm

commit cc0ce55cf81e22cc6ea946db7f9d7c3ac934ee24
Merge: d37d5c3 dec96ec
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Thu Jan 12 11:03:42 2017 +0000

    Merge pull request #13547 from Digital-Peak/checkboxes-fix

    [com_fields] Catch "expects parameter 2 to be string" error

commit d37d5c32740007b4ecc75d4e4e46dfb180e4b255
Merge: f8b41cd bd2d25d
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Thu Jan 12 11:00:02 2017 +0000

    Merge pull request #13555 from Digital-Peak/user-field-no-multiple

    [com_fields] Remove multiple parameter from user field

commit f8b41cdbe8823356336a1e15087c0b6168b2796c
Merge: e3d8732 143cd04
Author: Luca Marzo <luca.marzo@live.com>
Date:   Wed Jan 11 21:31:56 2017 +0100

    Merge pull request #13564 from joomla/Bakual-patch-1

    Fixing a typo in gallery plugin language file

commit 143cd04b3d6806d88137e9d3f8ffc177d45a4bd9
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Wed Jan 11 21:02:49 2017 +0100

    Fixing a typo in gallery plugin language files

commit e3d873298ed21eaaceda1f1c15380a53658ecd78
Author: Tomasz Narloch <csthomas@users.noreply.github.com>
Date:   Wed Jan 11 20:44:33 2017 +0100

    Add stripslashes to mssql result columns. (#13534)

commit d3e1cc5dc34cbd8cc48bb9096fbcd8762eeb81f8
Author: Minei3oat <Minei3oat@users.noreply.github.com>
Date:   Wed Jan 11 20:35:52 2017 +0100

    remove unneeded space from btn-group/radio/checkboxes (#12003)

    * remove unneeded space from btn-group/radio/checkboxes

    In vertical from there was unneeded space between the label and the
    controls under it.
    Removed padding-top of btn-group to align with label.
    Added 2px padding-top to btn-group-yes in isis to compensate 2px less
    padding-top of each button to have the buttons aligned with the label.

    * move code from forms.less to protostar / isis

    This reverts commit a0868504cee94a1dd6d820b3690417d7cfd514dd.

    * correct comment

    * removed unit from zero values

commit b8f12937f9d3d031ec2d1bac746668a391ad633c
Author: infograf768 <infografjms@gmail.com>
Date:   Wed Jan 11 19:25:08 2017 +0100

    typo (#13563)

commit 2e8ad390660935a959468b98d6430d604300a376
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Wed Jan 11 07:44:48 2017 +0100

    Remove default value from the field params to inherit from plugin

commit bd2d25dfab033faef3f033987c3c09e3b8c93f87
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Wed Jan 11 06:47:35 2017 +0100

    Remove multiple parameter from user field

commit 0ea8dadbae6f22e26ef3382c9da8f5fcef09e7d8
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Wed Jan 11 00:02:34 2017 +0100

    Fix name of component helper in fieldshelper (#13539)

commit 3e8867fa8028c1a7b38add62485822747d0f282f
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Tue Jan 10 22:51:20 2017 +0000

    remove duplicated code (#13550)

commit 192e04dd5b2ceb08be9f71ad0ccd51b2492acc9f
Author: Phil Taylor <phil@phil-taylor.com>
Date:   Tue Jan 10 19:47:28 2017 +0000

    Fix invalid string that causes the ini file not to load (#13544)

    closes #13541

commit dec96ec83b2e7840e575e36db20ca568f2038767
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Tue Jan 10 19:31:59 2017 +0100

    Catch "expects parameter 2 to be string" error

commit 418e72c2fe99158f27296912432d0cbddc05bae6
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Tue Jan 10 18:28:24 2017 +0100

    Take complete context for group lookup (#13538)

commit c418c439cd189d6bf9b8607cf15bea0e126b1bf5
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Tue Jan 10 17:27:58 2017 +0000

    [Mssql] Fix syntax error when installing a language in backend (#13512)

    * Update languages.php

    * ups

commit 5c7681c73373220ca8d99e6ec5ea09e57697fab7
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Tue Jan 10 13:58:35 2017 +0000

    Normalize #__categories table across 3 db systems and add default values (#13514)

    * installation sql changes

    * updates sql

commit fd002902cce4e13698a524fb9cb170df3869ee76
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Tue Jan 10 13:58:20 2017 +0000

    Normalize #__ucm_content table across 3 db systems and add default values (#13513)

    * normalize ucm_content table in install sql

    * postgresql modification updates

    * sqlazure on update

    * mysql updates

    * remove text - copy paste error

commit 02bb81dbf016dcb48b8a249ecfe864f555f87015
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Tue Jan 10 13:57:27 2017 +0000

    Update config.xml (#13503)

commit a6316f020e47796b6942d8ada8d6b7641b862d4b
Author: Phil Taylor <phil@phil-taylor.com>
Date:   Tue Jan 10 13:36:56 2017 +0000

    Fix “You are not authorised to view this” when mod_expires enabled (#13516)

    * Fix “You are not authorised to view this” when mod_expires enabled

    Closes #8731 Dec 18, 2015
    Closes #8757 Dec 21, 2015
    Closes #9013 Jan 28, 2016
    Closes #9145 Feb 17, 2016
    Closes #9615 Mar 26, 2016
    Closes #10753 Jun 7, 2016

    * code style

    * Unit test refactoring (cannot do it the old way as relative dynamic dates in headers)

    * Remove duplicate header output for charset

    * Better Unit Tests

    * More unit tests :)

    * Close after setting headers

    * Do not cache the response to this, its a redirect

commit 87e9b4d7bdba7e138126baab9edb8872eae4895e
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Tue Jan 10 14:36:13 2017 +0100

    Delete not needed layouts (#13532)

commit 205d94be2e3c33dcb802b1919f8fa8fc349a28b6
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Mon Jan 9 20:46:43 2017 +0100

    [com_fields] Move custom field types to plugin (#13319)

    * Migrate text field to plugin

    * Moved field description lookup to plugin event

    * Remove not needed functions

    * Renamed to specification

    * Adapt gallery

    * Renamed to field types

    * Remove dom interface

    * Prepare the field trough an event

    * Remove domfield interface

    * Add text layout

    * Move output to layout and better multifields support

    * HoHoHoHo Travis

    * Change language strings to be more inline with Joomal core

    * Add list plugin

    * Add calendar plugin

    * Add checkboxes plugin

    * Add color plugin

    * Add editor plugin

    * Add image plugin

    * Add imagelist plugin

    * Add integer plugin

    * Add media plugin

    * Add radio plugin

    * Add sql plugin

    * Add text area plugin

    * Add url plugin

    * Add user plugin

    * Add user group plugin

    * Making travis happy

    * Adapting the installer scripts

    * Some fixes

    * Fixed comment copy paste

    * Cleanup of not used code

    * Alpha ordering language strings

    * Adapting the frontend ini lib language file to be the same as back end

    * Add missing description language string for gallery

commit 82d2a850e9bed0dc9d31f1b103bafa35b122aead
Merge: 1481339 8f9ad61
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Mon Jan 9 16:33:23 2017 +0000

    Merge pull request #13515 from zero-24/zero-24-patch-2

    Reduce the usage of the variable

commit 1481339dd871f1797be0d22e148af8f03c10dd98
Merge: 5d08c45 56ce7b8
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Mon Jan 9 15:24:34 2017 +0000

    Merge pull request #13520 from mbabker/config-cache-fixes

    Expose cache_path config, catch exceptions cleaning cache on config save

commit a9a30814d18d741e56e689215dbc3d1a514377d4
Merge: dd5f4d9 1fa20e7
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Mon Jan 9 08:37:55 2017 +0200

    Merge pull request #75 from joomla-projects/feature/api/putpost

    Implement missing method

commit 56ce7b856d0e02e15c09c5cf902fe28b0d7dde9a
Author: Michael Babker <mbabker@flbab.com>
Date:   Sun Jan 8 14:02:10 2017 -0600

    Expose cache_path config, catch exceptions cleaning cache on config save

commit 8f9ad61cf1934c63317f10ab8ec2c916967db368
Author: zero-24 <zero-24@users.noreply.github.com>
Date:   Sun Jan 8 16:25:56 2017 +0100

    Update languages.php

commit 5d08c452a35e0ee49e2ab81b5b99a5e87a1f7261
Author: Nicola Galgano <optimus4joomla@gmail.com>
Date:   Sat Jan 7 20:25:00 2017 +0100

    [com_fields] MSSQL - sql for Custom fields (#12660)

    * MSSQL - update sql for Custom fields (#11833)

    MSSQL - update sql for Custom fields (#11833)

    * MSSQL - update sql for Custom fields (#11833)

    MSSQL - update sql for Custom fields (#11833)

    * MSSQL - install sql for Custom fields (#11833)

    MSSQL - install sql for Custom fields (#11833)

    * minor cs + defaul values

    * move hits field on a new line

    move hits field on a new line

    * removed version, hits fields

    removed (version, hits) fields #12674

    * removed (version,hits) fields

    removed (version,hits) fields #12674

    * mssql com_fields#13091

    Fixing sql fields #13091

    * mssql com_fields#13091

    mssql com_fields#13091

    * [com_fields] No need for an alias in fields groups. #13115

    [com_fields] No need for an alias in fields groups. #13115

    * [com_fields] No need for an alias in fields groups. #13115

    [com_fields] No need for an alias in fields groups. #13115

    * missed comma

    missed comma

    * missed comma

    missed comma

    * update for #13175

    from extension to context

    * update for #13175

    from extension to context

    * update for #13246

    update for #13246

    * updated for #13246

    updated for #13246

    * added the missed DEFAULT

    added the missed DEFAULT

    * added space before (

    added space before (

    * added space before (

    added space before (

commit 7bde3e0cde1a51d206ff68a9cb80c6acc53ad7f3
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Sat Jan 7 10:09:26 2017 +0100

    forgot is

commit 9ce620026e93dc891e456086f5bf2aa52c3fb791
Author: Robert Deutz <rdeutz@googlemail.com>
Date:   Sat Jan 7 10:07:17 2017 +0100

    changed word

    fix #13482 as requested by infograf768

commit f7e3102b48c787e7c972769bd7ccd5181e50d1c4
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Sat Jan 7 07:36:00 2017 +0000

    Fix showon notice (#13490)

    * Update default.php

    * Update default.php

    * Update html.php

commit a03ea1bf6c9254c30c45be67fd21e99baa90a68f
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Fri Jan 6 19:33:44 2017 +0100

    Add Clearfix to filters (#13488)

commit 9e85ac6fb28390700d61541dc33b83b1f54fe258
Author: infograf768 <infografjms@gmail.com>
Date:   Fri Jan 6 19:33:26 2017 +0100

    TinyMCE: Correcting wrong tip (#13482)

commit 5cdc87aa1562afc48af46a0413dd76917ad6b35f
Author: Elijah Madden <okonomiyaki3000@gmail.com>
Date:   Sat Jan 7 03:32:41 2017 +0900

    CodeMirror 5.22.1 (#13468)

commit 93db87826120f5b250dc57acc6a50b732033e94c
Author: Michael Babker <mbabker@flbab.com>
Date:   Fri Jan 6 13:32:14 2017 -0500

    Add a "contains" method to cache API (#13452)

    * Implement JCache::contains() and JCacheStorage::contains()

    * Use the new contains() method

commit bc1b62e399f7ca7bbf15f2bde4f8b4e48a854a72
Author: coolcat-creations <mail@coolcat-creations.com>
Date:   Fri Jan 6 19:30:49 2017 +0100

    Change Jtext string (#13420)

    Change text

commit 7093be910edec1eef6c04909b6ccb999e46c1953
Author: Dennis Hermatski <pandenitz@mail.ru>
Date:   Fri Jan 6 21:29:38 2017 +0300

    #8900 (#9886)

commit 17821a07fd71bcf9ad17f744f4de972b9261f763
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jan 6 14:08:26 2017 +0200

    xml update version

commit 1acd6b728031b0bc006b0f8eb39de0ea3c2e21dd
Author: Tuan Pham Ngoc <github@joomdonation.com>
Date:   Fri Jan 6 18:29:10 2017 +0700

    Clean up JModelForm

commit 76a14e451d64ee05aa70ad45f23a52ef2eaeca62
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Fri Jan 6 08:08:31 2017 +0000

    [showon] Allow "not in" condition and simplify php code (#13476)

    * improve showon - not in and some simplification

    * more improvements

    * fix bug on AND/OR conditions

    * remove double json encode

commit 019c9b3f77d449f0d81c5fce113fc068eb01f371
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Fri Jan 6 09:07:09 2017 +0100

    Hide tab when empty (#13456)

commit 3b566639d2bfc7df7ea18936c33bd0009a0d61a8
Author: Frank Mayer <frank@frankmayer.net>
Date:   Fri Jan 6 09:09:57 2017 +0200

    Fixed broken view in administrator/components/com_languages/views/installed/tmpl/default.php under smaller resolutions (#13469)

    * Fixed broken view in administrator/components/com_languages/views/installed/tmpl/default.php under smaller resolutions
    Details:
    - Fixed `Native Title` header,  which wasn't removed in smaller resolutions due to missing classes
    - Centered the  `Language Tag` column

    * Changes proposed by @infograf768 in order to keep the Native Title in Tablets

    * Change according to @Bakual's comment

commit 7c16f2b14c7522ca752a699607a5763a51721588
Author: Frank Mayer <frank@frankmayer.net>
Date:   Fri Jan 6 09:02:07 2017 +0200

    Provide Greek calendar locale (#13461)

commit 271f1dbf4b71469bdb46e6454ae3f9b859b84648
Author: Michael Babker <mbabker@flbab.com>
Date:   Fri Jan 6 01:20:26 2017 -0500

    Move PHP 7 checks for MySQL adapter (#13449)

commit b607c613090e106f91b914694172127c5f0d2a26
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jan 6 01:25:31 2017 +0200

    tinymce 4.5.2

    Version 4.5.2 - January 4, 2017

commit 551e8e3a794d49665a239ba61e28b2a2399cb48e
Author: Ciaran Walsh <ciaran@joomla51.com>
Date:   Thu Jan 5 19:43:52 2017 +0000

    Media Manager - Adds unique IDs to toolbar btns (#13477)

    * Toolbar min-height correction

    * Add unique IDs

commit 6fcf1cc4f219dbde35e06e4d5fc77d7c12d9f536
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Thu Jan 5 20:43:20 2017 +0100

    Remove invalid ordering options from language installer (#13475)

commit 81aad30a723a135a361c0ee8cf6a4196510302a3
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Thu Jan 5 20:42:54 2017 +0100

    [com_fields] Add a callback for context mapping (#12968)

    * Add a callback for context mapping

    * Simplify stuff

    * Move to component helper class, if the section is not known ignore it

    * Change function name to validateSection

commit 2173ac317c05b4b6ad12b427356ed5e3035cfc19
Author: Tuan Pham Ngoc <github@joomdonation.com>
Date:   Fri Jan 6 00:55:19 2017 +0700

    Fix issue with TinyMCE editor (#13354)

commit b58be77f295aad72ecadbdcc8c17242f0017c520
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Thu Jan 5 12:27:51 2017 +0000

    Proper escaping in toolbar button js strings (#13425)

    * Update confirm.php

    * Update standard.php

    * fix test 1

    * fix test 2

    * cs line size fix 1

    * cs line size fix 2

    * cs: space

    * Update confirm.php

    * final change

    * Update batch.php

    Correcting batch button

commit 1fa20e7642e9bf0df25fded8f1f7bfbf820e2407
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Thu Jan 5 11:54:36 2017 +0100

    Implement missing method

commit a514a4b99f12a985875dcb2347880f6a77d484e4
Author: Michael Babker <mbabker@flbab.com>
Date:   Thu Jan 5 05:31:22 2017 -0500

    Use the database's server type element where able (#13448)

commit fab9fae7698078eafb120a1c16770627311c6287
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Thu Jan 5 12:30:19 2017 +0200

    Form field tel using JLayouts (#13435)

    * init

    * value

    * array

    * UT (?)

    * fix UT (probably)

    * spaces

    * again

    * hmmm

    * hmmm

commit dd5f4d9c30d3a215c27d2da4a3ee2a8382df345e
Merge: 553dd52 1c72cc7
Author: Allon Moritz <allon.moritz@digital-peak.com>
Date:   Thu Jan 5 11:02:38 2017 +0100

    Merge branch 'staging' into milestone1

    Conflicts:
    	administrator/components/com_media/views/media/tmpl/default.php

commit 1c72cc7c68ce7a1d8ee2b6150f0a68ae256fcf02
Author: rbsl-manisha <manisha@readybytes.in>
Date:   Thu Jan 5 13:14:21 2017 +0530

    Fix fatel error in normal registration process. (#13472)

    * Fix fatal error in normal registration process.

    * Fix a smal CS issue with spaces

commit ec2e89df6e924b19eb6c2c1395f3ede914800da7
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Thu Jan 5 06:57:01 2017 +0000

    remove deprecated code (#13464)

commit e13bbe75ce8c73d09b0d0a427963632d72641c50
Merge: 7d35a47 1323192
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Wed Jan 4 20:13:49 2017 +0000

    Merge pull request #13447 from photodude/Sniff-Fix

    Apply fixes to InstantiateNewClasses Sniff

commit 7d35a47c491821edbb885da37587b2ff456f0c3c
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Wed Jan 4 19:24:28 2017 +0000

    [searchtools] Simplify also com_templates styles and templates views (#13466)

    * adapt com_templates views with selector as done for menus, modules, cache, checkin and languages

    * remove now unneeded files and dirs on update

commit 07977dcbfd35b32f3151ba513a7a370aea70aa23
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Wed Jan 4 20:23:26 2017 +0100

    Fix preselect of state, group, access and language for fields (#13460)

commit 737ce33df951726de5665532b23aaedeeb32e011
Author: infograf768 <infografjms@gmail.com>
Date:   Wed Jan 4 20:03:01 2017 +0100

    Proper escaping for various JS strings (#13455)

commit 33f440297e4468fee3794c037744d103f052c0e7
Author: Elijah Madden <okonomiyaki3000@gmail.com>
Date:   Thu Jan 5 04:01:34 2017 +0900

    Properly use sublayout (#12966)

    * Properly use the 'sublayout' function in the editors.buttons layout

    * Properly use the 'sublayout' function in the searchtools.default layout

    * Properly use the 'sublayout' function in the content.info_block layout

commit 8614c9a281d02dd80ad9cb5f056138135a4678f8
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Wed Jan 4 18:59:37 2017 +0000

    Allow to add new options dynamically to select fields (#12392)

    * allow to add new options to select field dynamicly

    * an

    * fix conflicts 1

    * fix conflicts final

commit 62c54738155c6875470b5b2df21a87be13f59195
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Wed Jan 4 09:48:26 2017 +0000

    fix html error in com_menus batch modal (#13465)

commit d189cb1464a6009007594bb4060038639d47e424
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Wed Jan 4 07:19:18 2017 +0000

    [Deprecate _QQ_ 2] Save language overrides with escaped double quotes (#13427)

    * new method to save language ini

    * forgot Registry changes

commit 5ee2db4ff0b8fffd97e7d88fc14c441439713430
Author: Frank Mayer <frank@frankmayer.net>
Date:   Wed Jan 4 08:53:29 2017 +0200

    Fixed translation filenames for sr-* as they would not get loaded due to the capital letters (#13463)

commit 3c4423633aaee5b70cb06495f8ec19a0e441997d
Author: Frank Mayer <frank@frankmayer.net>
Date:   Tue Jan 3 23:50:21 2017 +0200

    Some improvements in tests #5: (#13410)

    - Improved readability of assertions by using more appropriate assertions
    - Made some assertions more strict

commit 1073cd894a8e5a60e1f51013200a25d0868988e8
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Tue Jan 3 21:34:27 2017 +0000

    Move methods from JLanguage to JLanguageHelper (#12953)

    * move to JLanguageHelper

    * JLanguage::exists to JLanguageHelper::exists

    * JLanguage::getMetadata() to JLanguageHelper::getMetadata()

    * JLanguage::getKnownLanguages() to JLanguageHelper::getKnownLanguages()

    * JLanguage::parseXMLLanguageFile() to JLanguageHelper::parseXMLLanguageFile()

    * JLanguage::getLanguagePath() to JLanguageHelper::getLanguagePath()

    * sincronize with staging

    * fix conflicts

commit a8bb66b4f04940d7425ddf47391f41d55899ac87
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Tue Jan 3 21:28:44 2017 +0000

    [ACL] [editor xtd image button] Correct invalid check when in category edit (#12819)

    * Update image.php

    * Update image.php

commit 3611ad5146bda2d737cd3baff94602d2d8c856f6
Author: Phil Taylor <phil@phil-taylor.com>
Date:   Tue Jan 3 21:21:38 2017 +0000

    Correct Docblock Argument Type Mismatch (#13458)

    This issue was highlighted in @phpstorm when researching https://github.com/joomla/joomla-cms/issues/13438 :-) (Then to add to the irony I used Github to edit the file haha)

commit d717619e0c58d2eba9e420aefba99adefc0625a2
Author: Frank Mayer <frank@frankmayer.net>
Date:   Tue Jan 3 23:18:08 2017 +0200

    Fix correct multi-line assignments in array (#13441)

commit 8b47a87328c18bf9330baa452101239662ac0ef2
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Tue Jan 3 21:10:41 2017 +0100

    Adding bulgarian calendar translation

commit d58ae7b86f4ac4a0199e12fe02eaeb7459eec0fe
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Tue Jan 3 15:52:58 2017 +0000

    [com_joomlaupdate] review config global default options (#12965)

    * defaults

    * sincronize with staging

    * fix conflicts

commit 650795fec01b3d1bd1d1331db6b3c3ec0d7db661
Author: Piotr <hello@piotr.cz>
Date:   Tue Jan 3 13:15:12 2017 +0100

    Convert CRLF to LF (#13457)

commit d4ca8d964c4e935b5a3d091984f385d4d7a1a946
Author: infograf768 <infografjms@gmail.com>
Date:   Tue Jan 3 08:36:23 2017 +0100

    Enabling showon with js (#13450)

commit 4e3a4aa32f1661a821ff59ddcec46c423b79ed6d
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Mon Jan 2 19:47:16 2017 +0000

    Improve searchtools - part 2 (#10090)

    * better searchtools

    * apply to menu items

    * apply to com_languages installed

    * optimizations

    * optmixations - part 2

    * the same for modules

    * frontend modules popup need some care too

    * add unused layout overrides file to file/folder delete queue

    * fix conflicts 1

    * reset layouts

    * readd conflicting changes

commit 204ef46ae742a8ab7c2604c8d02e020f49d65837
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Mon Jan 2 19:31:21 2017 +0100

    Use Accredited Languagepack XML directly to show the installable languages (#13256)

    * Use Manifest directly to show the installable languages

    * Codestyle

    * Hathor

    * Removing unneeded controller

    * Codestyle again

commit e28aa175ce61725f5e487c02e1bb1dc2a995bf7d
Author: Thomas Hunziker <werbemails@bakual.ch>
Date:   Mon Jan 2 19:30:17 2017 +0100

    validate="options" doesn't work with useglobal="true" (#13092)

commit e3ecfe686606853a9ac3194e75082dd39b445404
Author: Fedir Zinchuk <getthesite@gmail.com>
Date:   Mon Jan 2 11:10:26 2017 +0200

    Add some description to TinyMCE builder, to make it more clear. (#13367)

    * Add the description for the source and target sections in TinyMCE builder.

    * Spaces to Tabs

    * normalise "drag and drop"

    * caps for label

    * Improve the label for an access field in the set

    * Update strings

commit 278e9d04202924f0d6ad45c80f2e19a62bb6ffaa
Author: infograf768 <infografjms@gmail.com>
Date:   Mon Jan 2 10:09:51 2017 +0100

    Correcting default TinyMCE params when installing Joomla (#13431)

commit af78aa2ab8de343a60d678ca348b8b3d0ff86c5f
Author: Fedir Zinchuk <getthesite@gmail.com>
Date:   Mon Jan 2 11:09:42 2017 +0200

    Make sure that the Public group used only once (#13434)

commit 5904fdbaef9b407b6643136940ae472f5331879f
Author: Nicola Galgano <optimus4joomla@gmail.com>
Date:   Mon Jan 2 02:00:37 2017 +0100

    [postgresql] - no need to set default to NULL (#13419)

commit e30600a8256da0823efba28152f74878dd95443f
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Mon Jan 2 01:00:02 2017 +0000

    [JLanguage] Simplify language file parse (#13407)

    * simplify language file parse

    * revert $php_errormsg

    * as suggested by michael

commit ee12fd84f93e5b27197edce76d2d9a8358ef1314
Author: Chris Davenport <chris.davenport@davenporttechnology.com>
Date:   Mon Jan 2 00:58:45 2017 +0000

    Move weblinks stats to weblinks repo (#13389)

commit 09f736a7a6431f2007e5e4de6fd27a87ed63922b
Author: Cliff <cpfeifer@users.noreply.github.com>
Date:   Sun Jan 1 17:58:06 2017 -0700

    [com_fields] Cf permission strings (#13384)

    * Merge remote-tracking branch 'joomla/staging' into staging

    * com_fields language string update

    * com_fields language string update

    * com_fields language string update

    * Small text edit

commit 4ca1d5608b39e2dce3d40e8aad757b8782e67946
Author: Michael Babker <mbabker@flbab.com>
Date:   Sun Jan 1 19:57:22 2017 -0500

    Do not include the SQL query in the Exception message (#13356)

commit 9859413267a02cbc198cc1335f7f758ef2e4960e
Author: Ciaran Walsh <ciaran@joomla51.com>
Date:   Mon Jan 2 00:56:28 2017 +0000

    Container added to all batch modals (#13307)

    * Container added to all batch modals

    * Fix overflow & com_modules

commit 1323192d99e76f1ff561efe66356a18e5898e42a
Author: photodude <walt@waltsorensen.com>
Date:   Sun Jan 1 17:48:32 2017 -0700

    Apply fixes to InstantiateNewClasses Sniff

    fixes a case where multiline new class instantiation would error as
    `Instanciating new classes without parameters does not require
    brackets.`

commit 09e884a84180ea61fd22cbd55423b76cc1a0ec6f
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Sun Jan 1 19:17:21 2017 +0000

    remove deprecated calls (#13424)

commit d40918f902853fa092c0b3b86cb18ad993ad6795
Author: Walt Sorensen <photodude@users.noreply.github.com>
Date:   Sun Jan 1 05:51:15 2017 -0700

    code style fix for administrator/components/com_contenthistory (#13439)

    Automatically fixed with PHPCS2 fixers

commit 6ddff0da61f6e382834297af049fef96c501ff3e
Author: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date:   Sat Dec 31 16:22:18 2016 +0000

    [Deprecate _QQ_ 1] Remove information about _QQ_ in 4 ini files. (#13426)

    * Update en-GB.ini

    * Update en-GB.lib_joomla.ini

    * Update en-GB.ini

    * Update en-GB.lib_joomla.ini

commit 57337f7f3f7f8a9d721bf3876778cbcc6f8a615e
Merge: 7765af7 cae13bf
Author: George Wilson <georgejameswilson@googlemail.com>
Date:   Fri Dec 30 13:46:38 2016 +0000

    Merge pull request #13408 from frankmayer/improvements-in-tests-4

    Some improvements in tests #4:

commit 7765af7cd2f54f1e7c0613d7737e90ac7f67…
@brianteeman
Copy link
Contributor

Closing this as all views have been expressed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

10 participants