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

Reports — For #2972 #2996

Merged
merged 10 commits into from
Feb 16, 2018
Merged

Reports — For #2972 #2996

merged 10 commits into from
Feb 16, 2018

Conversation

WildcardSearch
Copy link
Contributor

@WildcardSearch WildcardSearch commented Jan 17, 2018

[Ready for testing]

For #2972

Templates:

  • report
  • report_reasons
  • report_reason
  • report_duplicate
  • report_error
  • report_error_nomodal
  • report_thanks
+ report -> report.twig
+ report_thanks -> report_thanks.twig
+ report_reasons -> report_reasons.twig
+ report_error_nomodal -> report_error_nomodal.twig
- report_error
- report_duplicate
- report_reason

Mark Vincent added 8 commits January 17, 2018 17:16
report_error_nomodal,
report_reason, report_reasons
...and code cleanup, refactoring info sent to Twig, and fixing an error
where a legacy language string was left in the `report_reasons.twig`
template.
@WildcardSearch WildcardSearch added t:enhancement Type: Enhancement. Contains minor improvements s:in-progress Status: In Progress. Some work completed b:1.9 Branch: 1.9.x labels Jan 19, 2018
@WildcardSearch
Copy link
Contributor Author

@mybb/developers this seems to be working correctly. It should be ready to test.

report.php Outdated
$templatelist = "report,report_thanks,report_error,report_reasons,report_error_nomodal,forumdisplay_password_wrongpass,forumdisplay_password";
require_once "./global.php";
require_once MYBB_ROOT.'inc/functions_modcp.php';
$templatelist = 'report,report_thanks,report_error,report_reasons,report_error_nomodal,forumdisplay_password_wrongpass,forumdisplay_password';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is unnecessary right now, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I just got an answer on Discord from Euan. I will handle it tonight.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done @Matslom

@andrewjs18
Copy link
Contributor

from the gui side of this, I didn't see any issues.

@euantorano
Copy link
Member

@WildcardSearch This still has the s:in-progress label, but it looks like it's complete to me - is it?

@WildcardSearch
Copy link
Contributor Author

Yes, @euantorano

I am not up-to-speed on the labels and when they should be applied/removed.

@WildcardSearch WildcardSearch removed the s:in-progress Status: In Progress. Some work completed label Feb 3, 2018
@euantorano
Copy link
Member

No problem, I'll give it a test 👍

@WildcardSearch
Copy link
Contributor Author

Great!

@euantorano euantorano merged commit 4e2b155 into mybb:develop/1.9 Feb 16, 2018
euantorano pushed a commit that referenced this pull request Mar 16, 2018
* Initial Cleanup and Main Template Conversion [WIP]

* report_thanks

* report_thanks

* Errors

report_error_nomodal,

* report_duplicate

* Report Reason

report_reason, report_reasons

* Separated `nomodal` Content

...and code cleanup, refactoring info sent to Twig, and fixing an error
where a legacy language string was left in the `report_reasons.twig`
template.

* Adjust Alignment

* Remove unused assignment

* Remove Template Cache List
@WildcardSearch WildcardSearch deleted the fix-2972-reports branch February 16, 2019 13:05
euantorano pushed a commit to euantorano/mybb that referenced this pull request Mar 23, 2019
* Initial Cleanup and Main Template Conversion [WIP]

* report_thanks

* report_thanks

* Errors

report_error_nomodal,

* report_duplicate

* Report Reason

report_reason, report_reasons

* Separated `nomodal` Content

...and code cleanup, refactoring info sent to Twig, and fixing an error
where a legacy language string was left in the `report_reasons.twig`
template.

* Adjust Alignment

* Remove unused assignment

* Remove Template Cache List
euantorano pushed a commit to euantorano/mybb that referenced this pull request Mar 23, 2019
* Initial Cleanup and Main Template Conversion [WIP]

* report_thanks

* report_thanks

* Errors

report_error_nomodal,

* report_duplicate

* Report Reason

report_reason, report_reasons

* Separated `nomodal` Content

...and code cleanup, refactoring info sent to Twig, and fixing an error
where a legacy language string was left in the `report_reasons.twig`
template.

* Adjust Alignment

* Remove unused assignment

* Remove Template Cache List
euantorano pushed a commit that referenced this pull request Jun 2, 2019
* Initial Cleanup and Main Template Conversion [WIP]

* report_thanks

* report_thanks

* Errors

report_error_nomodal,

* report_duplicate

* Report Reason

report_reason, report_reasons

* Separated `nomodal` Content

...and code cleanup, refactoring info sent to Twig, and fixing an error
where a legacy language string was left in the `report_reasons.twig`
template.

* Adjust Alignment

* Remove unused assignment

* Remove Template Cache List
euantorano pushed a commit that referenced this pull request Jun 2, 2019
* Initial Cleanup and Main Template Conversion [WIP]

* report_thanks

* report_thanks

* Errors

report_error_nomodal,

* report_duplicate

* Report Reason

report_reason, report_reasons

* Separated `nomodal` Content

...and code cleanup, refactoring info sent to Twig, and fixing an error
where a legacy language string was left in the `report_reasons.twig`
template.

* Adjust Alignment

* Remove unused assignment

* Remove Template Cache List
@euantorano euantorano mentioned this pull request Jan 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
b:1.9 Branch: 1.9.x t:enhancement Type: Enhancement. Contains minor improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants