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

Merge image file diffs from the platform. #16

Merged
merged 1 commit into from
Nov 9, 2011

Conversation

realityking
Copy link
Contributor

No description provided.

@dextercowley dextercowley merged commit 7af4d5b into joomla:master Nov 9, 2011
andreatarr pushed a commit to andreatarr/joomla-cms that referenced this pull request Sep 15, 2012
Add dl for article info to other content layouts
wilsonge referenced this pull request in wilsonge/joomla-cms Apr 5, 2013
Modal to check each extension's compatability
infograf768 pushed a commit that referenced this pull request Aug 7, 2014
@maxdel85 maxdel85 mentioned this pull request Mar 6, 2015
@Thovt Thovt mentioned this pull request Sep 22, 2015
rdeutz pushed a commit that referenced this pull request Apr 25, 2016
rdeutz pushed a commit that referenced this pull request Sep 5, 2016
* add updateMeFirst coding

* add the language file

* add language and disable live update than

* click here to update

* lang string again

* simplified it a bit (#16)

* language fix

* add new view

* language fix

* im your friend travis
wilsonge pushed a commit that referenced this pull request May 31, 2017
* codestyle

* code style

* codestyle

* codestyle

* codestyle

* thanks @wojsmol

* corrections - thanks @Quy

* corrections - thanks @Quy

* oops

* make @Quy happy

* Update article.xml

* Remove space

* Update config.xml (#14)

* Update filter.xml (#15)

* Update config.xml (#16)

* Update profile.xml (#17)

* Update application.xml (#18)

* Update article.xml (#19)

* Update filter_articles.xml (#20)

* Update config.xml (#24)

* Update config.xml (#23)

* Update filter_fields.xml (#22)

* Update filter_featured.xml (#21)

* Update override.xml (#25)

* Update config.xml

* Update config.xml (#26)

* Update itemadmin_alias.xml (#30)

* Update itemadmin.xml (#29)

* Update item.xml (#27)

* Update item_alias.xml (#28)

* Update itemadmin_url.xml (#31)

* Update module.xml (#32)

* Update plugin.xml (#33)

* Update config.xml (#34)

* Update link.xml (#35)

* Update config.xml (#36)

* Update style.xml (#38)

* Update config.xml (#37)

* Update note.xml (#42)

* Update group.xml (#41)

* Update filter_debuggroup.xml (#40)

* Update config.xml (#39)

* corrections for @andrepereiradasilva

* gotya
alexandraciobica pushed a commit to alexandraciobica/joomla-cms that referenced this pull request Aug 6, 2018
anuragteapot added a commit to anuragteapot/joomla-cms that referenced this pull request Aug 26, 2018
Find changed files of overridden files and show message.
laoneo pushed a commit that referenced this pull request Sep 6, 2018
* Load correct core files of override files (#2)

Start implements loadcorefile() in administrator/components/com_templates/Model/TemplateModel.php

* CS (#3) Coding Standards

* codingstandards

* codingstandards (#4)

* Test (#6)

Phase 2 (2 part) Mechanism to find correct core file and implementation.

* Remove Notice: Only available for html-folder

* Remove Warning if core file not found (#11)

Thanks.
So one part of the issue joomla-projects/gsoc18_override_management#12 is done.

* Implement the diff view in template manager 

Implement the diff view in template manager

* coding standard (#17)

* fix diff (#18) Fix bug in path in case of administrator template override.

Fix bug in path in case of administrator template override.

* Notification after update and TEST (#16)

Find changed files of overridden files and show message.

* coding standard (#21)

* correction

* correction (#26)

* Correcthtmlpath (#27)

* correction

* change oldhtml to newhtml

* List of updated override files. (#30)

* addcss (#34)

* Final Product  (#39)

Core and Diff view
Updated override history list.
Quick icon notification plugin.
Override control plugin.

* save 3 lines :)

* New feature show status. (#47)

show status in com_template view templates

* link

* corrected namespace

* Button to Switch (#35)

* wip add Switcher

* wip style switcher

* wip style switch make inline and change on off text

* wip start with js

* wip js

* wip delete buttons and make js more robust

* wip save to storage

* wip delete old code

* wip

* wip lint

* wip css

* set default value for switcher

* wip make switcher blue

* wip

* wip

* build

* correct names

* create new functions

* fist test code

* use onchange

* undo installer.min.js

* add forgotten new line at the end of css file

* correct align

* correct compare.es6 - only deleted the toggle part

* correct compare.js - only deleted the toggle part

* wip

* reduce timeout

* wrap in funcitons

* wip

* add use strict to both js-files(compare and toggle)

* add the timeout value of 500 again, because 200 are not enought in my case

* use css class 'active' for toggle views

* add strict

* time out for editor

* wip

* improvments use newActive and switch

* correction

* width of switcher-spans

* correct align

* do not use global

* wip

* removed timeouts

* JTEXT to TEXT

* forgotton last line

* deleted duplicated comments

* css fix align

* use unnamed functions in es6

* Sql files for fix database (#50)

* sql files for database fix

* delete space

* Suggestion for displaying Dates in view updates files (#52)

Correct Dates and do not use date of file any more

* Store Date as UTC and show it in server time zone (#57)

* modified and created date are created and stored in UTC

* convert dates for displaying in model

* spar a loop

* normalize timezone in view

* use language constants for dateformat

* JToolbarHelper to ToolbarHelper

* CS

* namespace

* plural

* name

* clean

* text

* fx

* sin

* files

* s

* Suggestion for language strings (#60)

* language strings

* correct typo

* delete media folder plg_quickicon

* add folder plg_quickicon to build/media_src

* delete files in media folder

* Move media folder - System (#66)

* multi

* cs

* delete files in media folder for joomla toolbar (#67)

* Fix button switchers style. (#70)

* button

* CS

* changed uitab.addTab for updated files

* Bring back core.js changes. (#69)

* core.js

* const

* fix

* form

* core

* hound

* CS

* scopr

* grid

* alpha

* cs

* lang

* only override file

* lang

* override lang installer

* Cs

* sub

* Update list of core extensions (#71)

* Language changes (#76)

* update

* Update en-GB.com_templates.ini

* override JLIB_HTML_PUBLISH_ITEM

this is the hover text on the publish icon in the list of files

* Change icon (#74)

change the icon to use an outline for more consistency

* lang

* not core (#75)

* not core

* Update en-GB.plg_installer_override.ini

* namespace

* cs

* Updated files (#82)

* Update default_updated_files.php

* Update en-GB.com_templates.ini

* Update en-GB.com_templates.ini (#81)

* Update en-GB.plg_quickicon_overridecheck.ini (#80)

* Update en-GB.plg_quickicon_overridecheck.ini (#79)

* remove space (#78)

* Update en-GB.plg_quickicon_overridecheck.ini

* Update en-GB.plg_quickicon_overridecheck.sys.ini

* remove hardcoded id

* null get function

* state

* clean

* More changes "core" to "original" (#85)

* cs

* update

* plural
continga pushed a commit to continga/joomla-cms that referenced this pull request Sep 24, 2018
This is the 1st commit message:

First WIP version of supporting nested subforms.

This is the commit message joomla#2:

Fix nested subforms not getting correct name attribute on input fields.

This is the commit message joomla#3:

Fix subform rows having invalid index, fix small typo.

This is the commit message joomla#4:

Replace the unique subform id via random bytes by just an increasing integer in the fields type rendering process.

This is the commit message joomla#5:

Implement feedback from PR at Joomla;
- Use a <template> HTML element for the template of the subform rows,
  not a url encoded string inside of a <script> element.
- Fix code style errors reported by phpcs.
- Make the fixing of the unique attributes (name, id, etc) of input elements
  of nested subform rows more errorprone, using the same method as the main
  subform row.
- Manually add a minified version of the javascript file.

This is the commit message joomla#6:

Fix failing javascript tests due to changed structure of subform repeatable template container.

This is the commit message joomla#7:

Change subform repeatable javascript test to correctly check on
0-indexed rows, previously they have been 1-indexed.

This is the commit message joomla#8:

Fix a problem where multi-level subforms on the same level doesnt trigger their template correctly.
Additionally added a note why the fixScripts() method is broken and how it could get better.

This is the commit message joomla#9:

First commit which integrates the subform custom field type.

This is the commit message joomla#10:

Rename manifest file for plg_fields_subform

This is the commit message joomla#11:

plg_fields_subform: Improve code comments and made the subform field type optionally non-repeatable.

This is the commit message joomla#12:

Fix not being able to change the type of a subfield.

This is the commit message joomla#13:

Implement a small in-memory renderCache for subform custom fields

This is the commit message joomla#14:

Prepare to load the subfields into a subform custom field directly via their own xml definition.

This is the commit message joomla#15:

After merge with PR joomla#17552 we can now successfully show the subforms options for the different types.

This is the commit message joomla#16:

The subform custom field type doesnt need a default value.

This is the commit message joomla#17:

Implement an option for a subform customfield to disable rendering the field values.

This is the commit message joomla#18:

Remove unused code and set hidden fields to not-required.

This is the commit message joomla#19:

Reset for dev
bembelimen pushed a commit that referenced this pull request Dec 16, 2021
* Add some events when fetching media data

* Use dispatcher to trigger event

* Use an event instance

* Class per event (#15)

* Argument validations and getter (#16)

* Class per event

* Argument validations

* global

* Use result from events

* Copy year

* Use internal variable

* void

* adapt model

* Validate events (#17)

* Revert commit ec8b4c8 ccd02cb and 9a2a119

* Validate and immutable events

* Update administrator/components/com_media/src/Event/FetchMediaFileEvent.php

Co-authored-by: Harald Leithner <leithner@itronic.at>

* Update administrator/components/com_media/src/Event/FetchMediaFilesEvent.php

Co-authored-by: Harald Leithner <leithner@itronic.at>

* Rename the events

* Cleanup events

Co-authored-by: Fedir Zinchuk <getthesite@gmail.com>
Co-authored-by: Harald Leithner <leithner@itronic.at>
obuisard pushed a commit to obuisard/joomla-cms that referenced this pull request Feb 21, 2023
shazmasiddiqui pushed a commit to shazmasiddiqui/joomla-cms that referenced this pull request Jul 12, 2023
SniperSister pushed a commit to SniperSister/joomla-cms that referenced this pull request Feb 12, 2024
LadySolveig pushed a commit to LadySolveig/joomla-cms that referenced this pull request Mar 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants