Joomla! Issue Tracker - CMS

Download
Launch
Feeling Lucky

[#21518] - [4.0] [Workflow] Fix merge conflicts

?
avatar wilsonge
wilsonge
10 Aug 2018

This core.js file here e1693bd#diff-e774050bb49303e3648065795d20a2d0 has been added - but it's currently in the .es6 file here https://github.com/joomla/joomla-cms/blob/4.0-dev/build/media_src/system/js/core.es6.js

As per @mbabker 's comment here I think we've also reintroduced a removed helper function here e1693bd#diff-ef08048c8ad27a319432b478ac0a8c54R109

@bembelimen this is a high priority issue please

avatar wilsonge wilsonge - open - 10 Aug 2018
avatar joomla-cms-bot joomla-cms-bot - change - 10 Aug 2018
Labels Added: ?
avatar joomla-cms-bot joomla-cms-bot - labeled - 10 Aug 2018
avatar wilsonge wilsonge - change - 10 Aug 2018
The description was changed
avatar wilsonge wilsonge - edited - 10 Aug 2018
avatar franz-wohlkoenig franz-wohlkoenig - change - 10 Aug 2018
Status New ⇒ Discussion
avatar franz-wohlkoenig franz-wohlkoenig - change - 10 Aug 2018
Category ⇒ com_workflow
avatar wilsonge wilsonge - change - 10 Aug 2018
Title
…
[4.0] [workflows] Fix merge conflicts
[4.0] [Workflow] Fix merge conflicts
avatar wilsonge wilsonge - edited - 10 Aug 2018
avatar franz-wohlkoenig franz-wohlkoenig - change - 10 Aug 2018
Status Discussion ⇒ Closed
Closed_Date 0000-00-00 00:00:00 ⇒ 2018-08-10 10:24:40
Closed_By ⇒ franz-wohlkoenig
avatar joomla-cms-bot
joomla-cms-bot - comment - 10 Aug 2018

Set to "closed" on behalf of @franz-wohlkoenig by The JTracker Application at issues.joomla.org/joomla-cms/21518

avatar joomla-cms-bot joomla-cms-bot - change - 10 Aug 2018
Closed_Date 2018-08-10 10:24:40 ⇒ 2018-08-10 10:24:50
Closed_By franz-wohlkoenig ⇒ joomla-cms-bot
avatar joomla-cms-bot joomla-cms-bot - close - 10 Aug 2018
avatar franz-wohlkoenig
franz-wohlkoenig - comment - 10 Aug 2018

closed as having Pull Request #21523

Add a Comment

Login with GitHub to post a comment