-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Add button to report answers spams to Comments upon Answers #2733
Closed
Closed
Changes from 1 commit
Commits
Show all changes
476 commits
Select commit
Hold shift + click to select a range
0663ac5
#3143 added related tags to tag page (#3162)
derek-allen 05636a6
Update README.md
jywarren 400a4c5
#3176 fixed tags not appearing immediately after being added (#3177)
derek-allen c3bd7f6
Fix for blank /questions page (#3178)
jywarren 010bb27
Notifications field added while creating users with omniauth (#3158)
SidharthBansal 0e96e13
improve UI of digest email (#3113)
ViditChitkara 062ff10
query revised (#3184)
grvsachdeva 64316a3
Migration for changing default value to true in node_selection `follo…
grvsachdeva 7df33b3
Default_markers added (#3186)
sagarpreet-chadha 116db0c
Added shortlink icons (#3190)
k-sau 68a4f74
Gitlab CI script (#3181)
icarito a58af69
update semver marks on leaflet-environmental-layers and leaflet-blurr…
jywarren c1db11e
Add test task to Makefile (#3197)
icarito 52fbe54
Promote comment to answer (#3195)
grvsachdeva 5dac2f3
migration for changing following to true for all rows (#3201)
grvsachdeva 4a84796
Gitlab move to official docker-in-docker (#3202)
icarito 3f1bafe
Update show.html.erb
jywarren 4927b23
Corrected routes error for liking an answer (#3212)
Souravirus a0e957e
Profile map tweaks (#3211)
sagarpreet-chadha c779723
LEL Integration (#3213)
sagarpreet-chadha 04d5bbc
Emoji encoding 3123 (#3161)
cheneyshreve01 01cffdd
FUll screen added and common JS function used (#3214)
sagarpreet-chadha e1e57db
Documentation of Draft Feature (#3206)
grvsachdeva ed75ab7
Adds user options to spam-like comments or messages. (#3207)
17827d1
Improve textSearch_profiles result (#3134)
milaaraujo be06b33
Improve peopleLocations endpoint: people_locations method (#3217)
milaaraujo e1fdf29
resolved (#3233)
grvsachdeva ea2b5ba
API Search profiles: adding parameter to search (only) by username (…
milaaraujo e532b92
Add links for searches with different sorting options (#2544) (#3255)
gSanchezCiarrocchi 39cfd13
Removed the blue banner (#3260)
shubhscoder 57a6b04
Upgrade to Ruby 2.4.4 (fixes #2824) (#3253)
icarito 066efe5
fix schema-rb-example for sqlite (#3242)
4b0e408
Added new graphs to main tag page (#3234)
Souravirus 8d51151
Remove Typeahead Service (#3257)
a9a762f
fix route url on typeahead script (#3266)
d9bbfad
Add unit test to the SearchService class methods (#3251)
milaaraujo c0b98c1
test (#3269)
jywarren 7dc17b9
Added a route to redirect requests to /question to /questions (#3265)
shubhscoder 7c774b5
Upgrade grape version from 1.0.3 to 1.1.0 (#3270)
a4bd068
Add textbox for tags fix. (#3231)
tyrantdavis 552218c
Updating testing documentation #3144 (#3146)
LostLaser e2818af
Update application.html.erb to place google analytics in a feature (#…
jywarren 4015e70
Don't display link for the current sort option in the results page's …
gSanchezCiarrocchi 0f01c74
fix leaflet-blurred-location geocoding (#3280)
jywarren 713cef0
updated wiki_controller (#3281)
kryptc 797442c
Don't export Redis port (#3252)
icarito 06ab52b
Add passenger precompile nginx step (fixes #3287) (#3288)
icarito 5d19a7d
Revert "Add passenger precompile nginx step (fixes #3287) (#3288)" (#…
icarito d641bce
Update README.md
jywarren 28c3951
Adding sort_by=recent as default in search/all-> profiles (#3286)
milaaraujo 65a747e
Revert "Revert "Add passenger precompile nginx step (fixes #3287) (#3…
icarito 3f0bdf2
Remove tracing used for debug. (Should improve speed). (#3293)
icarito 44c15bd
Removing hash from inline maps (#3292)
sagarpreet-chadha d5aa3de
listing of nodes with multiple tags - Add cleanup (#3230)
shauncarland 5c2bce3
Yarn transition work-in-progress (#2659)
jywarren 312a2ef
Adding Boolean mode option to node.search() (#3282)
milaaraujo 8252c21
Search ui improvement (#3304)
e98cf75
Testing search modes [2] (#3309)
milaaraujo 75f094a
show more results on typeahead located at navbar (#3310)
725406a
Update _related.html.erb (#3315)
blancasnz 60c95f0
Update package.json (#3318)
jywarren 0c0408e
Consolidating link icons to meta file (#3302)
k-sau 3f404f4
Update README.md (#3274)
jywarren 363d5ce
Yarn changes in README.md (#3329)
Souravirus 7ff77e7
Update package.json
jywarren 7a85c41
replace button by icon (#3334)
DanilParshukov 80fb380
Update config.yml (#3343)
wakingweb 990c965
Added "Reply to this email to post a response" to various email templ…
Rishabh-Kumar-Bothra acbcac9
Using node.search() in the search service methods (#3313)
milaaraujo 205daf4
Updated README (#3346)
sidntrivedi012 6735a95
Welcome message on dashboard improved (#3365)
asquare14 a128622
Search page (#3357)
217bfb5
Set mailman container to restart upon failure (#3376)
icarito 2159f5e
Set request queue limit to 200 (default 100) (#3377)
icarito 5281a3a
Update 502.html
jywarren 1a7f332
Create 503.html
jywarren cdef0bd
index for impressionist gem (#3380)
jywarren d1c5c06
Change senders name for emails (#3369)
igniteeng000 cda8e40
Added Search Heading (#3392)
rbhatia46 a1f8b7c
updated profile url (#3389)
abhishek71994 2522459
Change readme (#3400)
bajajerk ca78a67
Changed toggle UI button CSS for conversation thread in comments. Upd…
shivani-kapania 8ab6368
Update config.yml (#3415)
wilsantow dec63b4
Update config.yml
jywarren faa0352
Update config.yml
jywarren 325d009
Deleted dynamic_search.js and updated assets.rb (#3402)
neel1998 136b448
Update config.yml (#3434)
avsingh999 adc58df
most recent profiles on search/profiles page (#3420)
DamonClark b6a84ea
Simple UI improvement for blockquote responses. (#3455)
shivani-kapania 4610d1f
Reduce pool size to 8 (#3446)
icarito 97ec0bf
where(node_revisions.status = 1) (#3445)
milaaraujo 296cca9
Update tag_controller.rb for coauthor mention (#3294)
jywarren cf3d29b
Link GCI Wiki to readme (#3461)
SidharthBansal e8b929d
Update _header.html.erb (#3495)
sunilsj99 7896dfa
Update rich.html.erb (#3486)
d44f1d7
Add doc for running plots2 with MySQL (#3483)
35449fd
fix for contributors page (#3500)
jywarren bac1465
Update api docs (#3508)
542716d
Change API params to ruby standard (#3519)
825020e
change doc variables after changing DocResult params to snake case (#…
3c39a02
Update config.yml
jywarren 832a6e2
Turn Google Maps API key into environment parameter (#3467)
msarit 626811c
test locale change (#3514)
jywarren 0e84f2d
welcome msg for non-logged user in dashboard (#3492)
Paarmita 6595ef3
Make maps appear on any wiki page with coordinates (#3521)
vishalka98 fda0654
Added Mentorship Guidelines (#3525)
rbhatia46 0c0007f
Fixed typos #3366 (#3489)
bkocsis3 4ff74b4
(Preview - Hide Preview) Toggle Text Added for Post Comments in Quest…
YashishDua 32156a6
Updated the file to correct spelling (#3516)
aakashbansal 8fbebfd
Removed "=" from Header on Wiki page (#3544)
Rishabh-Kumar-Bothra c2c319c
Update Readme.md (#3448)
igniteeng000 2898e63
Update _header.html.erb (#3548)
vsk4 885dd06
Outreachy added to Readme (#3547)
SidharthBansal 33dd66a
Update subscription_mailer.rb w node IDs (#3562)
jywarren a749878
Map full screen support removed and Hash removes as well . (#3580)
sagarpreet-chadha 619ab07
Added a database-driven "feature" to the dashboard sidebar (#3587)
DivyeshPuri 79d65bf
fixes inline map with new api url (#3585)
a67f7f9
Updated share icon to link icon (#3593)
vikul1234 2a238ae
Update GCI Mentor Guidelines. (#3570)
starkblaze01 377c051
added shortlink action for users controller with 2 test - #3554 (#3588)
Lemcur 232907d
Update profile.html.erb (#3569)
starkblaze01 363cf2a
Moved render_comment_body helper into Comment model. (#3555)
mauricetmeyer 693f226
Update wiki_controller.rb
jywarren f78d53e
Updated PR Template (#3603)
vanguard07 d4133cf
preserve new wiki page creation path but redirect others to /tag/___ …
jywarren e05ab60
Merge contributors routes (#3510)
jywarren 61e928a
Updated config.yml to add GIF (#3607)
Dhiraj240 672f2d3
Prototype of photo gallery (#3610)
jywarren 738d54d
add lots of power tags to advanced tagging menu (#3612)
jywarren 2837147
[Security] Bump nokogiri from 1.8.4 to 1.8.5 (#3616)
greysteil accfbc0
Update install_cloudnine.sh - Ruby version (#3641)
a-santos a29b43f
shifted "Fixes #[Add issue number here.]" at top of pull_request_temp…
Rishabh-Kumar-Bothra 142d193
Change in README.md (#3623)
singhshubham98 fdf99c5
Navbar runs out of space (#3491)
DamonClark f9966e7
Update _form.html.erb (#3635)
roshniRam 92fa0e2
Changed instructions in the email body (#3638)
rohan2599 a53d388
add explanatory text while searching by profiles (#3614)
cesswairimu 3d0c7f6
Removed "schedule" statement from pull_request_template (#3650)
Rishabh-Kumar-Bothra f1467a5
Removed extra horizontal lines in the mobile views of the maps page (…
rohan2599 3e2e016
Fix - 3644 Add button colliding with the enter tag in the mobile view…
championpaddler 0d8bf8c
Issue#3611 (#3668)
gowrimanoharir 7643bee
condition added and inline
grvsachdeva 0ca4cba
Fix Logout alert notification doesn't fade away automatically- #3632 …
champagnepappi fe9da1e
Removed requested line and else statement (#3599)
coopjc-zz 002dfba
Remove space after the colon (#3671)
faithngetich 42230eb
Update notes_controller.rb #3669 (#3672)
quinn-codes-synthesis ca11403
Fix - 3648 - Added "control+enter" hotkey to post comment (#3659)
championpaddler 2d87712
Update config.yml (#3687)
faithngetich 1d5eeeb
Update blog.css (#3702)
Codeama 1b0d680
update link icon (#3710)
vikul1234 b319070
Made documentation name uppercase (#3709)
Rishabh-Kumar-Bothra 01969eb
Minor fixes (#3708)
Rishabh-Kumar-Bothra 75b9c48
fix emojis inside square brackets (#3721)
kaustubh-nair 9df9e1a
[WIP - help wanted] attempt at getting data-uri based image upload wo…
jywarren ed4eabf
Update PULL_REQUEST_TEMPLATE.md
jywarren d41ea21
fixing result path in the tag search (#3718)
milaaraujo a8539f4
added image-sequencer (#3722)
jywarren 87ea277
Search API: new endpoint /srch/nearbyPeople (#3719)
milaaraujo 5d92b5b
Update dashboard.css (#3664)
sal2701 9f1aba2
explanatory-text-for-search-tags (#3714)
kryptc 3a6373f
Enhanced readability of commands in Readme (#3717)
SidharthBansal 4ddf5e8
Redundant line removed (#3715)
SidharthBansal cc2df02
Tag generated for questions (#3724)
mardelvalle dd18e97
The ollie b question button link (#3743)
TheOllieB 6cb3641
Fixed type on target (#3746)
hkatzdev 32f613f
Update index.html.erb
jywarren 423dc34
Update _header.html.erb (#3751)
mohitRJranjan b538aa3
Update app/controllers/tag_controller.rb (#3430)
nwyll b6e1647
Update _header.html.erb (#3750)
mohitRJranjan 9b3ec37
Update _advanced_tagging.html.erb
jywarren 642f39e
Update _advanced_tagging.html.erb
jywarren ef97499
Update _advanced_tagging.html.erb
jywarren 420580e
Add tag parent method (#3749)
jywarren f5ccbe9
Fix inconsistent footer width in edit profile page (#3759)
Radhikadua123 ae3fa89
Adding tag option to profile endpoint (#3767)
milaaraujo 43dca60
Updated PR Welcome message to include prompt for Twitter handle (#3764)
kevinzluo 88d3963
Bump skylight from 3.0.0 to 3.1.1 (#3779)
dependabot[bot] e75d0f0
Bump passenger from 5.3.4 to 5.3.5 (#3781)
dependabot[bot] bef59bb
Bump progress_bar from 1.2.0 to 1.3.0 (#3780)
dependabot[bot] 277a8f6
Made a more consistent table of contents and reordered some sections …
kevinzluo fed2087
Bump paperclip from 5.2.1 to 6.1.0 (#3782)
dependabot[bot] 34b7e77
Bump authlogic from 4.1.1 to 4.4.2 (#3778)
dependabot[bot] 76d4164
added wiki path to table (#3776)
LonghornRach 83da2b2
Bump uglifier from 4.1.18 to 4.1.19 (#3789)
dependabot[bot] cae846e
Bump listen from 3.0.8 to 3.1.5 (#3793)
dependabot[bot] e7adb1b
Pop-up for link social media button (#3584) (#3773)
tsparksh 55fb685
Move yarn configuration into yarnrc (#3775)
Radhikadua123 75245c1
Bump mustermann from 1.0.2 to 1.0.3 (#3785)
dependabot[bot] c105268
Bump minitest-reporters from 1.1.19 to 1.3.5 (#3786)
dependabot[bot] 0a57ad1
Update show.html.erb
jywarren 51b17a8
Bump sanitize from 4.6.6 to 5.0.0 (#3792)
dependabot[bot] a9a48bc
Bump openssl from 2.0.8 to 2.1.2 (#3787)
dependabot[bot] 3de151d
Bump grape-swagger-entity from 0.1.5 to 0.2.5 (#3788)
dependabot[bot] 4f028aa
added total contributors for all time (#3695)
92837da
Adding NearbyPeople to API documentation (#3765)
milaaraujo 0c3d59e
Implement helper function for encrypt/decrypt data (#3801)
Radhikadua123 e3de62b
Allow admins to update profiles (#3805)
jywarren 9724d9a
Update images_controller.rb with dataurl filename and test (#3804)
jywarren f423719
Number of views and comments on small screens (#3795)
tsparksh 46235a7
Update questionRich.html.erb
jywarren d842316
Bump sidekiq from 5.2.1 to 5.2.2 (#3824)
dependabot[bot] 589c0e1
Refactors mail parse test to integration from unit (#3806)
kopecs e9fc83e
Update background color of login page in mobile (#3837)
mohitRJranjan 1bedd02
Bump rails-i18n from 5.1.1 to 5.1.2 (#3843)
dependabot[bot] 7f426ec
Extra scrubbing of email quoted text (#3830)
jywarren a005f76
Pagination is now at center (#3834)
atulbi 4a224eb
[Security] Bump loofah from 2.2.2 to 2.2.3 (#3844)
dependabot[bot] 9b2f7e2
Bump grape-swagger from 0.28.0 to 0.31.1 (#3826)
dependabot[bot] fd7a454
Bump rack-test from 1.0.0 to 1.1.0 (#3825)
dependabot[bot] 9e03a6e
Bump scrypt from 3.0.5 to 3.0.6 (#3823)
dependabot[bot] fc10d69
change title from index to stats (#3820)
narnt af295d7
fix node shared regex (#3815)
kaustubh-nair ec0b0f9
Meinou patch 2 (#3867)
leanyanko 1a0f874
Font color change for "Profile" in header and alignment of buttons on…
CodeSarthak 27edfa7
Bump grape-swagger-entity from 0.2.5 to 0.3.0 (#3859)
dependabot[bot] 8bb96dd
Bump recaptcha from 4.12.0 to 4.13.0 (#3874)
dependabot[bot] bf74fea
Bump less-rails from 3.0.0 to 4.0.0 (#3873)
dependabot[bot] 3169673
Bump i18n-js from 3.0.11 to 3.1.0 (#3875)
dependabot[bot] fccbb43
Reduce worker process count (#3881)
icarito b62f51d
Update CONTRIBUTING.md
jywarren 5c0a69d
Remove sidebar from /wiki index page (#3894)
love-opensource 3f3fa0a
Update CONTRIBUTING.md (#3892)
jywarren 759ae06
Remove extra horizontal line from _notes.html.erb (#3882)
romanrodriguez 72aa454
[Security] Bump rack from 2.0.5 to 2.0.6 (#3900)
dependabot[bot] 4a69cdd
Add forward stat page (#3812)
kevinzluo 1c7f7ee
Update install_cloudnine.sh
jywarren 9828793
3857 move emoji.js (#3872)
hydro-m 65dd963
Update install_cloudnine.sh
jywarren 0619156
changing title to features (#3878)
narnt 1c88a81
Bump jbuilder from 2.7.0 to 2.8.0 (#3901)
dependabot[bot] ab9c301
Move commenting UI code into an independent .js file. Fixes #3831. (#…
junhouse 955c663
Update config.yml (#3917)
mrtmrtmlck 398c870
Bump sidekiq from 5.2.2 to 5.2.3 (#3909)
dependabot[bot] 12a528d
Bump rubocop from 0.52.1 to 0.60.0 (#3827)
dependabot[bot] c306fbf
Update config.yml (#3922)
coderjolly 1ec67c8
updated the fix (#3748)
slasher17 97ddfbc
Handle case in which node doesn't exist (#3854)
Radhikadua123 7db3b68
Moved only_author_use_powertag line from node to root en.yml file (#3…
samyuravikumar f7856e7
add safe navigation operator (#3912)
cesswairimu 788ff6f
Add helper generate and validate token (#3907)
shubhscoder ad42a8b
Initial docs for containers (#3910)
icarito 6955585
Update _advanced_tagging.html.erb (#3933)
jywarren d1ccce3
Bump passenger from 5.3.5 to 5.3.6 (#3902)
dependabot[bot] 2f03211
Update _form.html.erb (#3927)
moogwol e31959c
Set mailman to always restart (#3939)
icarito 52ca105
add decimals to map queries (#3940)
jywarren 546287d
Split create function into two login paths (#3883)
Radhikadua123 a50aca6
Add button to report answers spams to Comments upon Answers
elviralaurin 5438f85
condition added and inline
grvsachdeva 5ccb2ea
Merge branch 'answers-button' of https://github.com/Toiya/plots2 into…
grvsachdeva 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 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 |
|---|---|---|
|
|
@@ -26,7 +26,10 @@ | |
|
|
||
| </div> | ||
| <div class="inline pull-xs-right" style="vertical-align: top"> | ||
| <p><% if answer_id == 0 && current_user && (current_user.role == "admin" || current_user.role == "moderator" || comment.uid == current_user.uid)%> | ||
| <a rel="tooltip" title="Flag as spam" class="btn btn-sm btn-default btn-flag-spam-<%= comment.id %>" href="mailto:moderators@publiclab.org?subject=Reporting+spam+on+Public+Lab&body=Hi,+I+found+this+comment+that+looks+like+spam+or+needs+to+be+moderated:+https://publiclab.org/<%= comment.parent.path %>#c<%= comment.cid %>+by+https://publiclab.org/profile/<%= comment.author.username %>+Thanks!"> | ||
| <i class="fa fa-flag"></i> | ||
| </a> | ||
| <p><% if answer_id == 0 && current_user && (current_user.role == "admin" || current_user.role == "moderator" || comment.uid == current_user.uid)%> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Code seems fine .. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you think we can do some changes to make view cleaner by aligning all three buttons in a line? Actually, the delete button is visible to you because you are currently logged in as 'moderator' from localhost. And, I think as moderator already has the power to delete the comment, so flag option is not needed for moderator and admin. So, here's what you can do -
Thanks! |
||
| <a class="btn btn-default btn-sm" id="answer-<%= answer_id %>-comment-<%= comment.id %>-reorder-btn" data-remote="true" data-confirm="Are you sure? <% if current_user && comment.uid != current_user.uid %>Please exercise caution in promoting others' comments; this cannot be undone.<% end %>" rel="tooltip" title="<%= t('questions._comment.promotion') %>" data-placement="left" href="/comment/make_answer/<%= comment.id %>"><i class="fa fa-plus"></i></a> | ||
| <% end %> | ||
| <% if current_user && current_user.uid == comment.uid %> | ||
|
|
||
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.
hi @Toiya , changes are looking great! Could you please attach a screenshot of the updated view? Thanks.
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.
I'm a little unsure if this is what you want but here are three screenshots of the flag button created, if I understand correctly. As you can see in the third one with the email, the words are currently seperated by plus-signs, which I guess is not what we want. I could try to fix this with my semi-limited HTML-skills, if you want to :)
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.
hi @Toiya, actually, these are the screenshot of the dashboard I guess and the flag is already implemented there. Changes from your code should appear in a question's comment. So, first you need to install plots2 and after that run localhost, and generate a question. After generating the question, generate test comments on that. And, with each of those comments, you should be able to see a flag button.
If you have not installed plots2 repo, then we can help you in installation. You can ask us anytime. Thanks.
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.
Hello! Sorry for getting it wrong, and thank you for being so patient. I'm currently following the installation guide in the README, but I'm stuck on step 4. Do you want me to rename db/schema.rb.example to db/schema.rb? Since they are both files, I don't understand how I'm supposed to make a copy of a file and place it "at" another file. Again, thank you so much for your patience!
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.
You should be able to delete the existing db/schema.rb and replace it with a copy of the example file. Sorry that wasn't as clear as it could be!