Place tag detection and replacing "-" with "" #2734

mridulnagpal · 2018-05-17T05:38:37Z

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

[*] tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
[*] code is in uniquely-named feature branch and has no merge conflicts
[*] PR is descriptively titled
PR body includes fixes #0000-style reference to original issue #
[*] ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to 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!

mridulnagpal · 2018-05-17T05:38:59Z

@jywarren Please have a look!

PublicLabBot · 2018-05-17T05:44:55Z

	1 Warning
⚠️	It looks like you merged from master in this pull request. Please rebase to get rid of the merge commits – you may want to rewind the master branch and rebase instead of merging in from master, which can cause problems when accepting new code!

	2 Messages
📖	@mridulnagpal Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖	It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progresss’, please include ‘[WIP]’ in the title.

Generated by 🚫 Danger

jywarren · 2018-05-17T05:52:30Z

Ah, can you link me back to the description? I think we don't want to do this on initial tag creation but only temporarily when attempting geocoding. Let me check the discussion at the planning issue!

jywarren · 2018-05-17T15:24:08Z

app/controllers/tag_controller.rb

@@ -289,6 +289,9 @@ def create
                           uid: current_user.uid,
                           body: " @#{current_user.username} has marked #{tagname.split(':')[1]} as a co-author. ")

+        elsif tagname.split(':')[0] == "place"


Lets trim this back out!

jywarren · 2018-05-17T15:25:47Z

app/assets/javascripts/tagging.js

+  if (tagname.indexOf("place") != -1) {
+    place = tagname.split(":")[1];
+    place.replace("-", " ");
+    alert("This looks like a location");


This is a placeholder, i guess - we can insert a modal dialog instead once we get this working!

Here, also, if you use the place string to initiate a geocoding search that'd be great -- we'll probably have to display a spinner on the modal like This looks like a location. Trying to find coordinates... (spinner) -- while it loads - make sense?

jywarren · 2018-05-17T15:26:53Z

app/assets/javascripts/tagging.js


  var el = $(selector);

-  el.find('.tag-input').val(tagname);
+  el.find('.tag-input').val("tagname");


I think the quotes are not needed - we want the variable -- but, we could put this in an else clause after checking if it's a place. So:

if it's a place, start the dialog box and wait until a) we geocode and b) user says OK or Cancel

if it's not, just go ahead and submit the tag!

Make sense?

Good going Mridul, exciting to see this start off!

Got it, on it!

Also, still have to remove the quotation marks here! Almost there!

mridulnagpal · 2018-05-17T16:13:30Z

@jywarren Made some changes, please have a look

jywarren

This is looking really great. it's very readable. Great work! Just a few more steps!

Let's use a confirm() instead of a prompt() and say This looks like a location. Is this full description of the location accurate? __________ A confirm() will return a true of false for OK vs Cancel -- make sense?

👍 👍 🎉

jywarren · 2018-05-19T04:05:38Z

Gemfile.lock

@@ -63,6 +63,7 @@ GEM
      debug_inspector (>= 0.0.1)
    builder (3.2.3)
    byebug (10.0.2)
+    chronic (0.10.2)


Hi, @mridulnagpal -- are these gems used in your code, or was this added by mistake? I guess we can upgrade the versions without a problem, though!

No, I am not using these gems, must be by mistake

Just remember to remove this!

jywarren · 2018-05-19T04:06:12Z

app/assets/javascripts/tagging.js

+  if (tagname.indexOf("place") != -1) {
+    place = tagname.split(":")[1];
+    place.replace("-", " ");
+    geocodeStringAndPan(place);


do we need to put the prompt code into a callback so it executes /after/ the geocode is complete? Or does this just work?

Yes, perhaps in the onComplete parameter!

I copied this code from blurred-location library, how do I test all of it?

jywarren · 2018-05-19T04:06:58Z

app/assets/javascripts/tagging.js

+    geocodeStringAndPan(place);
+    var choice = prompt("This looks like a location: A) Geocode B) Leave");
+    while(choice == NULL)
+  }


I think the while may not be needed? the prompt() should hang up the process until it's submitted.

jywarren · 2018-05-19T04:07:45Z

app/controllers/tag_controller.rb

@@ -289,8 +289,6 @@ def create
                           uid: current_user.uid,
                           body: " @#{current_user.username} has marked #{tagname.split(':')[1]} as a co-author. ")

-        end


Is this a stray deletion? Maybe re-adding the end will fix some of the tests?

Sure, on it!!

mridulnagpal · 2018-05-21T08:52:45Z

@jywarren Made the changes, how do we proceed forward?

mridulnagpal · 2018-05-22T07:18:59Z

@jywarren What do we do next, as I don't know how to test it as of yet

mridulnagpal · 2018-05-22T07:23:35Z

I don't understand why it does not detect the place tag, any ideas?

jywarren · 2018-05-22T09:50:45Z

Hi, sorry Mridul, I've been traveling and teaching workshops but will take a look later today! In the meantime can you try asking some other soc folks for support? Thanks!

…

On Tue, May 22, 2018, 3:24 AM Mridul Nagpal ***@***.***> wrote: [image: public] <https://user-images.githubusercontent.com/22350740/40347781-156b4a92-5dbf-11e8-94d0-968e713d2e35.png> I don't understand why it does not detect the place tag, any ideas? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2734 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ2s2C_GUKVylIngehiJuoJ8d44Vsks5t07z7gaJpZM4UCcIL> .

mridulnagpal · 2018-05-23T11:18:42Z

@publiclab/soc Any thoughts on how to test this guys?

jywarren · 2018-05-23T16:09:13Z

app/assets/javascripts/tagging.js

+    place.replace("-", " ");
+
+    confirm("This looks like a location. Is this full description of the location accurate?");
+    if(confirm) {


aha - so here, confirm() returns true or false, but doesn't create a confirm variable. You can just say:

if (confirm("......")) {

Or you could say:

var confirm = confirm("......"); if (confirm) {

Make sense?

jywarren · 2018-05-23T16:54:52Z

@mridulnagpal can you take a look at the CodeClimate suggestions too? https://codeclimate.com/github/publiclab/plots2/pull/2734

This did pass though!

mridulnagpal · 2018-05-23T17:40:07Z

@jywarren Sure, working on refatoring!!

mridulnagpal · 2018-05-25T17:32:36Z

@publiclab/soc @jywarren Fixed the codeclimate issues, do you know why is this not passing?

jywarren · 2018-05-25T17:35:20Z

Yes, i think it's related to #2593 which we're trying to make progress on!

jywarren · 2018-05-25T20:20:24Z

OK it should work now if you rebase and retrigger it!

jywarren · 2018-05-25T20:31:16Z

Oh oops i also retriggered the build... let's see

jywarren · 2018-05-25T20:38:48Z

app/assets/javascripts/tagging.js

+    place = tagname.split(":")[1];
+    place.replace("-", " ");
+
+    var confirm = confirm("This looks like a location. Is this full description of the location accurate?");


OK, so we have a flow issue here -- think about this, we probably need to do the geocoding /first/ and then present the user with the attempt to determine the full location /after/ it returns, right?

So if so, we ought to just initiate the geocode automatically. Then, the confirm() step ought to go in the onComplete -- that way we can say Is "____________" an accurate description of the place?

mridulnagpal · 2018-05-31T16:43:52Z

This is the output, it doesn't do anything. Do you have a clue why?

mridulnagpal · 2018-05-31T17:01:45Z

@jywarren Also corrected the detection of "place" in the tagname

jywarren

Ah!!! It's because the form doesn't by default use addTag! In fact it's the reverse. addTag actually submits the form.

Ok, so we should finally rewire the form to use the JavaScript function rather than natively submit. Can you work on the tagging HTML template and try to rewire it to submit via Ajax rather than just using native HTML submit action?

jywarren · 2018-05-31T17:12:55Z

Does this make sense?

mridulnagpal · 2018-05-31T18:45:18Z

@jywarren Got it, I am getting this issue when I try to add 2 tags together.

jywarren · 2018-05-31T18:48:40Z

Weird but maybe because in SQLite itbcant respond fast enough for two entries very fast? Do u have MySQL available?

…

On Thu, May 31, 2018, 2:45 PM Mridul Nagpal ***@***.***> wrote: @jywarren <https://github.com/jywarren> Got it, I am getting this issue when I try to add 2 tags together. [image: image] <https://user-images.githubusercontent.com/22350740/40801537-c883e382-6530-11e8-92ca-4ddc1d8b6804.png> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2734 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ2UVPLCHa68KhZ8mM6g7KpaeZNJNks5t4Do-gaJpZM4UCcIL> .

mridulnagpal · 2018-05-31T19:26:16Z

@jywarren Yes I have it, what do I do?

jywarren · 2018-05-31T19:28:56Z

Try changing your database.yml to use MySQL ( you may need to go through setup steps again) and see if it works then?

…

On Thu, May 31, 2018, 3:26 PM Mridul Nagpal ***@***.***> wrote: @jywarren <https://github.com/jywarren> Yes I have it, what do I do? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2734 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJyldooRBxKfmDjKBCJpehjnQ_0Auks5t4EPZgaJpZM4UCcIL> .

mridulnagpal · 2018-05-31T19:55:57Z

I am stuck on rake db:setup

mridulnagpal · 2018-06-02T10:33:48Z

@jywarren I think we have some migration which are not compatible with mysql

jywarren · 2018-06-02T15:38:03Z

Hi, can someone from @publiclab/reviewers help Mridul here? I'm unfortunately at a meeting this weekend, thanks!

…

On Sat, Jun 2, 2018, 4:34 AM Mridul Nagpal ***@***.***> wrote: @jywarren <https://github.com/jywarren> I think we have some migration which are not compatible with mysql — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2734 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJwbaHxPcepWU_b4gb5hP8XlXxn5kks5t4moMgaJpZM4UCcIL> .

jywarren · 2018-06-03T22:48:17Z

Hi, Mridul - can you check if you've modified your schema.rb file at all? Maybe you have to recopy it from schema.rb.example?

jywarren · 2018-06-03T23:09:40Z

Retriggered tests -- our upstream fixes made this work now!

It could be worth pushing to the unstable branch to see if it works on mysql. Ask folks in the #2764 check-in for help with this! I think @Gauravano and @icarito wrote up some guidelines in #2750 - give it a try and ask them for help!

jywarren · 2018-06-03T23:13:08Z

app/assets/javascripts/tagging.js

+    if (geo.length > 0) {
+      var confirm = confirm("This looks like a location. Is this full description of the location accurate?");
+      if(confirm) {
+      addTag("lat: " + str(geo[0]));


Ah! you could also do a single addTag("lat: " + str(geo[0])" + "," + "lng: " + str(geo[1])) !

mridulnagpal · 2018-06-04T08:16:35Z

@jywarren, I tried testing it and it works, I just need to rewire the form to submit via addTag method, how are the tags added right now?

…ation-tag-geocoder

mridulnagpal · 2018-06-05T16:14:01Z

@jywarren @publiclab/soc We are done with the adding of tag, but we need to call addTag() when the form is submitted. Do you know what method is called right now to add Tags to research notes?

jywarren · 2018-06-05T17:58:58Z

app/assets/javascripts/tagging.js

+          console.log(geo[0]);
+          console.log(geo[1]);
+          if(r) { 
+            addTag("lat:" + geo[0].toString() + ",lng:" + geo[1].toString()+",place:"+string);


OK, so I think we can put off refactoring addTag for now -- or do it in an independent PR. This should just submit the HTML form. I'm going to merge it!

* 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

* 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

* 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

* 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

mridulnagpal mentioned this pull request May 17, 2018

Long-term Geographic Features planning #1416

Open

34 tasks

mridulnagpal added 2 commits May 17, 2018 16:36

Place tag detection and replacing "-" with ""

80c3e44

Javascript changed

1a30611

jywarren requested changes May 17, 2018

View reviewed changes

mridulnagpal added 2 commits May 18, 2018 03:11

Geocode method added

2dc5cfe

Tweaks

4660cc4

jywarren requested changes May 19, 2018

View reviewed changes

mridulnagpal added 2 commits May 19, 2018 20:09

Tweaks

6be9dbc

Tweaks

2e3eeb6

jywarren reviewed May 23, 2018

View reviewed changes

Tweaks 2

690027c

Tweaks 3

dddb402

Update Gemfile.lock

d6e18c7

jywarren reviewed May 25, 2018

View reviewed changes

Climate fix

3dfc1ef

ghost assigned mridulnagpal May 31, 2018

ghost added the in progress label May 31, 2018

jywarren reviewed May 31, 2018

View reviewed changes

onComplete binded with ajax

abc8b5e

place in starting of tag detection

719b598

jywarren reviewed Jun 3, 2018

View reviewed changes

mridulnagpal added 2 commits June 4, 2018 19:20

Tweaks

6f0bd4c

Merge branch 'master' of https://github.com/publiclab/plots2 into loc…

794fa11

…ation-tag-geocoder

jywarren reviewed Jun 5, 2018

View reviewed changes

jywarren approved these changes Jun 5, 2018

View reviewed changes

jywarren merged commit 21bf91c into publiclab:master Jun 5, 2018

ghost removed the in progress label Jun 5, 2018

Place tag detection and replacing "-" with "" #2734

Place tag detection and replacing "-" with "" #2734

Conversation

mridulnagpal commented May 17, 2018

mridulnagpal commented May 17, 2018

PublicLabBot commented May 17, 2018 • edited by plotsbot Loading

jywarren commented May 17, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mridulnagpal commented May 17, 2018

jywarren left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mridulnagpal May 19, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mridulnagpal commented May 21, 2018

mridulnagpal commented May 22, 2018

mridulnagpal commented May 22, 2018

jywarren commented May 22, 2018 via email

mridulnagpal commented May 23, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jywarren commented May 23, 2018

mridulnagpal commented May 23, 2018

mridulnagpal commented May 25, 2018

jywarren commented May 25, 2018

jywarren commented May 25, 2018

jywarren commented May 25, 2018

Choose a reason for hiding this comment

mridulnagpal commented May 31, 2018

mridulnagpal commented May 31, 2018

jywarren left a comment

Choose a reason for hiding this comment

jywarren commented May 31, 2018

mridulnagpal commented May 31, 2018

jywarren commented May 31, 2018 via email

mridulnagpal commented May 31, 2018

jywarren commented May 31, 2018 via email

mridulnagpal commented May 31, 2018

mridulnagpal commented Jun 2, 2018

jywarren commented Jun 2, 2018 via email

jywarren commented Jun 3, 2018

jywarren commented Jun 3, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mridulnagpal commented Jun 4, 2018 • edited Loading

mridulnagpal commented Jun 5, 2018

Choose a reason for hiding this comment

PublicLabBot commented May 17, 2018 •

edited by plotsbot

Loading

mridulnagpal May 19, 2018 •

edited

Loading

mridulnagpal commented Jun 4, 2018 •

edited

Loading