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.

Sign up for GitHub

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

Implementgroup #959

Merged
merged 53 commits into from
Sep 10, 2019
Merged

Implementgroup #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
58bc692
h
sashadev-sky Jul 25, 2019
8dcff6a
h
sashadev-sky Jul 25, 2019
c075966
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Jul 26, 2019
986b49a
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Jul 30, 2019
34cf99d
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 6, 2019
11e11be
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 7, 2019
ba41fb4
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 11, 2019
d398f00
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 12, 2019
1828645
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 13, 2019
95759ad
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 22, 2019
8238c6f
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 27, 2019
bf84e93
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Sep 4, 2019
fc9d5ce
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Sep 9, 2019
ae6a192
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Sep 10, 2019
596f150
updates
sashadev-sky Sep 10, 2019
13db549
Fix featuregroup
sashadev-sky Aug 22, 2019
19671b1
checkout randomly modified file
sashadev-sky Aug 22, 2019
eae111b
Implementation
sashadev-sky Aug 23, 2019
a24cd58
setupToolbar working
sashadev-sky Aug 27, 2019
a827d7c
readOnly mode working
sashadev-sky Aug 27, 2019
6fd342d
remove googleMutant
sashadev-sky Aug 27, 2019
c3755ff
finalize
sashadev-sky Aug 27, 2019
6924249
group.editing call
sashadev-sky Aug 28, 2019
63fcd73
fix puma pidfile path, set it for development
sashadev-sky Sep 5, 2019
ba52e3d
review rebase
sashadev-sky Sep 5, 2019
5155f9d
update schema.rb to fix DB setup and commands like migrate, setup, etc
sashadev-sky Sep 5, 2019
ba147f1
delete obsolete config file
sashadev-sky Sep 5, 2019
ca49d2e
update example file
sashadev-sky Sep 5, 2019
0dab975
readd new line at end of file
sashadev-sky Sep 5, 2019
46d1e2e
remove left behind comment
sashadev-sky Sep 5, 2019
821eb7f
add new line to file
sashadev-sky Sep 5, 2019
54c3a49
bump ldi to 0.7.6
sashadev-sky Sep 5, 2019
79fcc5b
commit data dump
sashadev-sky Sep 5, 2019
0b6fa5e
remove db dump
sashadev-sky Sep 5, 2019
b784b50
update prod
sashadev-sky Sep 5, 2019
32aa001
return puma back to production
sashadev-sky Sep 5, 2019
b218335
add new migration to avoid potential corruption
sashadev-sky Sep 7, 2019
9a2b1a1
delete extra whitespace
sashadev-sky Sep 7, 2019
419b4b9
re-run all edited migrations
sashadev-sky Sep 9, 2019
d44a40b
update routes
sashadev-sky Sep 9, 2019
aba021d
remove defaults and set before_validations
sashadev-sky Sep 9, 2019
94e8aa7
update u to self
sashadev-sky Sep 9, 2019
3502a20
fix ||= space
sashadev-sky Sep 9, 2019
c1c0e1b
reverse order reversal
sashadev-sky Sep 9, 2019
bbf4f51
bump LDI to 0.7.7
sashadev-sky Sep 9, 2019
2b40f59
remove warpable update hook
sashadev-sky Sep 9, 2019
ce0f2d2
try now
sashadev-sky Sep 10, 2019
446cc25
before
sashadev-sky Sep 10, 2019
974a996
modifications
sashadev-sky Sep 10, 2019
b21a192
update
sashadev-sky Sep 10, 2019
f7d890a
remove before_validation hook for map
sashadev-sky Sep 10, 2019
3410ce6
update incorrect syntax in tests
sashadev-sky Sep 10, 2019
73125e8
Merge branch 'main' into implementgroup
sashadev-sky Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ You'll need Ruby v2.4.6 (use your local ruby version management system - RVM / r
5. Initialize database with `bundle exec rails db:setup`
6. Enter ReCaptcha public and private keys in config/initializers/recaptcha.rb, copied from recaptcha.rb.example. To get keys, visit https://www.google.com/recaptcha/admin/create
7. Install static assets (like external javascript libraries, fonts) with `yarn install`
8. Start rails with `bundle exec passenger start` from the Rails root and open http://localhost:3000 in a web browser. (For some, just `passenger start` will work; adding `bundle exec` ensures you're using the version of passenger you just installed with Bundler.)
8. Start rails with `bundle exec rails s` from the Rails root and open http://localhost:3000 in a web browser. (For some, just `rails s` will work; adding `bundle exec` ensures you're using the version of passenger you just installed with Bundler.)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should add forego as a dependency. With this we should start MK with forego start to run both Puma and Passenger.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alaxalves can we handle that in a follow up pr? is there an issue open for it? Everything works fine with it so if its not critical id rather not add it on here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course! Also it could be a FTO issue. 😄 😄 😄


==================

Expand Down
Loading