29
0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-07-01 01:23:43 +00:00
Commit Graph

128 Commits

Author SHA1 Message Date
garima-agal
49fc0805dc [imp] Batch process pop-up gets open even without selection. closes #4754. 2014-11-08 17:43:14 +01:00
Thomas Hunziker
45bc6e9a3d Merge branch 'staging' into 3.4-dev 2014-10-30 20:56:07 +01:00
Thomas Hunziker
21cf242924 [imp] Improve handling of "Date of Birth" (dob) infotext in user
profile plugin #4103
2014-10-28 08:03:27 +01:00
Michael Babker
a07cd1186a Merge remote-tracking branch 'joomla/staging' into 3.4-dev 2014-10-17 05:18:09 -04:00
Thomas Hunziker
bd9edc2a98 Merge branch 'staging' into 3.4-dev
Conflicts:
	administrator/components/com_weblinks/views/weblink/tmpl/edit.php
	tests/unit/suites/finderIndexer/FinderIndexerTest.php
	tests/unit/suites/libraries/cms/application/JApplicationAdministratorTest.php
	tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
	tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageMainTest.php
2014-10-16 20:27:33 +02:00
Jean-Marie Simonet
df127e1320 Reverting #4284 as it doubles some tabs (see #4705) 2014-10-16 17:33:40 +02:00
Michael Babker
4d9d93c654 Merge remote-tracking branch 'joomla/staging' into 3.4-dev 2014-10-16 08:41:47 -04:00
Thomas Hunziker
51835169a2 Load core.js 2014-10-16 14:09:40 +02:00
Matt Thomas
8ab8606805 [fix] Restore support for rendering custom fieldsets on 'joomla.edit.params'. Fixes #4284
Retrieve all fieldsets instead of params and attribs only

Define ignore_fieldsets consistently

Add ignore_fieldsets

Code style

Further implementation of ignore_fieldsets

Restore options tabs in com_content

Update modal.php with related changes to restore support for rendering custom fieldsets when using JLayout 'joomla.edit.params'

Update modal.php with related changes to restore support for rendering custom fieldsets when using JLayout 'joomla.edit.params'
2014-10-16 03:46:51 +02:00
Thomas Hunziker
ae1e5ccedc Merge branch 'staging' into 3.4-dev
Conflicts:
	administrator/components/com_categories/models/fields/categoryedit.php
	administrator/components/com_installer/controllers/update.php
	administrator/components/com_installer/models/database.php
	administrator/components/com_installer/models/update.php
	administrator/components/com_joomlaupdate/models/default.php
	administrator/components/com_languages/models/override.php
	administrator/components/com_languages/models/overrides.php
	administrator/components/com_modules/controller.php
	administrator/components/com_plugins/models/plugin.php
	administrator/components/com_postinstall/models/messages.php
	administrator/components/com_redirect/helpers/redirect.php
	administrator/components/com_redirect/views/links/view.html.php
	administrator/components/com_weblinks/controller.php
	administrator/components/com_weblinks/controllers/weblink.php
	administrator/components/com_weblinks/controllers/weblinks.php
	administrator/components/com_weblinks/helpers/weblinks.php
	administrator/components/com_weblinks/models/weblink.php
	administrator/components/com_weblinks/models/weblinks.php
	administrator/components/com_weblinks/tables/weblink.php
	administrator/components/com_weblinks/views/weblink/view.html.php
	administrator/components/com_weblinks/views/weblinks/view.html.php
	components/com_contact/models/categories.php
	components/com_contact/models/category.php
	components/com_contact/views/category/view.html.php
	components/com_newsfeeds/models/categories.php
	components/com_newsfeeds/views/category/view.html.php
	components/com_weblinks/controller.php
	components/com_weblinks/controllers/weblink.php
	components/com_weblinks/helpers/association.php
	components/com_weblinks/helpers/category.php
	components/com_weblinks/helpers/icon.php
	components/com_weblinks/helpers/route.php
	components/com_weblinks/models/categories.php
	components/com_weblinks/models/category.php
	components/com_weblinks/models/form.php
	components/com_weblinks/models/weblink.php
	components/com_weblinks/router.php
	components/com_weblinks/views/categories/view.html.php
	components/com_weblinks/views/category/view.feed.php
	components/com_weblinks/views/category/view.html.php
	components/com_weblinks/views/form/view.html.php
	components/com_weblinks/views/weblink/view.html.php
	installation/application/web.php
	installation/model/database.php
	libraries/joomla/form/fields/repeatable.php
	libraries/joomla/form/rule/url.php
	libraries/joomla/linkedin/oauth.php
	libraries/joomla/mediawiki/http.php
	libraries/joomla/mediawiki/mediawiki.php
	libraries/joomla/mediawiki/object.php
	libraries/joomla/twitter/oauth.php
	plugins/finder/weblinks/weblinks.php
	plugins/search/weblinks/weblinks.php
2014-10-15 22:12:27 +02:00
Thomas Hunziker
22971cefdf Removing array_unique from parameter merging in searchtools 2014-10-13 21:58:37 +02:00
Seth Warburton
8317c0fb80 [imp] Make list of tags into a list ;). Fixes #4404
Signed-off-by: Seth Warburton <seth@internet-inspired.com>
2014-10-08 09:42:51 +02:00
Seth Warburton
17bddde2d0 [imp] Make list of tags into a list ;). Fixes #4404
Signed-off-by: Seth Warburton <seth@internet-inspired.com>
2014-10-08 08:47:58 +02:00
Roberto Segura - phproberto
b6d6f3a4df Merge remote-tracking branch 'staging' into 3.4-dev
Conflicts:
	administrator/manifests/files/joomla.xml
	libraries/cms/version/version.php
2014-10-02 03:29:01 +02:00
RolandD - roland-d
641241e43d [imp] Add collapsible sidebar. Fixes #4197
Move button before searchbox

Add tooltip

Fix remembering state. Simplify language string.

Layout fixes.

Updated icons, made them state aware. Updated language strings, made them state aware.

Updated icons, alpha ordered language file, added grey background to the sidebar.

Make the code abstract

Added check if localStorage is available. Added code change to compressed core.js.

Added toggle button to all views. Generated CSS files based on less generator.

Fixed toggle buttons on user views. Update template-rtl.less.

Fixed toggle button being activated on enter in filter field.

Moved button to the sidebar file. Added transition changes.

Cleanup banners

Cleanup banners

Further cleanup

Further cleanup

Simplify hiding the sidebar

Keep the button visible

Add missing empty line

Updated the sidepanel. Many thanks to @RemcoJanssen

Fixed Plugin view using the wrong div ID

Updated CSS for RTL languages

Change the icons used for closing and opening.

Updated CSS for RTL.
2014-10-02 03:00:09 +02:00
Michael Babker
ba627e03be Update references to JRegistry in installation, layouts, modules, and plugins folders. Fixes #4187 2014-09-04 15:42:17 -04:00
Buddhima
212c94761e Front End Module Editing Fixes #2521 2014-09-03 11:28:24 -04:00
modernmagic
47e43772a6 [imp] Make blog intro image link to article. Closes #4134 2014-08-31 20:07:27 +02:00
Thomas Hunziker
adcedc072f Merge branch 'staging' into 3.4-dev 2014-08-08 22:59:36 +02:00
zero-24
fa326e3e47 [imp][26123] Add alt text to category image. Closes #4081 2014-08-08 22:20:13 +02:00
zero-24
1d34e04fec [bug][34041] JToolbar Popup button modal icon class not customizable. Fixes #4075 2014-08-06 21:04:49 +02:00
Jean-Marie Simonet
e181d4183a [bug][32703] Forcing the alias tip to display below the label. Fixes #3997 2014-07-27 13:03:27 +02:00
Elijah Madden
1a0d94fac8 [imp][33921] Use layouts to render form field labels.
Closes #3868
2014-07-26 13:43:24 +02:00
Roberto - phproberto
abbcf5c217 [fix][33975] Not rendering attribs fieldset if params fieldset exist. Fixes #3927. Fixes #3928 2014-07-20 13:50:20 +02:00
Thomas Hunziker
fdca0f6181 Wrong Line Endings 2014-07-14 22:14:35 +02:00
Constantin Romankiewicz
a91f9f3efb [imp][33446] Moving the readmore button to layouts;
Closes #3702
2014-07-14 21:10:49 +02:00
Thomas Hunziker
6ddfcb1590 [fix] Mootools isn't used in the blog layout. Fixes #3697 2014-07-09 23:34:29 +02:00
zero-24
e2bcdf0a60 [imp] Change deprecated $app->getCfg() to $app->get() and some CS.
Close #3817, close #3815, close #3814
2014-06-30 21:36:29 +02:00
Robert Deutz
fcf77b51d2 [#31588] JLayout for the toolbar-separator isn't working (Fix #1686) 2014-06-01 09:48:21 -05:00
Viktor Vogel
e57a6231c1 [bug] [33602] Tags in com_content - Distinction between article and category tags; Fixes #3692 2014-05-31 22:48:27 +02:00
infograf768
08560a3521 Merge pull request #3048 from Bakual/FixFieldsetDescriptions
[#32958] Show fieldset descriptions in modules, menus, plugins parameters
2014-05-30 11:23:39 +02:00
Thomas Hunziker
8a9a7bf5a3 [imp] [33563] Make messages use JLayouts in Isis and Beez3; Closes #3406 2014-05-24 21:48:07 +02:00
Valentin Despa
8ea759a758 Fixed joomla.edit.details layout saves empty language
http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=32783&start=100
2014-05-17 22:49:53 +02:00
Bakual
2598acdb1f Moving the part to show fieldset descriptions from fieldset layout to params layout 2014-05-12 15:42:01 +02:00
Michael Babker
883006bcfa Merge remote-tracking branch 'joomla/staging' into 3.3-dev 2014-04-02 19:49:28 -05:00
Michael Babker
d6d300734d Merge pull request #3358 from Bakual/MicroDataContent
Hardcoded Microdata for com_content
2014-04-01 22:30:09 -05:00
Jean-Marie Simonet
69b49fb639 [bug] [#33490] Unwanted white space in system message div when empty
Close #3389
2014-04-01 10:06:31 +02:00
infograf768
9ff27970e2 Merge pull request #3363 from okonomiyaki3000/editor_buttons_as_layout
[#33512] Move the tinymce buttons layout to editors.buttons
2014-03-29 12:06:18 +01:00
Marko D
4e432eeee3 [imp] [33295] Adding the "showon" feature to JForm
Close #3379
2014-03-28 08:45:47 +01:00
Matt Thomas
bf5f239ac6 Removes hardcoded non-breaking space after span element in tags layout 2014-03-24 16:52:29 -04:00
Elijah Madden
a1504f5f45 Move the tinymce buttons layout to editors.buttons because tinymce is not the only editor. 2014-03-24 10:56:02 +09:00
Bakual
3d2d7cc050 layouts 2014-03-22 21:28:31 +01:00
George Wilson
3e3e013b07 Use non-deprecated methods for rendering fields 2014-03-20 19:51:09 +00:00
Elijah Madden
74a70d4021 [imp][#33197] Message as layout. Fix #2849
Message renderer test

deprecation warning when renderMessage() is used

remove a blank line

fixed indentation in layout file
2014-03-20 17:11:27 +01:00
George Wilson
ade08f1bab [imp] [33385] Move getControlGroups into a JLayout
Fix #3209
2014-03-18 21:55:45 +01:00
Bakual
ec13a4da79 Revert adding addslashes to the addtabscript layout 2014-03-11 11:12:56 +01:00
Jean-Marie Simonet
5a0cf22546 Bootstraps tabs strings not escaped and Wrong sprintf usage (Fix #3203) 2014-03-03 12:11:15 +01:00
Roberto Segura
9c3931d843 Merge pull request #3171 from wilsonge/repeat_fix
Ensure repeating field fieldsets aren't shown
2014-02-26 14:09:22 +01:00
Jonathan Cameron
15583582b1 [#33193] Content plugins cannot distinguish between category list title
and description (Fix #2842)
2014-02-26 10:51:46 +01:00
radiant-tech
60749a351a [fix] get show_tags from params. Fixes #3176
add show_tags as category parameter
2014-02-26 07:15:17 +01:00