mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-04-02 06:01:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,109 Commits 55 Branches 76 Tags
036010bb39b4cc215eeae397af3c829f0bbfc8a2
Commit Graph

541 Commits

Author SHA1 Message Date
Brenda Wallace
fda4d88e5a Fix up locale spec 2019-07-02 04:52:39 +00:00
Brenda Wallace
ce60d6bb0c Remove stray \n in translation 2019-07-01 10:28:39 +00:00
Brenda Wallace
dc0607c42a Remove duplicated translations 2019-06-14 16:28:13 +12:00
Brenda Wallace
d98cb87d95 Wrapped long line 2019-06-14 16:27:28 +12:00
Brenda Wallace
19350e7aa0 Removing phantom 2019-06-14 16:15:49 +12:00
Brenda Wallace
d7b973e684 Add harvest predictions to homepage blurb 2019-06-14 15:58:27 +12:00
Brenda Wallace
040c414827 find translation of some_of_our_crops 2019-06-12 09:27:40 +12:00
Brenda Wallace
7e3d43c47c add missing translations for buttons 2019-06-12 09:10:37 +12:00
Brenda Wallace
c7ae520d66 add missing translation for "Record Harvest" 2019-06-09 09:54:28 +12:00
Brenda Wallace
73c834adf3 added missing translation 2019-05-25 19:15:35 +12:00
Brenda Wallace
0d3bdc09ab Tool tips on actions 2019-05-25 17:17:25 +12:00
Brenda Wallace
e4a375de79 Add missing translations 2019-05-24 20:37:32 +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
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
10a7689b05 Lint 2019-04-20 19:30:09 +12:00
Brenda Wallace
f60174a8b9 Merge remote-tracking branch 'upstream/dev' into feature/memcachier 2019-04-19 09:30:48 +12:00
Brenda Wallace
ad90dd6dfa Fixes wrong host name in emails 2019-04-08 14:23:34 +12:00
Brenda Wallace
629ffa1982 Update translations 2019-03-26 21:10:40 +13:00
Brenda Wallace
5395aefa66 Rename containers to garden types 2019-03-26 20:56:11 +13:00
Brenda Wallace
02e0dd091a Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens 2019-03-26 19:35:16 +13:00
Brenda Wallace
8e8c9d179b Added growstuff prefix to env variables 2019-03-26 15:57:29 +13:00
Brenda Wallace
607f0e3887 Rename to mapbox map id 2019-03-26 15:57:29 +13:00
Brenda Wallace
875fa49d44 Remove distinct staging env file 2019-03-26 15:57:29 +13:00
Brenda Wallace
ba27e14226 Move mapbox config to env 2019-03-26 15:57:29 +13:00
Brenda Wallace
59b3a68fc3 Configure memcachier for production 2019-03-26 15:57:29 +13:00
Brenda Wallace
3ed173ebcd Material design changes 2019-02-17 21:33:36 +13:00
Brenda Wallace
3722672869 Merge branch 'dev' into photos/seeds 2019-02-13 09:06:42 +13:00
Brenda Wallace
95db0f7297 Shortened the text on the badges 2019-02-09 14:18:15 +13:00
Brenda Wallace
aa8ed5bb3a Fix up translation on badges 2019-02-09 11:47:13 +13:00
Brenda Wallace
d2c63db59b Translate planting status 2019-02-04 21:42:54 +13:00
Brenda Wallace
8c03e3f4ab Merge branch 'dev' into bb-track-types-of-gardens 2019-01-30 16:45:14 +13:00
Brenda Wallace
52272550c8 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 2019-01-27 18:25:43 +13:00
Brenda Wallace
02d96bcc51 Removed another mandril reference 2019-01-26 14:02:50 +13:00
Brenda Wallace
986bca44f7 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 
Conflicts:
	app/views/layouts/_header.html.haml
	spec/features/gardens/actions_spec.rb
 2019-01-24 13:48:36 +13:00
Brenda Wallace
e66f8298c8 Merge branch 'dev' into remove-mandrill 2019-01-24 12:20:39 +13:00
Brenda Wallace
e17e5c9297 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-24 12:20:26 +13:00
Brenda Wallace
449e8da25a Added missing translation for Edit profile button 2019-01-24 12:17:40 +13:00
Brenda Wallace
6e433306f4 Capitalise some translations 2019-01-24 12:17:40 +13:00
Brenda Wallace
655efb26eb Removing some unused translations 2019-01-24 12:17:40 +13:00
Brenda Wallace
313a18db08 Titles of pages consistent with buttons to pages 2019-01-24 12:17:40 +13:00
Brenda Wallace
67e58fe901 Moving buttons to the right of page (with translations) 2019-01-24 12:17:40 +13:00
Brenda Wallace
a4f20bff77 More button label translations 2019-01-24 12:17:40 +13:00
Brenda Wallace
acc100f744 Adding missing translations for plantings 2019-01-24 12:17:40 +13:00
Brenda Wallace
30255a24d2 Use buttons.* translations for glyphicons titles 2019-01-24 12:17:40 +13:00
Brenda Wallace
7acff05ccc Merge branch 'dev' into bb-track-types-of-gardens 2019-01-23 13:58:31 +13:00
Brenda Wallace
5a2f7dfe25 Merge branch 'dev' into routes-tidy-up 2019-01-23 13:58:01 +13:00
apdarr
58f8a88242 set newrelic to use ssl 2019-01-23 13:57:32 +13:00
Brenda Wallace
e1fdc729db Merge branch 'dev' into bb-track-types-of-gardens 2019-01-21 11:36:46 +13:00
Brenda Wallace
45793c1cec Merge branch 'dev' into routes-tidy-up 2019-01-19 12:37:53 +13:00
Brenda Wallace
5b732fedae Remove references to MANDRILL 2019-01-19 12:36:27 +13:00