-
Notifications
You must be signed in to change notification settings - Fork 271
[3.0] Change likes to reactions... #8187
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
Open
Oldiesmann
wants to merge
192
commits into
SimpleMachines:release-3.0
Choose a base branch
from
Oldiesmann:reactions
base: release-3.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 57 commits
Commits
Show all changes
192 commits
Select commit
Hold shift + click to select a range
130cca4
Initial commit to change likes to reactions...
Oldiesmann ab2b1d5
Create the reactions table and change the ID column to match SMF stan…
Oldiesmann 08ca4ad
Handle upgrades - creating/renaming things as needed.
Oldiesmann 5714530
Consistency is a good thing...
Oldiesmann 47ebfbd
Update with changes from recurring events
Oldiesmann 55fdca3
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 9e85a05
Update permission and setting...
Oldiesmann 0b0b869
Rename Like.php and the Like class. Also adjusted another language st…
Oldiesmann ac040fa
More renaming. Also some other minor fixes
Oldiesmann 54a02fd
Missed something
Oldiesmann a089270
Pull in latest upstream changes
Oldiesmann f6bf12b
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 632bb5f
Merge latest upstream changes
Oldiesmann b7e845b
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 58a6dfb
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 4a3289f
Add support for changing the order of available reactions
Oldiesmann bd372a2
Change getLikedMsgs to getReactedMsgs and update the logic slightly
Oldiesmann 7f1ab57
Change a few more things...
Oldiesmann ab846bf
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 0c39327
Fix a typo and update the stats info.
Oldiesmann 09c5379
Language file tweak for stats.
Oldiesmann 26bbca9
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 7cea89f
Rename the template and a bunch of other stuff...
Oldiesmann b49770a
Create a new trait for loading reactions.
Oldiesmann 0cbfb60
This is handled by the trait so don't need it now...
Oldiesmann 5ab2119
A couple of minor tweaks...
Oldiesmann 5cb6c5d
Add the initial file for the admin stuff and modify the admin menu
Oldiesmann e7e5b8a
Move the settings to the new file and add initial code for handling u…
Oldiesmann 82cbe71
Minor tweaks and such
Oldiesmann 51c8f6a
Fix the typo, add a comment block and remove the unneeded trait property
Oldiesmann ef25d62
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann b38c849
Code to handle adding/removing/updating reactions and initial code fo…
Oldiesmann 2992985
HTML5, not XHTML...
Oldiesmann 2b51004
More random fixes and such
Oldiesmann 5b3cbc1
A few more minor tweaks:
Oldiesmann 968de8a
More fun...
Oldiesmann 2f5926f
- Change new row thing from link to button
Oldiesmann 1c1c313
Add function to output the data for the check column
Oldiesmann dad8ba0
Add constructor, change the likes permission text string and create l…
Oldiesmann 9172e3e
Finish menu and add language strings
Oldiesmann 2424ffb
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 67d86b0
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann cf7d01f
Consistency and all that...
Oldiesmann 0370de9
Oops
Oldiesmann 197d3e4
Another typo; also fix typos in Postgres
Oldiesmann 92381b2
Another typo and work around upgrade_query not supporting {db_prefix}
Oldiesmann 564b974
Fun fact: PHP doesn't like trying to implode() a string
Oldiesmann e4c6223
A few more minor fixes
Oldiesmann c5fd7cc
More fixes and general cleanup.
Oldiesmann 3688a33
Missing language strings
Oldiesmann c34c257
There's such a thing as too many permissions, right?
Oldiesmann 1a8c0d6
Forgot to finish the settings stuff...
Oldiesmann 7578e14
More missing language strings
Oldiesmann 9a880be
A couple more typos
Oldiesmann e373a4f
More bugs
Oldiesmann 495f1f2
More typos and missing language strings
Oldiesmann 608173b
Typos are sooo much fun...
Oldiesmann d4a472a
More cleanup
Oldiesmann b91fd9c
Remove currently unused column from install SQL files
Oldiesmann 56f2198
Fix URL for saving settings
Oldiesmann 9797226
Found a missing quote
Oldiesmann 0615afc
Duplicate column
Oldiesmann 5c9e655
Typo
Oldiesmann c200d56
A few more minor tweaks
Oldiesmann 29c8ada
Another typo
Oldiesmann 058e069
Fix our add button
Oldiesmann 4d1e387
A couple more typos
Oldiesmann 24dfc97
Make our add button look nice
Oldiesmann 2eecf35
Some more tweaks/fixes
Oldiesmann 9129e26
Another typo
Oldiesmann f2c1a2b
Validate token while saving settings
Oldiesmann 4712347
Add a title to the settings page and a token to the form on the manag…
Oldiesmann 1d950bd
Merge branch 'SimpleMachines:release-3.0' into reactions
Oldiesmann a512c6a
Typo
Oldiesmann 28b3b80
Merge branch 'reactions' of https://github.com/Oldiesmann/SMF21 into …
Oldiesmann 3bea240
Merge branch 'release-3.0' into reactions
Oldiesmann 0e993f4
Fix admin menu stuff.
Oldiesmann ff792fd
Token name typo
Oldiesmann f5c1854
Add a key to the insert because the code has a meltdown otherwise...
Oldiesmann 5f4929c
Fix the queries
Oldiesmann 2dd635e
Fix the queries the right way this time
Oldiesmann ee7e01f
Another typo
Oldiesmann 64bb71d
Missed those somehow...
Oldiesmann 83dd3d4
GROUP BY goes after WHERE, not before
Oldiesmann bddc492
Too many typos...
Oldiesmann 2cb628a
Fix our updates array
Oldiesmann 2c2c26b
Properly fix the update this time.
Oldiesmann b5d397f
Final fixes. Everything will work now.
Oldiesmann 6af7ee2
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 38a52d6
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 9227df4
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 8268275
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann b7f9491
Add code to load reaction information for posts
Oldiesmann 6f62684
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann a3757cf
Likes -> reacts...
Oldiesmann 3f5ad54
Delete reactions when a topic is deleted
Oldiesmann 64394fe
Make sure the reaction ID passed in the URL is valid
Oldiesmann 4e7601b
Merge branch 'smf3' of https://github.com/Oldiesmann/SMF21 into react…
Oldiesmann 252c3d8
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann bb592e2
Merge latest changes from upstream
Oldiesmann 74c1bc3
Apparently I missed a couple changes a while back...
Oldiesmann bb7edcf
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 1b9f39d
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 047d0d3
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 9150311
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann c9a6033
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann c69f40b
Merge branch 'smf3' of https://github.com/Oldiesmann/SMF21 into react…
Oldiesmann 35d0b5b
Merge branch 'reactions' of https://github.com/Oldiesmann/SMF21 into …
Oldiesmann 601f22e
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann d63795c
Forgotten commas will kill you...
Oldiesmann 292dfbc
Somehow the section to manage reactions settings went missing. I swea…
Oldiesmann d5cb3ab
Likes are a thing of the past...
Oldiesmann 84cb34d
Update the version to match the rest.
Oldiesmann bbec410
Fix call to undefined method
Oldiesmann d00481b
Move a few language strings so the menu items show up properly
Oldiesmann 74b8358
Merge branch 'reactions' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann bfb4f4d
Merge branch 'release-3.0' of https://github.com/SimpleMachines/SMF i…
Oldiesmann 38136b3
Merge branch 'reactions' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann 996c782
Merge branch 'release-3.0' of https://github.com/SimpleMachines/SMF i…
Oldiesmann bb1950d
Replace "getLikedMsgs" calls with "getReactedMsgs"
Oldiesmann a5b1cf9
Merge branch 'reactions' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann a94d298
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann c2a3261
Merge branch 'release-3.0' of https://github.com/SimpleMachines/SMF i…
Oldiesmann 5c98343
Merge branch 'release-3.0' of https://github.com/SimpleMachines/SMF i…
Oldiesmann 5b3ade4
Merge branch 'release-3.0' of https://github.com/SimpleMachines/SMF i…
Oldiesmann 44e79ab
Merge branch 'release-3.0' of https://github.com/SimpleMachines/SMF i…
Oldiesmann e97c539
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann e5f299d
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 13d545f
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann f6278f1
Pull in latest changes and adapt my changes to new install/upgrade st…
Oldiesmann e439e5f
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann fa9ddd3
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 22051f8
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 06971d3
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 0b172bc
Use the built-in index renaming method
Oldiesmann 4c54ca4
Use the soon-to-be-implemented rename_table method
Oldiesmann 8566ee5
Use column definition directly from schema
Oldiesmann b8dac42
Refactor/simplify things a bit
Oldiesmann 3cf826e
Attempt to fix HolidaysToEvents file
Oldiesmann 4d994c0
Yay for typos...
Oldiesmann ed2dde7
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 83cf384
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 7618770
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 8862359
Identifier parameter no longer used...
Oldiesmann 11827fe
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 2e3c84d
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 53ab7b5
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 3adcbde
Merge branch 'release-3.0' of github.com:Simplemachines/SMF into reac…
Oldiesmann f2feb5f
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 43f2d53
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 8d89400
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 56cfefc
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 0bba20a
Clean up stray reference to likes
Oldiesmann 83b02ed
Merge branch 'release-3.0' of github.com:Simplemachines/SMF into reac…
Oldiesmann b011be0
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 81eb98c
Merge branch 'reactions' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann f007e29
Remove likes area in admin and fix admin search
Oldiesmann 6e5339d
The old identifier parameter doesn't exist anymore...
Oldiesmann c41831b
Fix some more queries
Oldiesmann 8a375f8
Missed one
Oldiesmann 0f9a6e9
Update query to match actual column name...
Oldiesmann 189c0ad
Missed a "reacts" reference
Oldiesmann 2208b4b
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 95cc55a
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann a4ed7f9
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann e07d62a
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 9c1a5bf
Squash a typo
Oldiesmann a99da9a
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 13460c3
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann b96cd1e
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 77ca953
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 018b44e
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 925b843
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 78162ab
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann c08a539
Fix missing {
Oldiesmann eb6da1f
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 88af3d5
Code cleanup. Attempt to make php-cs-fixer happy.
Oldiesmann cc5b1b6
More cleanup
Oldiesmann 665bf43
Even more cleanup...
Oldiesmann a9e6003
Attempting to fix the newline issue
Oldiesmann ce33674
Fix the remaining issues
Oldiesmann fe0752e
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 2eae576
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 394cbcd
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 32ce2b9
Merge branch 'reactions' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann cbde1d1
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 3451699
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 1a08b80
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann fbc5f79
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 1d34da8
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann b373c24
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann 4903ef7
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?php | ||
|
|
||
| // Version 3.0 Alpha 1; ManageReactions | ||
| $txt['reactions'] = 'Reactions'; | ||
| $txt['no_reactions'] = 'No reactions yet.'; | ||
| $txt['reactions_name'] = 'Reaction Name'; | ||
| $txt['reacts_delete'] = 'Delete reaction'; | ||
| $txt['reacts_add'] = 'Add row'; | ||
| $txt['reacts_save'] = 'Save reactions'; | ||
| $txt['reacts_delete'] = 'Delete selected reactions'; // This will be fixed later | ||
| $txt['reacts_delete_confirm'] = 'Are you sure you want to delete these reactions?'; | ||
| $txt['reactions_manage'] = 'Manage Reactions'; | ||
| $txt['admin_manage_reactions'] = 'Manage reaction settings and reactions.'; | ||
| $txt['reaction_settings_explain'] = 'Enable/disable reactions and choose who can use them'; | ||
| $txt['manage_reactions_desc'] = 'Add, remove and update available reactions.'; | ||
| $txt['reactions_settings'] = 'Reactions Settings'; | ||
| $txt['groups_reactions_react'] = 'Membergroups allowed to react to content'; | ||
| $txt['enable_reacts'] = 'Enable reactions'; | ||
| ?> |
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
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
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got a typo in the string. "someoe"