mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-05 15:11:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,807 Commits 65 Branches 76 Tags
cf0485c4480ef6091b285ea36c1936bb783fbbca
Commit Graph

329 Commits

Author SHA1 Message Date
Brenda Wallace
4f8830676e Swagger docs 2019-11-18 10:15:06 +13:00
Brenda Wallace
c940ba447e Add source for leaflet, fixes #2217 2019-10-19 09:47:29 +13:00
Brenda Wallace
0a71807237 Stop using rails-assets.org (#2194) 2019-09-28 18:38:58 +12:00
Brenda Wallace
7b5698f977 👩‍🌾 Import openfarm data (#2177) 
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
 2019-09-28 17:23:25 +12:00
Brenda Wallace
c6894e7917 Setting linters as require: false in gemfile 2019-08-18 14:51:46 +12:00
Brenda Wallace
f3346fcadf Add rspectre gem 2019-08-18 14:31:51 +12:00
Brenda Wallace
67ce5265b4 Migrate from paranoia to discard 
closes #1995
 2019-07-21 16:59:06 +12:00
Brenda Wallace
c50556221c TRying to get mailboxxer working 2019-07-11 22:28:51 +12:00
Brenda Wallace
ad888575a5 Upgrade boostrap gem 2019-07-02 16:55:15 +12:00
Brenda Wallace
b65f2e858f update rubocop to match codeclimate settings 2019-06-27 22:14:48 +12:00
Brenda Wallace
ea2e0697a7 Update Gemfile 2019-06-27 14:44:30 +12:00
Brenda Wallace
d7e4863f02 bundle install results 2019-06-25 10:12:34 +12:00
Brenda Wallace
5de269c097 Move header into partial, to match what specs expect 2019-06-25 10:12:12 +12:00
Brenda Wallace
0171e67b7e Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap 
Conflicts:
	Gemfile.lock
 2019-06-25 09:08:42 +12:00
codefactor-io
f24ae3aafb [CodeFactor] Apply fixes 2019-06-18 06:45:30 +00:00
Brenda Wallace
52403d8dd6 Pin elasticsearch back at 6, to fix errors on staging/prod 2019-06-18 06:45:30 +00:00
Brenda Wallace
ef91e26d28 rubocop lint fixes 2019-06-16 10:31:03 +12:00
Brenda Wallace
7564a87232 Bring back rails rubocops 2019-06-14 16:42:09 +12:00
Brenda Wallace
ad6ec0473c Sort gems 2019-06-14 16:39:59 +12:00
Brenda Wallace
d98e94bd21 Switch from poltergeist to selenium chrome headless 2019-06-14 16:13:53 +12:00
Brenda Wallace
331f568b4c upgrade rubocop 2019-06-13 07:58:52 +00:00
Brenda Wallace
cfac7defed Remove commented out gem 2019-06-12 16:20:11 +12:00
Brenda Wallace
78f3badcd7 upgrade rubocop 2019-06-12 09:12:23 +12:00
Brenda Wallace
6216601d2a Tidy up plantings#new 2019-05-22 16:53:14 +12:00
Brenda Wallace
4a78a30779 Put membet activity on their profile 2019-05-19 15:10:03 +12:00
Brenda Wallace
a21366a098 fix icons on header nav 2019-05-17 12:18:36 +12:00
Brenda Wallace
4c0bca4b86 Removing isotope 
we don't need it anymore
 2019-05-17 09:49:57 +12:00
Brenda Wallace
f5d48d1b56 Removing bootstrap 3 - only bootstrap 4 
because both isn't particularly clever
 2019-05-13 07:52:38 +12:00
Brenda Wallace
e92f5392a1 Alphabetical gems 2019-04-30 13:11:45 +12:00
Brenda Wallace
5ad741ad7b Merge remote-tracking branch 'upstream/dev' into material-merge 
Conflicts:
	app/views/members/_avatar.html.haml
 2019-04-25 12:36:01 +12:00
Brenda Wallace
ba62208dd1 Add percy 2019-04-23 10:21:07 +12:00
Brenda Wallace
f5f5ecdea7 Merge remote-tracking branch 'upstream/dev' into material-merge 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.sass
	app/assets/stylesheets/plantings.sass
	app/views/crops/_thumbnail.html.haml
	app/views/crops/show.html.haml
	app/views/home/_members.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
	app/views/plantings/_descendants.html.haml
	app/views/plantings/show.html.haml
	app/views/seeds/_thumbnail.html.haml
	app/views/shared/_global_actions.html.haml
	spec/models/crop_spec.rb
 2019-04-21 11:27:27 +12:00
Brenda Wallace
27d12bf07e Isotope making nice layout on plantings#show 2019-04-20 09:09:07 +12:00
Brenda Wallace
f60174a8b9 Merge remote-tracking branch 'upstream/dev' into feature/memcachier 2019-04-19 09:30:48 +12:00
pozorvlak
d7497e4342 Fixed comment 
Co-Authored-By: Br3nda <brenda@wallace.net.nz>
 2019-04-19 08:32:38 +12:00
Brenda Wallace
c8716b6a1a Add oj gem, to speed up json use 2019-04-08 21:39:20 +12:00
Brenda Wallace
ae4ad3a62a Change to use searchkick 2019-04-08 21:39:20 +12:00
Brenda Wallace
de2fa81aae Remove staging env from bundle 2019-03-26 15:57:30 +13:00
Brenda Wallace
19faf66767 Add the scout gem to production 2019-03-20 10:01:57 +13:00
Brenda Wallace
7709bf0c3f Patch Rails 2019-03-14 13:28:37 +13:00
Brenda Wallace
3ed173ebcd Material design changes 2019-02-17 21:33:36 +13:00
Brenda Wallace
6f23a203a2 Switch to SendGrid (remove sparkhost) 2019-01-19 11:57:50 +13:00
Brenda Wallace
b7f876429a Upgrade to ruby 2.6.0 2019-01-01 13:31:09 +13:00
Brenda Wallace
a43c235423 Upgrade to Rails 5.2 2019-01-01 10:31:53 +13:00
Brenda Wallace
c0f8c23976 Downgrade geocoder 2018-12-30 16:00:45 +13:00
Brenda Wallace
1574f4b90a Downgrade active_median gem until we upgrade postgresql. 
see #1757
 2018-12-30 14:39:30 +13:00
Brenda Wallace
c2b64ffbc0 pull elastic search version back 2018-12-30 14:19:33 +13:00
Brenda Wallace
27e471b7b3 Set rubocop to 0.60 2018-12-30 13:30:16 +13:00
Brenda Wallace
1bb70d4bcd Ordering gems 2018-09-29 15:55:07 +12:00
Brenda Wallace
c16ee81c88 Add rubocop-rspec 2018-09-13 22:51:42 +12:00