Merge Reports into modified main#36
Merged
Merged
Conversation
# Conflicts: # .gitignore # resources/views/admin/index.blade.php
…into reports # Conflicts: # .gitignore # app/Http/Controllers/Comments/CommentController.php # routes/lorekeeper/browse.php
…eports # Conflicts: # app/Models/Notification.php # config/lorekeeper/notifications.php
…into reports # Conflicts: # app/Models/Notification.php # config/lorekeeper/notifications.php
- Add report sidebar links to admin and home - Adjust admin index page for consistency - Add bug report index link to footer - Add an additional type of bug, "exploit", and make only bugs of this type be hidden in the general bug index - Fix bug re user commenting on an unassigned report
… into reports # Conflicts: # app/Http/Controllers/Comments/CommentController.php # app/Models/Notification.php # config/lorekeeper/notifications.php # resources/views/admin/reports/report.blade.php # resources/views/home/_report.blade.php # resources/views/home/_report_content.blade.php # resources/views/home/bug_report_index.blade.php
Change to bootstrap tables
itinerare
approved these changes
Nov 5, 2020
Member
itinerare
left a comment
itinerare
left a comment
There was a problem hiding this comment.
I've already gone through and tested + done a fixes pass, plus given everything another once-over here
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
merge reports addon into modified main - will allow reportable compatibility with comments, galleries etc in future