fixes #2731 'add spam button,line 16 _answers.html.erb' #2785
Conversation
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
|
Thanks for opening this pull request! |
Generated by 🚫 Danger |
jywarren
reviewed
Jun 7, 2018
app/views/questions/_answer.html.erb
Outdated
| @@ -14,6 +14,9 @@ | |||
| <a style="color:#aaa;" href="#a<%= answer.id %>"><%= time_ago_in_words(answer.created_at) %> ago</a> | |||
| </div> | |||
| <div class="navbar-text pull-right"> | |||
| <a rel="tooltip" title="Flag as spam" class="btn btn-sm btn-default btn-flag-spam-<%= comment.id %>" href="mailto:[email protected]?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!"> | |||
There was a problem hiding this comment.
Ah! let's change that to answer.id -- sorry, missed that!!
There was a problem hiding this comment.
Just the very first <%= comment.id %> to <%= answer.id %> and leave the <%= comment.parent.path %>#c<%= comment.cid %>+by+https://publiclab.org/profile/<%= comment.author.username %>+Thanks!"> as is?
|
I think all instances of `comment` to `answer` - and `#c` becomes `#a` --
for `commment.parent.path` we can just say `answer.path` - how does that
sound? Thanks!
…On Thu, Jun 7, 2018 at 3:10 PM rtrunkhill ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In app/views/questions/_answer.html.erb
<#2785 (comment)>:
> @@ -14,6 +14,9 @@
<a style="color:#aaa;" href="#a<%= answer.id %>"><%= time_ago_in_words(answer.created_at) %> ago</a>
</div>
<div class="navbar-text pull-right">
+ <a rel="tooltip" title="Flag as spam" class="btn btn-sm btn-default btn-flag-spam-<%= comment.id %>" ***@***.***?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!">
Just the very first <%= comment.id %> to <%= answer.id %> and leave the <%=
comment.parent.path %>#c<%= comment.cid %>+by+
https://publiclab.org/profile/<%= comment.author.username %>+Thanks!"> as
is?
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#2785 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AABfJzZv2l_v8vfxxFzAcGJIJKcXgpouks5t6Xp5gaJpZM4Ue5Md>
.
|
|
alright, my rake test is still coming back w/ errors. but i'll send it through w/t he changes so you can take a look at them |
|
Ah ok -- one more mistake by me, sorry! And, |
|
no problem. id like to keep helping out here so i'm willing to work out all this stuff. |
|
here is what it looks like now |
|
Hmm, that's odd. I'm going off of this file here -- it ought to have an
`aid`:
https://github.com/publiclab/plots2/blob/master/app/models/answer.rb#L9 ...
let me look again in a bit! Thanks!
…On Thu, Jun 7, 2018 at 4:26 PM rtrunkhill ***@***.***> wrote:
here is what it looks like now
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#2785 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AABfJ6jJ-Uopqi-vojWhFZ5reXroYMdHks5t6YxpgaJpZM4Ue5Md>
.
|
|
Oh wait! Try 👍 |
|
Hey! Fantastic. Great work here and thanks for your patience again. We're working on a big merge but will pull this in as soon as it's done!!! |
|
woot. i'll start poking around for other things i can help with
…On Thu, Jun 7, 2018 at 2:17 PM Jeffrey Warren ***@***.***> wrote:
Hey! Fantastic. Great work here and thanks for your patience again. We're
working on a big merge but will pull this in as soon as it's done!!!
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#2785 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AbYZ8ia3lyn1iUXPPystPDKrSS3VEuz-ks5t6ZhOgaJpZM4Ue5Md>
.
|
|
Congrats on merging your first pull request! 🙌🎉⚡️ |
|
Perfect. If you're looking for a new challenge, please take a look at our Thanks! |
SidharthBansal
pushed a commit
to SidharthBansal/plots2
that referenced
this pull request
Jun 19, 2018
…liclab#2785) * add spam button,line 16 _answers.html.erb * changed comment.ids to answer.ids * changed from comment path to answer * changed comment.parent.path to answer.path * some more cleanup to the button * change answer.aid to answer id
jywarren
pushed a commit
that referenced
this pull request
Jun 20, 2018
* Routes modified * Set the views * Modified error messages and user_tag * Add User_Tag as identity and find user_tag * User_sessions_controller modified * User_tag modified * user session controller modified * Checkpoint 1 * checkpoint1 codeclimate errors fixed * Checkpoint 2 * checkpoint 2 * User is created from sign up process successfully * create a usertag_with_omniauth * Search a usertag for oauth * search user_tag existing in db * create a user with omniauth test * LOGIN WORKS * current_user=(user) method removed * sign up correction * routing tests for google oauth * Google auth details saved * Google should return omniauth hash test * sign up and login via provider * sign up and login via provider alternative flow * flash message test added * login user with an email and then connect google provider * . * Changes according to rails 5 done * Changes according to rails 5 done * Environment nomenclature updated * Comments added * Adding application.yml * Submitting a draft (#2747) * Checkbox and JS function added * publish_draft method, routes, mail_notify_stop * coauthor can see and publish * bower update * undo and trying * draft label on dashboard * draft option not visible to first timer * updating bower * debug1 * removing debug statement * button view * view 2 * normal * generate path added * publish privil update * code climate * displaying comment with status1 only * coauthor can view draft * test correction * button text change to save if draft * fixture addition and 1 test * tests , fixtures and minor changes * test addition * codeclimate 1 * codeclimate 2 * codeclimate 3 * minor fixes * enable method=post for data-url image upload at /post (#2675) * enable method=post for data-url image upload at /post * Update editor_controller.rb * Update editor_controller.rb * Fixed first part of Issue #2352 Sorting headers added in wiki index page (#2353) * sorting headers added in wiki index page * replaced sorting header icon * Improved translate widget (#2553) * enhanced translate widget * changed title formatting of widget * Fix the clone command (#2766) * List subscription change (#2767) * Add sidekiq gem (#2738) * added resque gem * made changes for resqu installation * added sidekiq gem * minor changes * modified docker-compose.yml for redis * minor changes * resolve conflicts * Place tag detection and replacing "-" with "" (#2734) * Place tag detection and replacing "-" with "" * Javascript changed * Geocode method added * Tweaks * Tweaks * Tweaks * Tweaks 2 * Tweaks 3 * Update Gemfile.lock * Climate fix * add geocoded tags * Tweaks * Block shift and callback to onComplete * onComplete binded with ajax * place in starting of tag detection * Tweaks * make descriptive tag links move to bottom of page (#2770) * skylight config (#2773) * Reply to comment by email feature (#2669) * Added mailman script * Added migration file for adding comment_via column to comment table * Added reverse_markdown gem for converting html to markdown format * Added migration file for adding message_id column to comment table * Added function to handle received mail to create comment * Added icon for comment added via email to distinguish between the normal comment and reply by email comment * Added node_id in Mailer subjects to be used in reply by email feature * Minor changes * Updated schema.rb.example file * Improved tests * Added migrations * Added migrations * Added migrations * Corrected tests * Added enviroment variable for server address * Added sql sphefic conditions * Unwanted changes in schema.rb.example file is removed * Gem added * Log file is moved to public folder * Corrected tests * forward-date timestamps * Rename 20180605190014_add_message_id_column_to_comments.rb to 20180605010014_add_message_id_column_to_comments.rb * Update schema.rb.example * Added whenever cron update command in Makefile for redeploy-container (#2780) * Fix rss images and email images (#2784) * Fix rss images and email images * Update rss.rss.builder * Update rss_for_tagged_with_author.rss.builder * Update rss.rss.builder * Update rss.rss.builder * Update notify_node_creation.html.erb * Rails 5.0 upgrade (#2726) (#2783) * Rails 5.0 upgrade (#2726) * Upgraded the .gitignore according to rails diff * Initial Gemfile update * Update README.md * Showing message at the top of upgrade page (#2713) * added an upgrade alert tag * Additional questions page tweak (#2721) * added the tag to determine which upgrade is listed on the website * changed regex back * added an upgrade alert tag * added the tag to determine which upgrade is listed on the website * changed regex back * added upgrade after pull and rebase master * Upgrade to Rails 5 * Uncommented composite_primary_key gem * Removed the dual occurence of rails_autolink * Update readme installation, fixes #2729 (#2730) Updates the readme to change the installation instructions, fixes #2729 * Commented activerecord-tableless * Draft display on Dashboard (#2666) * draft display on dashboard * moderator file view permitted * checking * fix * test fix * Added and modified few config files according to railsdiff.org * Removed mass_assignment_sanitizer * Removed composite primary key gem * Removed all attr_accessible in all models * Added composite_primary_key gem again * Downgraded rails and removed few attr_accessible commands * Added strong parameters to the controllers * Added strong parameters gem and also include params.require inside private methods * Added strongparameters.rb file to initializers folder * Removed unnecessary strong_parameter functions * Removed some errors * Changed test command temporarily in .travis.yml * Corrected config/puma.rb file with adding some assets * Added all the config.precompile files in one line * Removed error of problem in updating of user profile * Removed the error while creating a user * Removed error RecordNotFound: Couldn't find Node with 'nid'= * Removed some errors related to ids * Removed comment.reload in comment_controller_test * Track Dockerfiles accross instances. (#2593) * Track Dockerfiles accross instances. * Specify jessie as base * Add commands to build&deploy container with Makefile. (#2746) * Added Sample Cron Job to check working of Whenever Gem (#2715) * Added Sample Cron Job to test Whenever Gem * Added make targets for deployment and cron service start * Added make to image * Tweak Makefile * Fix cron starting command in Makefile * Trim whitespace * Explicitly set jessie as base container * Fixed codeclimate issues * Auto-set wiki slug (#2743) * Added keyword arguments to the tag_model.rb * changed the query statement in search method of node.rb * Force removal of pid file (see docker/compose#1393) * Updated the tests due to change in arguments of search function in node.rb * Removed all the failures from tag_controller_test.rb * Changed the style of params in notes_controller_test.rb * Removed all depreciation warnings related to notes_controller * Removed all deprecation warnings related to image_controller and answers_controller * Removed all deprecation warnings of like_controller and fixed syntax error of answer_controller_test.rb * Removed all dep warnings of editor_controller and syntax error of like_controller_test.rb * removed all errors of answer_controller and some errors of tag_controller.rb * Removed all dep warnings of tag_controller_test.rb * Removed several dep warnings * Removed dep warnings of wiki_controller * Removed dep warnings of talk_controller * Removed dep warnings of legacy_controller_test.rb * Removed some warnings related to comment_controller * Removed the syntax errors * Removed two failures regarding application/xml+rss * Removed 2 failures due to wrong way of passing parameters in tests * Removed 2 failures * Fix params * Remove deprecations * Removed some dep warnings * Remove deprecations * Reverted to nothing => true * Reverted to nothing => true * Avoid rendering more than once in the same action * Removed all dep warnings related to user_tags_controller_test * Remove deprecation * Removed Dep warnings * Fix deprecation * Replace before_filter * Remove deprecation * Remove deprecation * Remove deprecation * Remove deprecation * Bump Ruby version to match Travis' * Simplify email regex to work with Ruby 2.4.1 * Changed the ruby version in Dockerfile * Remove deprecation * Remove deprecation * Removed the depreciation warning related to dynamic :controller and :action segment in routes * Changed the default ActiveRecord to ApplicationRecord in models * Clean Gemfile * Reverted to ['nid'] in tag_controller_test.rb * Changed the tests to rake test:all in .travis.yml * Minor spacing correction in .travis.yml * added a commit in application.js an application.css regarding the precompilation of files * Added more indentation * Small fixes * Separated the rails test and jasmine and coveralls task * Modified ['nid'] to ['node']['nid'] * Removed the extra puts in Rakefile * Changed the serial of tests * Added rake/testtask to Rakefile * Removed puma * Changed to ruby 2.4.1-jessie * Removed the whitelist_attributes command from config/application.rb * Removed two failures due to old usage of params * Fixed some new deprecation warnigs introduced * fixes #2731 'add spam button,line 16 _answers.html.erb' (#2785) * add spam button,line 16 _answers.html.erb * changed comment.ids to answer.ids * changed from comment path to answer * changed comment.parent.path to answer.path * some more cleanup to the button * change answer.aid to answer id * First timers recaptcha Environment Variables (#2786) * Edited the if statement * Added the env variables * Edited ENV variable, and added fallback * Fixed issue#2445 added both direction sort order (#2557) * fixed issue#2445 added both direction sort order * added function get_order_string in tags_controller * Changed get to post (#2788) * Update container definitions to match actual files used. (#2791) * Update container definitions to match actual files used. * Fix paths for running docker-compose.yml from subdir * Fix reference to Dockerfile * Reformat range stats page to table (#2792) * Index page listing for UserTags per issue #2741. (#2753) * Index page listing for UserTags per issue #2741. * Changes per pull request checks. * Removed debugging line. * Added routes to reflect 'groups' naming convention for user_tags per pull request spec. * Tests rewritten after rebase. * Index page listing for UserTags per issue #2741. * Changes per pull request checks. * Removed debugging line. * Added routes to reflect 'groups' naming convention for user_tags per pull request spec. * Fix for test of sort by value. * Update routes.rb for wiki update (#2804) * Update routes.rb * fixes * integration tests for assets (#2806) * integration tests for assets * full assets included * Update assets.rb * Added routes to notes/edit (#2808) * Added routes to notes/edit * Removed redundant notes#edit and added get instead of post in edit actions * Update routes.rb (#2810) * Create OPENID.md * fixing error in home_controller related to `group by` (#2794) * Added group by note.nid * correction * Openid fix with post route and better alert texts (#2815) * Added group by note.nid * correction * reworded openid requests and added post method for 2nd step * adjust message * Update openid_test.rb * Update openid_test.rb * Update openid_test.rb * Update openid_test.rb * Update Dangerfile (#2816) * Update routes.rb to fix embeddable features (#2818) * Update routes.rb * Removed the apostrophe mismatch * Added tests for embed in feature * Delete route for notes (#2820) * Documentation for the reply-by-email to comment feature (#2774) * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Re-order comment options and messages (#2834) * Update _comment.html.erb * Update _comment.html.erb * encoding issue resolved for migrating DrupalUsers to User records (#2257) * encoding issue solved fixes #2209 * minor changes * Rename 20180206161706_add_user_for_orphaned_drupal_user.rb to 20180614000000_add_user_for_orphaned_drupal_user.rb * resolves issue 2520 (#2831) * Emoji autocomplete (#2832) * basic emoji autocomplete * minor changes * minor tweaks * code climate fixes * minor change * changes * remove unnecessary style * Fix parent powertags for wikis like /barnraising (#2844) * application.yml added * Views removed * Application.yml removed * application removed * Docker changes * sign up page removed
SrinandanPai
pushed a commit
to SrinandanPai/plots2
that referenced
this pull request
May 5, 2019
…liclab#2785) * add spam button,line 16 _answers.html.erb * changed comment.ids to answer.ids * changed from comment path to answer * changed comment.parent.path to answer.path * some more cleanup to the button * change answer.aid to answer id
SrinandanPai
pushed a commit
to SrinandanPai/plots2
that referenced
this pull request
May 5, 2019
* Routes modified * Set the views * Modified error messages and user_tag * Add User_Tag as identity and find user_tag * User_sessions_controller modified * User_tag modified * user session controller modified * Checkpoint 1 * checkpoint1 codeclimate errors fixed * Checkpoint 2 * checkpoint 2 * User is created from sign up process successfully * create a usertag_with_omniauth * Search a usertag for oauth * search user_tag existing in db * create a user with omniauth test * LOGIN WORKS * current_user=(user) method removed * sign up correction * routing tests for google oauth * Google auth details saved * Google should return omniauth hash test * sign up and login via provider * sign up and login via provider alternative flow * flash message test added * login user with an email and then connect google provider * . * Changes according to rails 5 done * Changes according to rails 5 done * Environment nomenclature updated * Comments added * Adding application.yml * Submitting a draft (publiclab#2747) * Checkbox and JS function added * publish_draft method, routes, mail_notify_stop * coauthor can see and publish * bower update * undo and trying * draft label on dashboard * draft option not visible to first timer * updating bower * debug1 * removing debug statement * button view * view 2 * normal * generate path added * publish privil update * code climate * displaying comment with status1 only * coauthor can view draft * test correction * button text change to save if draft * fixture addition and 1 test * tests , fixtures and minor changes * test addition * codeclimate 1 * codeclimate 2 * codeclimate 3 * minor fixes * enable method=post for data-url image upload at /post (publiclab#2675) * enable method=post for data-url image upload at /post * Update editor_controller.rb * Update editor_controller.rb * Fixed first part of Issue publiclab#2352 Sorting headers added in wiki index page (publiclab#2353) * sorting headers added in wiki index page * replaced sorting header icon * Improved translate widget (publiclab#2553) * enhanced translate widget * changed title formatting of widget * Fix the clone command (publiclab#2766) * List subscription change (publiclab#2767) * Add sidekiq gem (publiclab#2738) * added resque gem * made changes for resqu installation * added sidekiq gem * minor changes * modified docker-compose.yml for redis * minor changes * resolve conflicts * Place tag detection and replacing "-" with "" (publiclab#2734) * Place tag detection and replacing "-" with "" * Javascript changed * Geocode method added * Tweaks * Tweaks * Tweaks * Tweaks 2 * Tweaks 3 * Update Gemfile.lock * Climate fix * add geocoded tags * Tweaks * Block shift and callback to onComplete * onComplete binded with ajax * place in starting of tag detection * Tweaks * make descriptive tag links move to bottom of page (publiclab#2770) * skylight config (publiclab#2773) * Reply to comment by email feature (publiclab#2669) * Added mailman script * Added migration file for adding comment_via column to comment table * Added reverse_markdown gem for converting html to markdown format * Added migration file for adding message_id column to comment table * Added function to handle received mail to create comment * Added icon for comment added via email to distinguish between the normal comment and reply by email comment * Added node_id in Mailer subjects to be used in reply by email feature * Minor changes * Updated schema.rb.example file * Improved tests * Added migrations * Added migrations * Added migrations * Corrected tests * Added enviroment variable for server address * Added sql sphefic conditions * Unwanted changes in schema.rb.example file is removed * Gem added * Log file is moved to public folder * Corrected tests * forward-date timestamps * Rename 20180605190014_add_message_id_column_to_comments.rb to 20180605010014_add_message_id_column_to_comments.rb * Update schema.rb.example * Added whenever cron update command in Makefile for redeploy-container (publiclab#2780) * Fix rss images and email images (publiclab#2784) * Fix rss images and email images * Update rss.rss.builder * Update rss_for_tagged_with_author.rss.builder * Update rss.rss.builder * Update rss.rss.builder * Update notify_node_creation.html.erb * Rails 5.0 upgrade (publiclab#2726) (publiclab#2783) * Rails 5.0 upgrade (publiclab#2726) * Upgraded the .gitignore according to rails diff * Initial Gemfile update * Update README.md * Showing message at the top of upgrade page (publiclab#2713) * added an upgrade alert tag * Additional questions page tweak (publiclab#2721) * added the tag to determine which upgrade is listed on the website * changed regex back * added an upgrade alert tag * added the tag to determine which upgrade is listed on the website * changed regex back * added upgrade after pull and rebase master * Upgrade to Rails 5 * Uncommented composite_primary_key gem * Removed the dual occurence of rails_autolink * Update readme installation, fixes publiclab#2729 (publiclab#2730) Updates the readme to change the installation instructions, fixes publiclab#2729 * Commented activerecord-tableless * Draft display on Dashboard (publiclab#2666) * draft display on dashboard * moderator file view permitted * checking * fix * test fix * Added and modified few config files according to railsdiff.org * Removed mass_assignment_sanitizer * Removed composite primary key gem * Removed all attr_accessible in all models * Added composite_primary_key gem again * Downgraded rails and removed few attr_accessible commands * Added strong parameters to the controllers * Added strong parameters gem and also include params.require inside private methods * Added strongparameters.rb file to initializers folder * Removed unnecessary strong_parameter functions * Removed some errors * Changed test command temporarily in .travis.yml * Corrected config/puma.rb file with adding some assets * Added all the config.precompile files in one line * Removed error of problem in updating of user profile * Removed the error while creating a user * Removed error RecordNotFound: Couldn't find Node with 'nid'= * Removed some errors related to ids * Removed comment.reload in comment_controller_test * Track Dockerfiles accross instances. (publiclab#2593) * Track Dockerfiles accross instances. * Specify jessie as base * Add commands to build&deploy container with Makefile. (publiclab#2746) * Added Sample Cron Job to check working of Whenever Gem (publiclab#2715) * Added Sample Cron Job to test Whenever Gem * Added make targets for deployment and cron service start * Added make to image * Tweak Makefile * Fix cron starting command in Makefile * Trim whitespace * Explicitly set jessie as base container * Fixed codeclimate issues * Auto-set wiki slug (publiclab#2743) * Added keyword arguments to the tag_model.rb * changed the query statement in search method of node.rb * Force removal of pid file (see docker/compose#1393) * Updated the tests due to change in arguments of search function in node.rb * Removed all the failures from tag_controller_test.rb * Changed the style of params in notes_controller_test.rb * Removed all depreciation warnings related to notes_controller * Removed all deprecation warnings related to image_controller and answers_controller * Removed all deprecation warnings of like_controller and fixed syntax error of answer_controller_test.rb * Removed all dep warnings of editor_controller and syntax error of like_controller_test.rb * removed all errors of answer_controller and some errors of tag_controller.rb * Removed all dep warnings of tag_controller_test.rb * Removed several dep warnings * Removed dep warnings of wiki_controller * Removed dep warnings of talk_controller * Removed dep warnings of legacy_controller_test.rb * Removed some warnings related to comment_controller * Removed the syntax errors * Removed two failures regarding application/xml+rss * Removed 2 failures due to wrong way of passing parameters in tests * Removed 2 failures * Fix params * Remove deprecations * Removed some dep warnings * Remove deprecations * Reverted to nothing => true * Reverted to nothing => true * Avoid rendering more than once in the same action * Removed all dep warnings related to user_tags_controller_test * Remove deprecation * Removed Dep warnings * Fix deprecation * Replace before_filter * Remove deprecation * Remove deprecation * Remove deprecation * Remove deprecation * Bump Ruby version to match Travis' * Simplify email regex to work with Ruby 2.4.1 * Changed the ruby version in Dockerfile * Remove deprecation * Remove deprecation * Removed the depreciation warning related to dynamic :controller and :action segment in routes * Changed the default ActiveRecord to ApplicationRecord in models * Clean Gemfile * Reverted to ['nid'] in tag_controller_test.rb * Changed the tests to rake test:all in .travis.yml * Minor spacing correction in .travis.yml * added a commit in application.js an application.css regarding the precompilation of files * Added more indentation * Small fixes * Separated the rails test and jasmine and coveralls task * Modified ['nid'] to ['node']['nid'] * Removed the extra puts in Rakefile * Changed the serial of tests * Added rake/testtask to Rakefile * Removed puma * Changed to ruby 2.4.1-jessie * Removed the whitelist_attributes command from config/application.rb * Removed two failures due to old usage of params * Fixed some new deprecation warnigs introduced * fixes publiclab#2731 'add spam button,line 16 _answers.html.erb' (publiclab#2785) * add spam button,line 16 _answers.html.erb * changed comment.ids to answer.ids * changed from comment path to answer * changed comment.parent.path to answer.path * some more cleanup to the button * change answer.aid to answer id * First timers recaptcha Environment Variables (publiclab#2786) * Edited the if statement * Added the env variables * Edited ENV variable, and added fallback * Fixed issue#2445 added both direction sort order (publiclab#2557) * fixed issue#2445 added both direction sort order * added function get_order_string in tags_controller * Changed get to post (publiclab#2788) * Update container definitions to match actual files used. (publiclab#2791) * Update container definitions to match actual files used. * Fix paths for running docker-compose.yml from subdir * Fix reference to Dockerfile * Reformat range stats page to table (publiclab#2792) * Index page listing for UserTags per issue publiclab#2741. (publiclab#2753) * Index page listing for UserTags per issue publiclab#2741. * Changes per pull request checks. * Removed debugging line. * Added routes to reflect 'groups' naming convention for user_tags per pull request spec. * Tests rewritten after rebase. * Index page listing for UserTags per issue publiclab#2741. * Changes per pull request checks. * Removed debugging line. * Added routes to reflect 'groups' naming convention for user_tags per pull request spec. * Fix for test of sort by value. * Update routes.rb for wiki update (publiclab#2804) * Update routes.rb * fixes * integration tests for assets (publiclab#2806) * integration tests for assets * full assets included * Update assets.rb * Added routes to notes/edit (publiclab#2808) * Added routes to notes/edit * Removed redundant notes#edit and added get instead of post in edit actions * Update routes.rb (publiclab#2810) * Create OPENID.md * fixing error in home_controller related to `group by` (publiclab#2794) * Added group by note.nid * correction * Openid fix with post route and better alert texts (publiclab#2815) * Added group by note.nid * correction * reworded openid requests and added post method for 2nd step * adjust message * Update openid_test.rb * Update openid_test.rb * Update openid_test.rb * Update openid_test.rb * Update Dangerfile (publiclab#2816) * Update routes.rb to fix embeddable features (publiclab#2818) * Update routes.rb * Removed the apostrophe mismatch * Added tests for embed in feature * Delete route for notes (publiclab#2820) * Documentation for the reply-by-email to comment feature (publiclab#2774) * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Re-order comment options and messages (publiclab#2834) * Update _comment.html.erb * Update _comment.html.erb * encoding issue resolved for migrating DrupalUsers to User records (publiclab#2257) * encoding issue solved fixes publiclab#2209 * minor changes * Rename 20180206161706_add_user_for_orphaned_drupal_user.rb to 20180614000000_add_user_for_orphaned_drupal_user.rb * resolves issue 2520 (publiclab#2831) * Emoji autocomplete (publiclab#2832) * basic emoji autocomplete * minor changes * minor tweaks * code climate fixes * minor change * changes * remove unnecessary style * Fix parent powertags for wikis like /barnraising (publiclab#2844) * application.yml added * Views removed * Application.yml removed * application removed * Docker changes * sign up page removed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!
rake testfixes #0000-style reference to original issue #@publiclab/reviewersfor help, in a comment belowIf tests do fail, click on the red
Xto learn why by reading the logs.Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software
We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays.
Thanks!