Skip to content
Merged

. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
278 commits
Select commit Hold shift + click to select a range
5da7030
Add missing doc block info
wilsonge Dec 8, 2014
2d04def
We don't need this file anymore as we don't ship the index.html files…
zero-24 Dec 10, 2014
5963301
Create indexmaker.php
zero-24 Dec 10, 2014
8f19caa
remove invalid HTML in Category List when Table headings 'off'
khoaredweb Dec 15, 2014
941dc55
Remove <noscript> and <head> blocks from HTML. Plus new unit tests.
Dec 16, 2014
abc407d
Use built in JForm method to render fields
wilsonge Dec 22, 2014
d0f454b
Update renderfield.php
zero-24 Jan 4, 2015
0c2f15a
Fix Yubikey Template Override File Path
AbhishekDas Jan 4, 2015
33ce444
Fix Totp Template Override File Path
AbhishekDas Jan 4, 2015
d28720a
CodeMirror 4.10, suddenly urgent fix for FireFox
okonomiyaki3000 Jan 5, 2015
16ddac6
Merge pull request #5616 from okonomiyaki3000/CodeMirrorUpdate
wilsonge Jan 5, 2015
d239f9a
Merge pull request #5613 from AbhishekDas/patch-3
wilsonge Jan 5, 2015
376905d
Merge pull request #5612 from AbhishekDas/patch-2
wilsonge Jan 5, 2015
49d01c0
Make code more readable
wilsonge Jan 5, 2015
21822ad
Merge pull request #23 from wilsonge/patch-16
zero-24 Jan 5, 2015
3312890
Remove link from tooltip
brianteeman Jan 5, 2015
e66b635
Merge pull request #5621 from brianteeman/vim
rdeutz Jan 5, 2015
11504d0
Merge pull request #4342 from bembelimen/patch-18
wilsonge Jan 6, 2015
9ddd3a0
Merge pull request #5610 from zero-24/patch-8
infograf768 Jan 6, 2015
3b82ba6
Correcting language string (Fixes #5640 )
brianteeman Jan 8, 2015
5a334ff
Components tags, contact, newsfeed
brianteeman Jan 8, 2015
9ab05d2
Adding back the select box for mobile devices (Fixes #5627 )
zero-24 Jan 8, 2015
e6e9a08
admin module version
brianteeman Jan 8, 2015
a6ef72e
Site Articles Category Dynamic options
brianteeman Jan 8, 2015
9d7dc37
Admin menu module
brianteeman Jan 8, 2015
e391923
Merge pull request #5488 from wilsonge/config_form
infograf768 Jan 8, 2015
7eab512
Merge pull request #5448 from chrisdavenport/finder-parser-2
roland-d Jan 8, 2015
4545940
Fix `$hits_class` generation
zero-24 Jan 8, 2015
3097e86
use improved check
zero-24 Jan 8, 2015
b4a0cde
Use a proxy function to close modals. Fixes #3918.
okonomiyaki3000 Jul 18, 2014
65ee68b
Fix NULL dates on PostgreSQL. Fixes 3803
Jan 8, 2015
deb4958
mod articles category
brianteeman Jan 9, 2015
2cf23b9
Update default.php
zero-24 Jan 9, 2015
f20d47b
Routing: Implementing routing stages (Fix #5264)
Hackwar Jan 9, 2015
c93abae
Update tooltip to joomla 3 language from joomla 2.5
brianteeman Jan 9, 2015
25cc353
Standardizing the install paths for discover_install
mbabker Dec 31, 2014
8ac2697
Clear confusion over recaptcha key names (Fix #5593)
PhilETaylor Jan 9, 2015
53cf1dc
Merge pull request #5651 from brianteeman/modpos
wilsonge Jan 9, 2015
abc8b3a
Implement featured articles filter for article category/blog menu types.
roland-d Jan 9, 2015
60ede6c
Updated language file
roland-d Jan 9, 2015
84cd8b5
second attempt at replacing public private
brianteeman Jan 10, 2015
62d2a5f
Merge pull request #5656 from brianteeman/captcha2-
mbabker Jan 10, 2015
0df3a82
Update default.php
zero-24 Jan 11, 2015
5ff1e6d
Update default.php
zero-24 Jan 11, 2015
a3c1444
Update default.php
zero-24 Jan 11, 2015
fa2312e
Update default.php
zero-24 Jan 11, 2015
019c2a9
Update default.php
zero-24 Jan 11, 2015
830434a
Update default.php
zero-24 Jan 11, 2015
5cd8667
Update default.php
zero-24 Jan 11, 2015
ace68a9
Update default.php
zero-24 Jan 11, 2015
3873520
Update default.php
zero-24 Jan 11, 2015
9dbd7f0
redirect manager word-break
brianteeman Jan 11, 2015
bce94d4
Update tag.php
zero-24 Jan 11, 2015
c8bd3d2
Standardized the update route for extension installs
mbabker Jan 11, 2015
6fcbf37
Fix regression with uninstall queries not being triggered
mbabker Jan 11, 2015
d3ca4b2
Merge pull request #5675 from zero-24/patch-27
infograf768 Jan 12, 2015
258e410
Wrap long (crazy idiotic long strings) as Article Titles (Fixes #5525 )
PhilETaylor Jan 12, 2015
d0fb1e0
Adding choice to only resize TinyMCE vertically
infograf768 Jan 12, 2015
449f84b
Compatibility with sites upgrading from 2.5
infograf768 Jan 12, 2015
248cfc3
Sort Template positions in drop down
Hackwar Jan 12, 2015
49a17d2
Sorting menutypes in the backend menu
Hackwar Jan 12, 2015
b87f5c5
Codestyle
Hackwar Jan 12, 2015
a70a966
Need to proxy discover_install into install for database transactions
mbabker Jan 12, 2015
d18e856
Language changes
mbabker Jan 12, 2015
0309abd
Break word for disabled functions
brianteeman Jan 12, 2015
75dc05d
Fixing notice
Hackwar Jan 12, 2015
6342ceb
Fix alignment of number of hits under Hits column
pe7er Jan 12, 2015
16186da
Fix for Page Navigation Plugin on User Auth View
pe7er Jan 13, 2015
e719b0a
CodeMirror 4.11
okonomiyaki3000 Jan 13, 2015
f2e1c95
Merge pull request #5680 from infograf768/tiny_horizontal
infograf768 Jan 13, 2015
7179b53
Modules Manager: Normalizing Trash/Batch position
infograf768 Jan 13, 2015
d96230f
Adding Hathor support and making sorting case-insensitive
Hackwar Jan 13, 2015
226620c
Removing locale parameter again
Hackwar Jan 13, 2015
a1a516e
Media manager: hide the Up button when in base directory
infograf768 Jan 13, 2015
02d7f3e
Same issue for the details view
infograf768 Jan 13, 2015
48a5387
making Travis Happy.
infograf768 Jan 13, 2015
7ce3819
Fix #2 for Page Navigation Plugin - User Auth View
pe7er Jan 13, 2015
33f46d5
Update to TinyMCE 4.1.7
wilsonge Jan 13, 2015
9fe2862
Menu Sort
brianteeman Jan 13, 2015
b835d78
Merge pull request #5698 from pe7er/patch-3
Kubik-Rubik Jan 13, 2015
bf29c73
Set the correct route for JInstaller's update method
mbabker Jan 13, 2015
ceb78ff
Merge pull request #5707 from wilsonge/tinymce
Kubik-Rubik Jan 13, 2015
312f29c
Merge pull request #5700 from okonomiyaki3000/CodeMirrorUpdate
Kubik-Rubik Jan 13, 2015
2dd4eed
update hathor to use rss feed
dgrammatiko Jan 13, 2015
cbb964b
Standardise on < br / > in php - code style
brianteeman Jan 13, 2015
93ba048
CS +copy paste errors
dgrammatiko Jan 13, 2015
3f4e6fe
Use https + minor cs
dgrammatiko Jan 13, 2015
fd0e8fa
CS
dgrammatiko Jan 13, 2015
6fff537
Change date format for User Note review
brianteeman Jan 13, 2015
4a4873f
changed docs.joomla.org links in libaries to https
J0WI Jan 13, 2015
4ed3b6d
changed docs.joomla.org links in sample data to https
J0WI Jan 13, 2015
649f72e
changed docs.joomla.org links in BE to https
J0WI Jan 13, 2015
d84f5c7
changed docs.joomla.org links in components to https
J0WI Jan 13, 2015
d5e8c63
changed docs.joomla.org links in tests to https
J0WI Jan 13, 2015
1e0a9c0
changed docs.joomla.org links in build to https
J0WI Jan 13, 2015
e6287a9
use https on demo.joomla.org
J0WI Jan 13, 2015
969fdae
Merge pull request #5718 from J0WI/https-demo
mbabker Jan 13, 2015
8045b8a
Smart Search Module Name
brianteeman Jan 14, 2015
4c25824
Merge pull request #5713 from brianteeman/break-standardise
wilsonge Jan 14, 2015
b3f140a
Merge pull request #5712 from dgt41/_hathor_msg_override_upd
wilsonge Jan 14, 2015
56edc55
Merge pull request #5701 from infograf768/modulestoolbar
wilsonge Jan 14, 2015
a4fe917
Merge pull request #5704 from infograf768/media_up
wilsonge Jan 14, 2015
7260807
Correct PHP strict error in JMediawikiHttp
mbabker Jan 14, 2015
a6dcfec
textarea resize control and mass mail
brianteeman Jan 14, 2015
b545d3d
Merge pull request #5683 from Hackwar/backendmenuordering
infograf768 Jan 14, 2015
bf6a381
Merge pull request #5715 from brianteeman/menusort
infograf768 Jan 14, 2015
924d664
Added the missing a close tag
rdeutz Jan 14, 2015
2a6b085
Adding Hindi hi-IN to installation languages
infograf768 Jan 14, 2015
98ec4c1
Merge pull request #5696 from pe7er/patch-1
roland-d Jan 14, 2015
91beaca
Update names of Article and Tag modules
brianteeman Jan 14, 2015
e8f3d6a
Merge pull request #5720 from mbabker/mediawikiStrict
wilsonge Jan 14, 2015
5ed4ad7
Fix wrong trash dropdown item
cyrez Jan 15, 2015
28c1fc7
Merge branch 'master' into validationjs-performance
Fedik Jan 15, 2015
d21f90a
FIX: #5732
vzenix Jan 15, 2015
da813ef
use strict
Fedik Jan 15, 2015
61d3161
remove unused
Fedik Jan 15, 2015
82ac095
Update tags.php
vzenix Jan 15, 2015
9f6af00
update minified version
Fedik Jan 15, 2015
f6f6325
Merge pull request #5730 from JoomliC/patch-9
infograf768 Jan 15, 2015
78c72d7
Media Manager: Displaying the path to the opened folder (Fixes #5722)
infograf768 Jan 15, 2015
42e8b6e
fix cancel action on the global configuration page
Fedik Jan 15, 2015
f312ccb
Module Manager: adding option to filter by all statuses (Fixes #5735)
infograf768 Jan 15, 2015
e5991f1
Update default_message.php (Fix #5729)
zero-24 Jan 14, 2015
4c5f84b
Update site.xml Fixes #5727
zero-24 Jan 14, 2015
eb48c27
Merge pull request #5723 from rdeutz/fix-miss-a-tag-in-contenthistory…
roland-d Jan 15, 2015
e320ac2
Adding language string Alternative Layout dropdown
pe7er Jan 15, 2015
04d8454
Cache Time was missing
pe7er Jan 15, 2015
7f5fcee
Module Popular Tags - missing "Cache Time"
pe7er Jan 15, 2015
5888f8b
Module Similar Tags - missing "Cache Time"
pe7er Jan 15, 2015
3c7048b
Merge pull request #5738 from Fedik/fix-config-cancel
rdeutz Jan 15, 2015
315de38
Merge pull request #5733 from vzenix/patch-1
rdeutz Jan 15, 2015
b07df4a
Merge pull request #5725 from brianteeman/module-name
rdeutz Jan 15, 2015
2aa6219
Merge pull request #5721 from brianteeman/resize
rdeutz Jan 15, 2015
d3cb3bc
Merge pull request #5742 from pe7er/patch-4
rdeutz Jan 15, 2015
5fec54d
Merge pull request #5719 from brianteeman/smart-search-module
rdeutz Jan 15, 2015
1e3eb59
Merge pull request #5717 from J0WI/https-docs
rdeutz Jan 15, 2015
421a398
Merge pull request #5714 from brianteeman/usernotedate
rdeutz Jan 15, 2015
c684bc3
Merge pull request #5697 from brianteeman/sysinfoword-break
rdeutz Jan 15, 2015
a14caed
Merge pull request #5682 from Hackwar/modulepositionordering
rdeutz Jan 15, 2015
336cdc6
Merge pull request #5679 from brianteeman/redirect-wrap
rdeutz Jan 15, 2015
8baa31e
Merge pull request #5673 from zero-24/patch-26
rdeutz Jan 15, 2015
f995e19
Merge pull request #5672 from zero-24/patch-20
rdeutz Jan 15, 2015
fee0ab0
Merge pull request #5671 from zero-24/patch-19
rdeutz Jan 15, 2015
9228ed6
Merge pull request #5670 from zero-24/patch-18
rdeutz Jan 15, 2015
f352c46
Merge pull request #5669 from zero-24/patch-17
rdeutz Jan 15, 2015
5565e18
Merge pull request #5667 from zero-24/patch-15
rdeutz Jan 15, 2015
a627e1a
Merge pull request #5666 from zero-24/patch-14
rdeutz Jan 15, 2015
54af393
Merge pull request #5653 from roland-d/featured-article-menu
rdeutz Jan 15, 2015
aca43b3
Merge pull request #5646 from zero-24/patch-8
rdeutz Jan 15, 2015
70501aa
Merge pull request #5645 from brianteeman/select
rdeutz Jan 15, 2015
4a2fd82
Merge pull request #5149 from phproberto/kirapwn-4718
rdeutz Jan 15, 2015
7c0dd93
Merge pull request #5383 from zero-24/patch-1
rdeutz Jan 15, 2015
13fc387
Smart Search Module,Consistency with Search Module
pe7er Jan 15, 2015
c31c2ea
Module typo sample testing data
brianteeman Jan 16, 2015
774af66
Merge pull request #5748 from brianteeman/model
wilsonge Jan 16, 2015
e9d179f
Fix: Extension Manager: Install Languages:: Display the 'No matching
zero-24 Jan 16, 2015
3ff3a17
[imp] Improve font rendering in OSX
nternetinspired Jan 16, 2015
f6623ce
[imp] Adds rendering loveliness to Hathor and Beez
nternetinspired Jan 16, 2015
e806342
Merge pull request #5755 from nternetinspired/Improve-font-rendering
infograf768 Jan 16, 2015
62c494d
Merge pull request #5677 from mbabker/UpdateInstallAdapter
infograf768 Jan 16, 2015
5a3381d
Update cookie.php
zero-24 Jan 16, 2015
a4b9b3c
Update cookie.xml
zero-24 Jan 16, 2015
f39ae2c
Update gmail.php
zero-24 Jan 16, 2015
33ebc2a
Update gmail.xml
zero-24 Jan 16, 2015
156b9a5
Update joomla.php
zero-24 Jan 16, 2015
721fe7b
Merge pull request #5759 from zero-24/patch-8
wilsonge Jan 16, 2015
b084285
Merge pull request #5230 from wilsonge/patch-25
rdeutz Jan 16, 2015
126b600
Fix notice in mod_related_items on line 138
waader Jan 16, 2015
b4ffbb2
Cache and checkin menu
brianteeman Jan 16, 2015
e3f0666
codestyle
brianteeman Jan 16, 2015
366dad2
Merge pull request #5768 from brianteeman/cachemenu
roland-d Jan 16, 2015
abbc324
Merge pull request #4252 from bembelimen/patch-13
roland-d Jan 16, 2015
2d80b07
Merge pull request #4435 from Fedik/validationjs-performance
roland-d Jan 16, 2015
47e5025
Merge pull request #4480 from purplebeanie/fix/calendar-overrides-set…
roland-d Jan 16, 2015
bb2b2d9
Merge pull request #5747 from pe7er/patch-8
roland-d Jan 17, 2015
0712954
Small cs Fixes #5757
Jan 16, 2015
ddcd189
Smart Search: Fixes "Expand Advanced Search" option Fixes #5463
smz Dec 18, 2014
a15b28e
Change "protect" state of Plugin editors-xtd "Button - Article" Fixes…
pe7er Jan 17, 2015
b1530aa
Update en-GB.com_installer.ini
zero-24 Jan 17, 2015
5bd8520
Correct UTC Date/Time in Versioning Modal Fixes 5774
pe7er Jan 17, 2015
2b5f285
Merge branch 'patch-9' into staging
roland-d Jan 17, 2015
e78ea38
UI/UX Review for com_redirect on mobile devices Fixes #5783
zero-24 Jan 17, 2015
49951dd
Merge branch 'patch-17' into staging
roland-d Jan 17, 2015
1d71e9f
Removed Automatic title option from 4 Administrator Modules
Jan 17, 2015
ba2fc15
Update browser.php
zero-24 Jan 17, 2015
e319eb8
Merge pull request #5791 from zero-24/patch-17
mbabker Jan 17, 2015
bbd7456
plg_user_joomla,
Jan 17, 2015
86713eb
Merge pull request #5789 from pe7er/automatic-title
Kubik-Rubik Jan 17, 2015
062549a
Merge pull request #5767 from waader/patch-5
Kubik-Rubik Jan 17, 2015
bf35ff0
Merge pull request #5744 from pe7er/patch-5
Kubik-Rubik Jan 17, 2015
d11ecad
Merge pull request #5745 from pe7er/patch-6
Kubik-Rubik Jan 17, 2015
43b882e
Merge pull request #5746 from pe7er/patch-7
Kubik-Rubik Jan 17, 2015
d2cc2e4
Merge pull request #5794 from anibalsanchez/bug-fix-5765
Kubik-Rubik Jan 17, 2015
fca3577
Merge pull request #4722 from khoaredweb/fix_4445
rdeutz Jan 17, 2015
2f7887d
mod_banners count integer to text
Jan 18, 2015
46e193c
Merge pull request #5301 from pe7er/patch-32
wilsonge Jan 18, 2015
f1db45f
Merge pull request #5298 from pe7er/patch-31
wilsonge Jan 18, 2015
76809e5
Merge pull request #4877 from pe7er/patch-6
wilsonge Jan 18, 2015
dff6478
Merge pull request #4875 from pe7er/patch-4
wilsonge Jan 18, 2015
9b4d16a
Merge pull request #4876 from pe7er/patch-5
wilsonge Jan 18, 2015
50bb35c
Hex colors
brianteeman Jan 18, 2015
0e0b8c8
Allow only numbers in that field
Jan 18, 2015
18d296d
mod_banners count integer to text and validate-numeric
Jan 18, 2015
306f92a
Merge pull request #1 from dgt41/patch-1
pe7er Jan 18, 2015
e06af89
Merge pull request #5805 from brianteeman/hex
Kubik-Rubik Jan 18, 2015
e44c1e2
removed double validate-numeric class
Jan 18, 2015
4a64ee5
added server side check filter=integer
Jan 18, 2015
226b22d
Merge pull request #5804 from pe7er/mod_banners-count
Kubik-Rubik Jan 18, 2015
66bfdcd
Merge pull request #5784 from zero-24/patch-13
infograf768 Jan 18, 2015
5128b07
No image selected on delete
brianteeman Jan 18, 2015
38aa44d
Merge pull request #5808 from brianteeman/mediamanager
Kubik-Rubik Jan 18, 2015
baeeffa
module assignment
brianteeman Jan 18, 2015
922d654
Fixes and extends JHtmlBootstrap::renderModal() Fixes #5087
smz Jan 19, 2015
a721653
Fixes and extends JHtmlBootstrap::renderModal() Add missing layout fi…
smz Jan 19, 2015
d8f7de3
Revert "No image selected on delete"
Kubik-Rubik Jan 19, 2015
3286629
Merge pull request #5818 from joomla/revert-5808-mediamanager
Kubik-Rubik Jan 19, 2015
4532888
Media Manager No item selected
brianteeman Jan 19, 2015
fceaf38
Merge pull request #5821 from brianteeman/no-item-selected
Kubik-Rubik Jan 19, 2015
54d0dd4
Toggle Featured
brianteeman Jan 19, 2015
243f9ac
Update en-GB.com_modules.ini
brianteeman Jan 19, 2015
ed42e85
Merge pull request #5813 from brianteeman/select
wilsonge Jan 19, 2015
d213ef1
Activate the hidden option 'log category mode' since JLog supports th…
okonomiyaki3000 Oct 15, 2013
5f7f691
Added a 'No matches found' div for Modules::Login::Menu Assignment; d…
Jan 16, 2015
e2c70c3
Merge pull request #4932 from RCheesley/menu-external-url-alias-missing
roland-d Jan 19, 2015
d319935
Use HTML 5 input attributes when possible Fixes #5453
larsgrefer Dec 17, 2014
2e971fe
beez css changes
brianteeman Jan 20, 2015
3942b8c
Merge pull request #5829 from brianteeman/beez
wilsonge Jan 20, 2015
6aed5c2
rename system cache plugin
brianteeman Jan 20, 2015
0f6217f
Merge pull request #5761 from zero-24/patch-15
rdeutz Jan 20, 2015
8507421
Merge pull request #5760 from zero-24/patch-14
rdeutz Jan 20, 2015
58ce78b
Merge pull request #5823 from brianteeman/toggle
rdeutz Jan 20, 2015
54a95bd
[imp] Conatcts Manager: Adding class hastooltip to the
infograf768 Jan 20, 2015
a1b2983
Merge pull request #5831 from brianteeman/cacheplugin
roland-d Jan 20, 2015
67fd61f
New Post Install Message for Robots
brianteeman Jan 20, 2015
d173a09
The Debug Permissions Report don't work correct on Joomla 3.x (Fix #4…
mbabker Jan 21, 2015
46109be
Add class table condensed
Jan 21, 2015
f9d0983
remove class nowrap
Jan 21, 2015
16a85b7
Merge pull request #21 from dgt41/patch-1
mbabker Jan 21, 2015
93cc4ef
Merge pull request #22 from dgt41/patch-2
mbabker Jan 21, 2015
389377c
Merge pull request #5835 from infograf768/contact-featured-tooltip
infograf768 Jan 21, 2015
239d5cf
Merge pull request #5841 from mbabker/userdebug
rdeutz Jan 21, 2015
93c09a3
Merge pull request #5838 from brianteeman/robtos
infograf768 Jan 21, 2015
01848e0
Merge pull request #3060 from javigomez/imp_system_tests
Kubik-Rubik Jan 21, 2015
d1b7c1a
Show proper line number for language debug
mbabker Jan 21, 2015
fad1f1f
Merge pull request #5858 from mbabker/langDebugLineNumber
infograf768 Jan 22, 2015
0862287
Last instance of finder
brianteeman Jan 22, 2015
76f08fc
Merge pull request #5866 from brianteeman/finder
Jan 22, 2015
331143d
Changed from application to config
Jan 22, 2015
f2980d1
Merge pull request #5867 from prasoon2211/issue5836_root_user_msg
Jan 22, 2015
f9cbc4b
add chosen to the debuggroup view Fixes #5845
zero-24 Jan 21, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Is Joomla! for you?
---------------------
* Joomla is [the right solution for most content web projects](https://docs.joomla.org/Joomla_Is_it_for_me%3F).
* View Joomla's core [features here](http://www.joomla.org/core-features.html).
* Try it out for yourself in our [online demo](http://demo.joomla.org).
* Try it out for yourself in our [online demo](https://demo.joomla.org).

How to find a Joomla! translation?
---------------------
Expand Down
2 changes: 1 addition & 1 deletion README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
3- Is Joomla for you?
* Joomla is the right solution for any content web project: https://docs.joomla.org/Joomla_Is_it_for_me%3F
* See Features - http://www.joomla.org/core-features.html
* Try out our online demo: http://demo.joomla.org/
* Try out our online demo: https://demo.joomla.org/

4- How to find a Joomla! translation?
* Repository of accredited language packs: http://community.joomla.org/translations.html
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UPDATE `#__extensions` SET `protected` = '0' WHERE `name` = 'plg_editors-xtd_article' AND `type` = "plugin" AND `element` = "article" AND `folder` = "editors-xtd";
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
(700, 'COM_CPANEL_MSG_ROBOTS_TITLE', 'COM_CPANEL_MSG_ROBOTS_BODY', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.3.0', 1);

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UPDATE "#__extensions" SET "protected" = '0' WHERE "name" = 'plg_editors-xtd_article' AND "type" = 'plugin' AND "element" = 'article' AND "folder" = 'editors-xtd';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
(700, 'COM_CPANEL_MSG_ROBOTS_TITLE', 'COM_CPANEL_MSG_ROBOTS_BODY', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.3.0', 1);
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UPDATE [#__extensions] SET [protected] = '0' WHERE [name] = 'plg_editors-xtd_article' AND [type] = "plugin" AND [element] = "article" AND [folder] = "editors-xtd";
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
SELECT 700, 'COM_CPANEL_MSG_ROBOTS_TITLE', 'COM_CPANEL_MSG_ROBOTS_BODY', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.3.0', 1;
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<td>
<?php echo JText::_('COM_ADMIN_DISABLED_FUNCTIONS'); ?>
</td>
<td>
<td class="break-word">
<?php echo JHtml::_('phpsetting.string', $this->php_settings['disable_functions']); ?>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<th width="1%" class="nowrap center hidden-phone">
<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th>
<th width="1%" class="hidden-phone">
<th width="1%" class="center">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th width="1%" class="nowrap center">
Expand Down Expand Up @@ -137,7 +137,7 @@
value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
<?php endif; ?>
</td>
<td class="center hidden-phone">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<table class="table table-striped">
<thead>
<tr>
<th width="1%" class="hidden-phone">
<th width="1%" class="center">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th width="5%" class="nowrap center">
Expand Down Expand Up @@ -99,7 +99,7 @@
$canChange = $user->authorise('core.edit.state', 'com_banners') && $canCheckin;
?>
<tr class="row<?php echo $i % 2; ?>">
<td class="center hidden-phone">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ class="form-validate">
<?php echo $field->input; ?>
<?php endforeach; ?>
<div class="clr"></div>
<button type="button" class="btn" onclick="this.form.submit();window.top.setTimeout('window.parent.Joomla.closeModalDialog()', 700);"><?php echo JText::_('COM_BANNERS_TRACKS_EXPORT'); ?></button>
<button type="button" class="btn" onclick="window.parent.Joomla.closeModalDialog();"><?php echo JText::_('COM_BANNERS_CANCEL'); ?></button>
<button type="button" class="btn" onclick="this.form.submit();window.top.setTimeout('window.parent.jModalClose()', 700);"><?php echo JText::_('COM_BANNERS_TRACKS_EXPORT'); ?></button>
<button type="button" class="btn" onclick="window.parent.jModalClose();"><?php echo JText::_('COM_BANNERS_CANCEL'); ?></button>

</fieldset>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<option value="desc" <?php echo $listDirn == 'desc' ? 'selected="selected"' : ''; ?>><?php echo JText::_('JGLOBAL_ORDER_DESCENDING'); ?></option>
</select>
</div>
<div class="btn-group pull-right">
<div class="btn-group pull-right hidden-phone">
<label for="sortTable" class="element-invisible"><?php echo JText::_('JGLOBAL_SORT_BY'); ?></label>
<select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
<option value=""><?php echo JText::_('JGLOBAL_SORT_BY'); ?></option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ protected function getInput()
$script[] = ' jQuery("#' . $this->id . '_clear").removeClass("hidden");';
}

$script[] = ' SqueezeBox.close();';
$script[] = ' jModalClose();';
$script[] = ' }';

// Clear button script
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class CategoriesTableCategory extends JTableCategory
*
* @return boolean True on success.
*
* @see http://docs.joomla.org/JTableNested/delete
* @see https://docs.joomla.org/JTableNested/delete
* @since 2.5
*/
public function delete($pk = null, $children = false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<th width="1%" class="nowrap center hidden-phone">
<?php echo JHtml::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th>
<th width="1%" class="hidden-phone">
<th width="1%" class="center">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th width="1%" class="nowrap center">
Expand Down Expand Up @@ -160,7 +160,7 @@
<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $orderkey + 1; ?>" />
<?php endif; ?>
</td>
<td class="center hidden-phone">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
JFactory::getDocument()->addScriptDeclaration('
Joomla.submitbutton = function(task)
{
if (task == "application.cancel" || document.formvalidator.isValid(document.getElementById("application-form")))
if (task === "config.cancel.application" || document.formvalidator.isValid(document.getElementById("application-form")))
{
Joomla.submitform(task, document.getElementById("application-form"));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
JFactory::getDocument()->addScriptDeclaration('
Joomla.submitbutton = function(task)
{
if (task == "config.cancel.component" || document.formvalidator.isValid(document.getElementById("component-form")))
if (task === "config.cancel.component" || document.formvalidator.isValid(document.getElementById("component-form")))
{
Joomla.submitform(task, document.getElementById("component-form"));
}
Expand Down
5 changes: 3 additions & 2 deletions administrator/components/com_contact/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -532,13 +532,14 @@
>
<field
name="filter_field"
type="list"
type="radio"
class="btn-group btn-group-yesno"
default="1"
description="JGLOBAL_FILTER_FIELD_DESC"
label="JGLOBAL_FILTER_FIELD_LABEL"
>
<option value="hide">JHIDE</option>
<option value="1">JSHOW</option>
<option value="hide">JHIDE</option>
</field>

<field name="show_pagination_limit" type="radio"
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_contact/helpers/html/contact.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,15 @@ public static function featured($value = 0, $i, $canChange = true)
{
// Array of image, task, title, action
$states = array(
0 => array('disabled.png', 'contacts.featured', 'COM_CONTACT_UNFEATURED', 'COM_CONTACT_TOGGLE_TO_FEATURE'),
1 => array('featured.png', 'contacts.unfeatured', 'JFEATURED', 'COM_CONTACT_TOGGLE_TO_UNFEATURE'),
0 => array('disabled.png', 'contacts.featured', 'COM_CONTACT_UNFEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
1 => array('featured.png', 'contacts.unfeatured', 'JFEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
);
$state = JArrayHelper::getValue($states, (int) $value, $states[1]);
$html = JHtml::_('image', 'admin/' . $state[0], JText::_($state[2]), null, true);

if ($canChange)
{
$html = '<a href="#" onclick="return listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" title="' . JText::_($state[3]) . '">'
$html = '<a class="hasTooltip" href="#" onclick="return listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" title="' . JText::_($state[3]) . '">'
. $html . '</a>';
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected function getInput()
$script[] = ' jQuery("#' . $this->id . '_clear").removeClass("hidden");';
}

$script[] = ' SqueezeBox.close();';
$script[] = ' jModalClose();';
$script[] = ' }';

// Clear button script
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<th width="1%" class="nowrap center hidden-phone">
<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
</th>
<th width="1%" class="hidden-phone">
<th width="1%" class="center">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th width="1%" style="min-width:55px" class="nowrap center">
Expand Down Expand Up @@ -168,7 +168,7 @@
value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
<?php endif; ?>
</td>
<td class="center hidden-phone">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
Expand Down
13 changes: 11 additions & 2 deletions administrator/components/com_content/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
</field>
<field
name="spacer4"
type="spacer"
Expand Down Expand Up @@ -444,7 +444,7 @@
extension="com_content"
view="category"
/>
<field
<field
name="show_category_heading_title_text"
type="radio"
class="btn-group btn-group-yesno"
Expand Down Expand Up @@ -834,6 +834,15 @@
<option value="0">JHIDE</option>
</field>

<field name="show_featured" type="list" default="show"
label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
description="JGLOBAL_SHOW_FEATURED_ARTICLES_DESC"
>
<option value="show">JSHOW</option>
<option value="hide">JHIDE</option>
<option value="only">JONLY</option>
</field>

</fieldset>

<fieldset name="integration"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ public static function featured($value = 0, $i, $canChange = true)

// Array of image, task, title, action
$states = array(
0 => array('unfeatured', 'articles.featured', 'COM_CONTENT_UNFEATURED', 'COM_CONTENT_TOGGLE_TO_FEATURE'),
1 => array('featured', 'articles.unfeatured', 'COM_CONTENT_FEATURED', 'COM_CONTENT_TOGGLE_TO_UNFEATURE'),
0 => array('unfeatured', 'articles.featured', 'COM_CONTENT_UNFEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
1 => array('featured', 'articles.unfeatured', 'COM_CONTENT_FEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
);
$state = JArrayHelper::getValue($states, (int) $value, $states[1]);
$icon = $state[0];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected function getInput()
$script[] = ' jQuery("#' . $this->id . '_clear").removeClass("hidden");';
}

$script[] = ' SqueezeBox.close();';
$script[] = ' jModalClose();';
$script[] = ' }';

// Clear button script
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
defined('_JEXEC') or die;

$script = 'function insertPagebreak() {' . "\n\t";

// Get the pagebreak title
$script .= 'var title = document.getElementById("title").value;' . "\n\t";
$script .= 'if (title != \'\') {' . "\n\t\t";
Expand All @@ -23,25 +24,25 @@
$script .= 'alt = "alt=\""+alt+"\" ";' . "\n\t";
$script .= '}' . "\n\t";
$script .= 'var tag = "<hr class=\"system-pagebreak\" "+title+" "+alt+"/>";' . "\n\t";
$script .= 'window.parent.jInsertEditorText(tag, \'' . $this->eName . '\');' . "\n\t";
$script .= 'window.parent.SqueezeBox.close();' . "\n\t";
$script .= 'window.parent.jInsertEditorText(tag, ' . json_encode($this->eName) . ');' . "\n\t";
$script .= 'window.parent.jModalClose();' . "\n\t";
$script .= 'return false;' . "\n";
$script .= '}' . "\n";

JFactory::getDocument()->addScriptDeclaration($script);
?>
<form class="form-horizontal">

<div class="control-group">
<label for="title" class="control-label"><?php echo JText::_('COM_CONTENT_PAGEBREAK_TITLE'); ?></label>
<div class="controls"><input type="text" id="title" name="title" /></div>
</div>

<div class="control-group">
<label for="alias" class="control-label"><?php echo JText::_('COM_CONTENT_PAGEBREAK_TOC'); ?></label>
<div class="controls"><input type="text" id="alt" name="alt" /></div>
<div class="controls"><input type="text" id="alt" name="alt" /></div>
</div>

<button onclick="insertPagebreak();" class="btn btn-primary"><?php echo JText::_('COM_CONTENT_PAGEBREAK_INSERT_BUTTON'); ?></button>

</form>
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<th width="1%" class="nowrap center hidden-phone">
<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th>
<th width="1%" class="hidden-phone">
<th width="1%" class="center">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th width="1%" style="min-width:55px" class="nowrap center">
Expand All @@ -103,7 +103,7 @@
<th width="10%" class="nowrap hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
</th>
<th width="10%">
<th width="1%" class="nowrap hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
</th>
<th width="1%" class="nowrap hidden-phone">
Expand Down Expand Up @@ -141,7 +141,7 @@
<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
<?php endif; ?>
</td>
<td class="center hidden-phone">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
Expand All @@ -162,7 +162,7 @@
</div>
</td>
<td class="has-context">
<div class="pull-left">
<div class="pull-left break-word">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
<?php endif; ?>
Expand All @@ -177,7 +177,7 @@
<?php else : ?>
<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
<?php endif; ?>
<span class="small">
<span class="small break-word">
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
</span>
<div class="small">
Expand Down Expand Up @@ -215,7 +215,7 @@
<td class="nowrap small hidden-phone">
<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
</td>
<td class="center">
<td class="center hidden-phone">
<?php echo (int) $item->hits; ?>
</td>
<td class="center hidden-phone">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<table class="table table-striped" id="articleList">
<thead>
<tr>
<th width="1%" class="hidden-phone">
<th width="1%" class="center">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th width="1%" style="min-width:55px" class="nowrap center">
Expand Down Expand Up @@ -97,7 +97,7 @@
$canChange = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin;
?>
<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid; ?>">
<td class="center hidden-phone">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
Expand Down
Loading