Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Grid view follow up issue #964

Merged
merged 1 commit into from
Sep 4, 2019

Conversation

divyabaid16
Copy link
Contributor

Fixes #738 (<=== Add issue number here)

As a follow up #738 (comment) by @gauravano I have made the changes

Selection_245

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

  • PR is descriptively titled 馃搼 and links the original issue above 馃敆
  • 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 馃搧
  • screenshots/GIFs are attached 馃搸 in case of UI updation
  • ask @publiclab/mapknitter-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

Thanks!

@codeclimate
Copy link

codeclimate bot commented Aug 25, 2019

Code Climate has analyzed commit 5017a5e and detected 0 issues on this pull request.

View more on Code Climate.

@codecov
Copy link

codecov bot commented Aug 25, 2019

Codecov Report

Merging #964 into main will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #964   +/-   ##
=======================================
  Coverage   73.15%   73.15%           
=======================================
  Files          37       37           
  Lines        1356     1356           
=======================================
  Hits          992      992           
  Misses        364      364

@SidharthBansal
Copy link
Member

Code snippets lgtm. Just provide me the ss before final merge

@SidharthBansal
Copy link
Member

thanks for amazing work at PL

@divyabaid16
Copy link
Contributor Author

Here @SidharthBansal

@SidharthBansal
Copy link
Member

Looks awesome!

@SidharthBansal SidharthBansal merged commit d5d0943 into publiclab:main Sep 4, 2019
@SidharthBansal
Copy link
Member

thanks @divyabaid16

jywarren pushed a commit that referenced this pull request Sep 6, 2019
* Remove unwanted container_name

* Reference web container for current compose project

* Change docker for docker-compose reference

* Change initializer to factory syntax (#944)

* change to factory syntax

* fix typo

* Update app/assets/javascripts/mapknitter/Annotations.js

Co-Authored-By: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com>

* Update app/assets/javascripts/mapknitter/Annotations.js

Co-Authored-By: Gaurav Sachdeva <sachdeva.gaurav1997@gmail.com>

* try different syntax

* Put env var in right place

* Run instead of exec to be able to pass env vars.

* Pointer fix for Image options (#935)

* Latest pull from upstream

* Pointer changes

* Deeleted extra files

* Delete passenger.3000.pid.lock

Deleted file

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Last update to app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update _index.html.erb

* Update _index.html.erb

* Update CODE_OF_CONDUCT.md (#992)

Update code of conduct to reflect changes on https://publiclab.org/conduct Aug 28th, 2019

* Removed the dotted line from OAuth button options (#981)

* Grid-view-follow-up (#964)

* Bump bootsnap from 1.4.4 to 1.4.5 (#977)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](Shopify/bootsnap@v1.4.4...v1.4.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Setting ForeGO instead of Foreman (#995)

* Setting up ForeGO in favor of Foreman(deprecated)

* Bundle updating gems

* Bump faker from 2.1.2 to 2.2.1 (#984)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](faker-ruby/faker@v2.1.2...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* change run to exec

* run instead of exec
chen-robert pushed a commit to chen-robert/mapknitter that referenced this pull request Dec 5, 2019
chen-robert pushed a commit to chen-robert/mapknitter that referenced this pull request Dec 5, 2019
* Remove unwanted container_name

* Reference web container for current compose project

* Change docker for docker-compose reference

* Change initializer to factory syntax (publiclab#944)

* change to factory syntax

* fix typo

* Update app/assets/javascripts/mapknitter/Annotations.js

Co-Authored-By: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com>

* Update app/assets/javascripts/mapknitter/Annotations.js

Co-Authored-By: Gaurav Sachdeva <sachdeva.gaurav1997@gmail.com>

* try different syntax

* Put env var in right place

* Run instead of exec to be able to pass env vars.

* Pointer fix for Image options (publiclab#935)

* Latest pull from upstream

* Pointer changes

* Deeleted extra files

* Delete passenger.3000.pid.lock

Deleted file

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Last update to app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update _index.html.erb

* Update _index.html.erb

* Update CODE_OF_CONDUCT.md (publiclab#992)

Update code of conduct to reflect changes on https://publiclab.org/conduct Aug 28th, 2019

* Removed the dotted line from OAuth button options (publiclab#981)

* Grid-view-follow-up (publiclab#964)

* Bump bootsnap from 1.4.4 to 1.4.5 (publiclab#977)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](Shopify/bootsnap@v1.4.4...v1.4.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Setting ForeGO instead of Foreman (publiclab#995)

* Setting up ForeGO in favor of Foreman(deprecated)

* Bundle updating gems

* Bump faker from 2.1.2 to 2.2.1 (publiclab#984)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](faker-ruby/faker@v2.1.2...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* change run to exec

* run instead of exec
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants