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

Nishadi Drag and Drop functionality for Featured Articles - Fixes #9564 #10313

Merged
merged 9 commits into from May 9, 2016
Merged

Nishadi Drag and Drop functionality for Featured Articles - Fixes #9564 #10313

merged 9 commits into from May 9, 2016

Conversation

Kubik-Rubik
Copy link
Member

@Kubik-Rubik Kubik-Rubik commented May 8, 2016

Pull Request for Issue #9564

Summary of Changes

Fixed merge conflicts.

Testing Instructions

Is already tested (origin PR is RTC), can be merged directly.

All kudos to @nishadi!

nishadi and others added 8 commits March 24, 2016 16:14
allow ordering across categories
ordering options order like columns order
…nishadi-staging

Fixed Conflicts:
#	administrator/components/com_content/views/featured/tmpl/default.php
…nishadi-staging

Fixed Conflicts:
#	administrator/components/com_content/views/featured/tmpl/default.php
@andrepereiradasilva
Copy link
Contributor

please don't revert the changes i made here
https://github.com/joomla/joomla-cms/pull/10062/files

@Kubik-Rubik
Copy link
Member Author

@andrepereiradasilva Thanks for the hint, I will update the PR.

@andrepereiradasilva
Copy link
Contributor

@andrepereiradasilva
Copy link
Contributor

I have tested this item ✅ successfully on bb266a9


This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/10313.

1 similar comment
@brianteeman
Copy link
Contributor

I have tested this item ✅ successfully on bb266a9


This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/10313.

@brianteeman
Copy link
Contributor

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/10313.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label May 8, 2016
@rdeutz
Copy link
Contributor

rdeutz commented May 9, 2016

@Kubik-Rubik please fix the CS issues

@andrepereiradasilva
Copy link
Contributor

@rdeutz there are no cs issues where, yesterday travis has crazy. this is ok.

@rdeutz
Copy link
Contributor

rdeutz commented May 9, 2016

@andrepereiradasilva, ok, I have restarted travis, we will see :-)

@mbabker
Copy link
Contributor

mbabker commented May 9, 2016

Restarting Travis won't fix it because it's based on the branch this PR came from, not a merge of this branch onto staging. @Kubik-Rubik would need to merge in staging to get a clean build.

@andrepereiradasilva
Copy link
Contributor

travis ok :)

@rdeutz
Copy link
Contributor

rdeutz commented May 9, 2016

@mbabker seems it worked, or do you expect that Jenkins will show the middle finger

@mbabker
Copy link
Contributor

mbabker commented May 9, 2016

Bleh, whatever. Hit the damn button. If it breaks, blame George.

@andrepereiradasilva
Copy link
Contributor

LOL!

@rdeutz rdeutz merged commit edb3b6e into joomla:staging May 9, 2016
@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label May 9, 2016
@Kubik-Rubik Kubik-Rubik deleted the nishadi-staging branch May 10, 2016 09:04
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.

None yet

7 participants