Sync to resolve merge conflict, code style OCD#4

Merged

Hackwar merged 560 commits intoHackwar:component_routing_classesfrom

mbabker:hannes-1

Feb 27, 2014

This pull request is big! We're only showing the most recent 250 commits

Commits on Jan 28, 2014

[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Corrected indentation & added missing whitespace
Peter van Westen
committed
[CODE STYLE] Corrected indentation & added missing whitespace
Peter van Westen
committed
[CODE STYLE] Corrected indentation
Peter van Westen
committed
[CODE STYLE] Removed redundant whitespace
Peter van Westen
committed
Merge pull request #2851 from nonumber/patch-3
David Hurley
committed
Merge pull request #2852 from nonumber/patch-4
David Hurley
committed
[CODE STYLE] Corrected indentation
Peter van Westen
committed
Merge pull request #2853 from nonumber/patch-5
David Hurley
committed
Merge pull request #2854 from nonumber/patch-6
David Hurley
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
Merge pull request #2855 from nonumber/patch-7
David Hurley
committed
Merge pull request #2868 from nonumber/patch-20
David Hurley
committed
Merge pull request #2866 from nonumber/patch-18
David Hurley
committed
Merge pull request #2869 from nonumber/patch-21
David Hurley
committed
Merge pull request #2861 from nonumber/patch-13
David Hurley
committed
Merge pull request #2867 from nonumber/patch-19
David Hurley
committed
Merge pull request #2860 from nonumber/patch-12
David Hurley
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
Merge pull request #2856 from nonumber/patch-8
David Hurley
committed
Merge pull request #2870 from nonumber/patch-22
David Hurley
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Corrected indentation
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Corrected newline syntax
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Added missing newlines
Peter van Westen
committed
[CODE STYLE] Corrected indentation
Peter van Westen
committed
Merge pull request #2857 from nonumber/patch-9
Thomas Hunziker
committed
Merge pull request #2858 from nonumber/patch-10
Thomas Hunziker
committed
[CODE STYLE] Corrected indentation & added missing whitespace
Peter van Westen
committed
[CODE STYLE] Corrected indentation
Peter van Westen
committed
Merge pull request #2862 from nonumber/patch-14
Thomas Hunziker
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Corrected indentation
Peter van Westen
committed
Merge pull request #2863 from nonumber/patch-15
Thomas Hunziker
committed
Merge pull request #2871 from nonumber/patch-23
Thomas Hunziker
committed
Merge pull request #2864 from nonumber/patch-16
Thomas Hunziker
committed
Merge pull request #2872 from nonumber/patch-24
Thomas Hunziker
committed
Merge pull request #2873 from nonumber/patch-25
Thomas Hunziker
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
Merge pull request #2874 from nonumber/patch-26
Thomas Hunziker
committed
Merge pull request #2875 from nonumber/patch-27
Thomas Hunziker
committed
Merge pull request #2876 from nonumber/patch-28
Thomas Hunziker
committed
[CODE STYLE] Corrected indentation & whitespace
Peter van Westen
committed
[CODE STYLE] Corrected indentation & whitespace
Peter van Westen
committed
[CODE STYLE] Corrected indentation & whitespace
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
Merge pull request #2878 from nonumber/patch-30
Thomas Hunziker
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
Merge pull request #2879 from nonumber/patch-32
Thomas Hunziker
committed
Merge pull request #2880 from nonumber/patch-33
Thomas Hunziker
committed
Merge pull request #2881 from nonumber/patch-34
Thomas Hunziker
committed
Merge pull request #2882 from nonumber/patch-36
Thomas Hunziker
committed
Merge pull request #2884 from nonumber/patch-38
Thomas Hunziker
committed
Merge pull request #2885 from nonumber/patch-39
Thomas Hunziker
committed
Merge pull request #2886 from nonumber/patch-40
Thomas Hunziker
committed
Merge pull request #2887 from nonumber/patch-42
Thomas Hunziker
committed
Merge pull request #2888 from nonumber/patch-41
Thomas Hunziker
committed
Merge pull request #2890 from nonumber/patch-44
Thomas Hunziker
committed
Merge pull request #2891 from nonumber/patch-45
Thomas Hunziker
committed
Oops
Peter van Westen
committed
Merge pull request #2892 from nonumber/patch-46
Thomas Hunziker
committed
Merge pull request #2889 from nonumber/patch-43
Thomas Hunziker
committed
Merge pull request #2893 from nonumber/patch-4
Thomas Hunziker
committed
[CODE STYLE] Corrected indentation
Peter van Westen
committed
Merge pull request #2894 from nonumber/patch-5
Thomas Hunziker
committed
Merge pull request #2895 from nonumber/patch-3
Thomas Hunziker
committed
[CODE STYLE] Corrected newline syntax
Peter van Westen
committed
Merge pull request #2896 from nonumber/patch-6
Thomas Hunziker
committed
Merge pull request #2897 from nonumber/patch-7
Thomas Hunziker
committed
Merge pull request #2898 from nonumber/patch-8
Thomas Hunziker
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
Merge pull request #2899 from nonumber/patch-9
Thomas Hunziker
committed
Merge pull request #2900 from nonumber/patch-10
Thomas Hunziker
committed
[CODE STYLE] Corrected newline syntax
Peter van Westen
committed
Merge pull request #2901 from nonumber/patch-12
Thomas Hunziker
committed
[CODE STYLE] Corrected newline syntax
Peter van Westen
committed
[CODE STYLE] Corrected newline syntax
Peter van Westen
committed
Merge pull request #2904 from nonumber/patch-15
David Hurley
committed
[CODE STYLE] Added missing newlines
Peter van Westen
committed
Merge pull request #2902 from nonumber/patch-13
David Hurley
committed
Merge pull request #2905 from nonumber/patch-3
David Hurley
committed
Merge pull request #2903 from nonumber/patch-14
David Hurley
committed
CS - Fixes missing param in docblock and adds spacing
David Hurley
committed
CS - Added spacing as needed
David Hurley
committed
Merge pull request #2908 from dbhurley/categories_category
betweenbrain
committed
Merge pull request #2907 from dbhurley/categories_categories
betweenbrain
committed

Commits on Jan 29, 2014

Merge branch 'staging' into phpUpdateLib
mbabker
committed
Data object is a stdClass instance
mbabker
committed
[CODE STYLE] Corrected indentation
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Corrected newline syntax
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Added missing newlines
Peter van Westen
committed
[CODE STYLE] Corrected whitespace
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
[CODE STYLE] Added missing whitespace
Peter van Westen
committed
Merge pull request #2923 from nonumber/patch-18
betweenbrain
committed
Merge pull request #2921 from nonumber/patch-16
betweenbrain
committed
Merge pull request #2920 from nonumber/patch-15
betweenbrain
committed
Merge pull request #2919 from nonumber/patch-14
betweenbrain
committed
Merge pull request #2917 from nonumber/patch-12
betweenbrain
committed
Merge pull request #2916 from nonumber/patch-10
betweenbrain
committed
Merge pull request #2915 from nonumber/patch-9
betweenbrain
committed
Merge pull request #2914 from nonumber/patch-8
betweenbrain
committed
Merge pull request #2912 from nonumber/patch-6
betweenbrain
committed
Updating installation lang files: ar-AA, bg-BG, sw-KE, tr-TR
infograf768
committed
Add postinstall message informing of PHP version change in 3.3. Thanks
infograf768
committed
Merge pull request #2802 from mbabker/phpUpdateLib
infograf768
committed
Missing lang string from #2802
infograf768
committed
Merge pull request #2883 from nonumber/patch-37
Thomas Hunziker
committed
Updating installation lang files: cs-CZ, da-DK, he-IL, id-ID, it-IT,
infograf768
committed
Merge remote-tracking branch 'origin/staging' into staging
infograf768
committed
Allow custom containers for Boostrap tooltips and popovers.
Denitz
committed
Simplified.
Denitz
committed
[CODE STYLE] Several issues in com_categories and JFormFieldHelpsite

Gunjan Patel
authored and
Bakual
committed
Changed tabs to spaces.
Denitz
committed
Updating installation lang files: af-ZA, bs-BA, pl-PL
infograf768
committed
Copyright
infograf768
committed
Merge pull request #2830 from piotrmocko/patch-11
infograf768
committed
Updating installation lang files: lv-LV
infograf768
committed

Commits on Jan 30, 2014

[CODE STYLE] Various com_banners & com_admin fixes

Peter van Westen
authored and
phproberto
committed
[code style] fix com_banners admin controllers
phproberto
committed
[Code Style] DocBlock fixes and improvements. Fix #2951, fix #2952

Chris Davenport
authored and
phproberto
committed
Fixing 'Trying to get property of non-object' error in JUpdaterExtension
mbabker
committed
Merge pull request #2953 from phproberto/cs-01
javigomez
committed
Committing new lang string from PR #2497
infograf768
committed
Updating en-GB xml(s) version
infograf768
committed
Updating installation lang files: ca-ES, es-ES, et-EE, hr-HR, sy-IQ
infograf768
committed
Merge pull request #2776 from SergeyLitvinov/patch-1
mbabker
committed
[Code Style] DocBlock and comment fixes and improvements.
Chris Davenport
committed

Commits on Jan 31, 2014

Commits on Feb 1, 2014

[Code Style] DocBlock and comment fixes and improvements.Fix #3002. Fix #3003. Fix #3004. Fix #3005. Fix #3006. Fix #3007. Fix #3008. Fix #3009. Fix #3010. Fix #3011. Fix #3019

Chris Davenport
authored and
phproberto
committed
[bug] [33217] Administrator can't edit component options, Fix 3020

compojoom
authored and
Bakual
committed
Updating installation lang files: de-DE, fa-IR, zh-TW
infograf768
committed

Commits on Feb 2, 2014

[#33044] JHelperContent::getActions() function improvements. Fix #2728

sanderpotjer
authored and
phproberto
committed

Commits on Feb 3, 2014

[CodeStyle] Make Jenkins happy
Bakual
committed
[imp] *Adapt language to new user language for mail message when

phproberto
authored and
infograf768
committed
Merge pull request #3014 from Denitz/33209
infograf768
committed
Merge pull request #2811 from piotr-cz/patch_updatesversion
infograf768
committed
[#33088] Incorrect order of copyright notice in Isis admin template

Tobias Zulauf
authored and
infograf768
committed
Merge remote-tracking branch 'origin/staging' into staging
infograf768
committed
[bug] [33212] Incorrect table ordering value for Status column in plugins manager

Denitz
authored and
Bakual
committed
[CodeStyle] backend banners, Fix #3021, Fix #3022

phproberto
authored and
Bakual
committed
[imp] [32983] Remove the double scrollbar at the batch modals, Fix #2844

zero-24
authored and
Bakual
committed
[CodeStyle] Make Jenkins happy again
Bakual
committed
Merge pull request #3013 from mbabker/noImagesOnUpdate
mbabker
committed
Update data is a stdClass in JUpdate (Ref #2802)
mbabker
committed

Commits on Feb 4, 2014

Commits on Feb 5, 2014

Check if $module is an object
Thomas Hunziker
committed
Adding checks for properties and logging the error.
Bakual
committed

Commits on Feb 6, 2014

Commits on Feb 7, 2014

Update default.php
eino-makitalo
committed
Fixing codestyle
Hackwar
committed
Fixing codestyle
Hackwar
committed

Commits on Feb 8, 2014

[bug] Regression: Add deprecating support for removed components getActions method. Fix #3061

sanderpotjer
authored and
Bakual
committed
[CODE STYLE] Several Codestyle fixes. Fix #3028, Fix #3029, Fix #3030, Fix #3031, Fix #3032, Fix #3033, Fix #3034, Fix #3035, Fix #3036, Fix #3037, Fix #3040, Fix #3041, Fix #3042, Fix #3043

Gunjan Patel
authored and
Bakual
committed
Pleasing Jenkins
Bakual
committed
Fix "Error displaying the error page: Application Instantiation Error" Error
elkuku
committed

Commits on Feb 9, 2014

[bug] [33254] Broken categories ordering, fix #3080

bembelimen
authored and
Bakual
committed

Commits on Feb 13, 2014

Commits on Feb 14, 2014

Commits on Feb 16, 2014

Show alias or note next to item title
Marko D
committed
Update default.php
Marko D
committed
Show alias next to banner title in the backend
Marko D
committed

Commits on Feb 17, 2014

Commits on Feb 18, 2014

Merge pull request #3117 from zero-24/patch-5
infograf768
committed
Removing a leftover </span>
Thomas Hunziker
committed

Commits on Feb 19, 2014

Commits on Feb 21, 2014

Commits on Feb 27, 2014