Commit Graph

614 Commits

Author SHA1 Message Date
Daniel O'Connor
449c6c4487 Issue/3189: Fix map displays by dropping mapbox (#3190)
* For now, drop mapbox for OSM tiles

* For now, drop mapbox for OSM tiles

* Use OSM tiles

* Remove mapbox secrets for now. If we bring back mapbox; we should re-enstate

* Update members.js.erb

* Change placeholder
2023-03-13 13:04:16 +10:30
Cesy
60608411ed Merge branch 'dev' into issue/1642 2022-12-17 10:41:35 +00:00
Cesy
59c212ecf5 Switching from SendGrid to Mailgun for sending emails 2022-12-15 10:35:52 +00:00
Daniel O'Connor
28d550d67f Drop test 2022-12-10 15:55:57 +10:30
Daniel O'Connor
07feb1cd85 Drop tests 2022-12-10 15:54:58 +10:30
Daniel O'Connor
d3df63912c Typo 2022-11-07 23:56:37 +10:30
Daniel O'Connor
55ccf8e1af Bump defaults 2022-11-06 16:44:06 +10:30
Daniel O'Connor
b24b9f82e6 Rubocop - auto corrections 2022-11-06 16:34:36 +10:30
Daniel O'Connor
89bb30011c Fixes #3402 (#3043) 2022-05-01 17:10:05 +09:30
Brenda Wallace
60c74ddff3 Reconnecting stale flickr auth tokens 2021-01-05 19:46:07 +13:00
Brenda Wallace
958ee66e79 Apply suggestions from code review 2020-08-26 12:36:58 +12:00
Brenda Wallace
8a5a19f0c6 Removing deprecated commented out parts of application.rb 2020-08-26 12:36:58 +12:00
Brenda Wallace
9dbf8b7c8f New robocops 2020-08-26 12:36:58 +12:00
Brenda Wallace
59efe92648 Upgrade to rails 6 2020-08-26 12:36:58 +12:00
Brenda Wallace
92f8a84369 Remove figaro gem and use rails-dotenv 2020-08-01 20:24:21 +12:00
Brenda
a4afeea025 Updated test stubs to support geocoder 1.6
https://github.com/alexreisner/geocoder/issues/1258
2020-06-20 10:57:03 +12:00
codefactor-io
0577dce474 [CodeFactor] Apply fixes 2020-06-01 14:02:34 +12:00
Brenda Wallace
cdd00e7372 Only allow get 2020-06-01 14:02:34 +12:00
Brenda Wallace
5600670fef Only allow open CORS on the api 2020-06-01 14:02:34 +12:00
Brenda Wallace
32972a90fd Removed commented out code 2020-06-01 14:02:34 +12:00
Brenda Wallace
048ec7791f Increase max records on jsonapi to 100 2020-06-01 14:02:34 +12:00
Brenda Wallace
7482095894 CORS headers for an open api 2020-06-01 14:02:34 +12:00
Awesome Code
8cd0628ba6 Auto corrected by following Lint Ruby Layout/EmptyLineAfterMagicComment 2020-04-16 13:59:48 +12:00
Awesome Code
f570557ddb Auto corrected by following Lint Ruby Lint/RedundantCopEnableDirective 2020-04-16 13:59:32 +12:00
Awesome Code
c764b0a28f Auto corrected by following Lint Ruby Lint/RedundantCopDisableDirective 2020-04-14 10:49:54 +12:00
Brenda
9dfd6dbc73 Tidy up index pages 2020-02-10 14:21:03 +13:00
codefactor-io
34ddf8e98f [CodeFactor] Apply fixes 2020-01-21 13:12:28 +13:00
Brenda Wallace
54778d9884 Likes popuplating from elastic, no more extra look ups 2020-01-01 08:38:27 +13:00
Brenda Wallace
fafe611315 reinstate planting harvest and planting seeds 2019-12-24 11:54:29 +13:00
Brenda Wallace
4a2bb2342c Sorting out cancancan, copied to common parent controller 2019-12-24 11:38:30 +13:00
Brenda Wallace
929374f77a rubocop renamed : Metrics/LineLength to : Layout/LineLength 2019-12-22 17:00:30 +13:00
codefactor-io
e8760f9c38 [CodeFactor] Apply fixes 2019-12-20 03:33:23 +00:00
codefactor-io
424132d32e [CodeFactor] Apply fixes to commit c9fddc4 2019-12-19 08:55:10 +00:00
Brenda Wallace
c9fddc4b7a Use slugs as params 2019-12-19 21:54:47 +13:00
Brenda Wallace
78e111af80 fixing paths to member harvests (with more tests too) 2019-12-19 16:54:05 +13:00
Brenda Wallace
38e36c4a2c Merge remote-tracking branch 'upstream/dev' into cache/harvests
Conflicts:
	.rubocop_todo.yml
	app/controllers/likes_controller.rb
	app/models/concerns/crop_search.rb
	app/services/crop_search_service.rb
2019-12-19 10:28:17 +13:00
Brenda Wallace
04fd1a343a Rubocop update (#2334)
* Update rubocop config

* Rubocop update - for rubocop 0.77

* [CodeFactor] Apply fixes

* rubocop fixes

* [CodeFactor] Apply fixes to commit 2826c2e
2019-12-16 22:35:33 +13:00
Brenda Wallace
b44877a63e Using elastic for plantings look ups 2019-12-11 11:38:34 +13:00
Brenda Wallace
7c38f7eca6 Pull homepage data directly from elasticsearch (#2316)
* Pull homepage data directly from elasticsearch

* Removing non-elasticsearch options

* [CodeFactor] Apply fixes to commit c46b2e7
2019-12-09 10:03:48 +13:00
Brenda
9159df81c9 Turn on bullet in dev 2019-12-04 21:02:33 +13:00
Brenda Wallace
9af275225e Fixed translations on navbar 2019-11-30 19:54:51 +13:00
Brenda Wallace
0c3149205b Put resources back into namespaces 2019-11-19 13:53:12 +13:00
Brenda Wallace
be4a250c63 renamed files to please rubocop 2019-11-18 11:08:23 +13:00
Brenda Wallace
4f8830676e Swagger docs 2019-11-18 10:15:06 +13:00
Brenda Wallace
818a980f6d Move jsonapi resources files 2019-11-18 10:11:53 +13:00
Brenda Wallace
47be6ad631 Merge branch 'dev' into role-admin 2019-10-21 14:24:31 +13:00
Brenda Wallace
c19d09bb37 Switch from unicorn to puma 2019-10-19 18:47:28 +13:00
Brenda Wallace
21848bf5b4 Merge branch 'dev' into role-admin 2019-10-19 09:42:49 +13:00
Brenda Wallace
b0c8b11246 📝 Inline editing and display tidy ups (#2200)
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13:00
bestest-mensch
80fb4f5fe6 add ability to delete multiple conversations at once 2019-10-07 21:38:19 +00:00