Commit Graph

1844 Commits

Author SHA1 Message Date
Taylor Griffin
aebd9e1d4e remove a file that accidentally found its way in from another unrelated branch 2014-09-28 22:03:50 +10:00
Taylor Griffin
a7da4b9ce4 no longer necessary to pass locale quuery param in every url 2014-09-28 21:38:28 +10:00
Taylor Griffin
f9dc17c587 no longer raise exception on missing g translation in dev / test envs 2014-09-28 21:34:26 +10:00
Taylor Griffin
d10a62d336 set locale from subdomain 2014-09-28 21:32:15 +10:00
Taylor Griffin
984503480f remove necessity to add locale to url if current locale is English 2014-09-25 07:00:11 +10:00
Taylor Griffin
5e48c4392a move site name into localization 2014-09-24 18:29:59 +10:00
Taylor Griffin
d462254021 add missing translation 2014-09-21 10:26:30 +10:00
Taylor Griffin
1acba65a8b clean up haml a bit 2014-09-21 10:22:46 +10:00
Taylor Griffin
8f14ffe560 catch up with dev 2014-09-20 23:01:35 +10:00
Taylor Griffin
93cd067fff add two contributors 2014-09-20 21:59:05 +10:00
Taylor Griffin
e3a6742574 add sample japanese locale file to test changing languages 2014-09-20 21:56:14 +10:00
Taylor Griffin
659a68cf39 remove missing translations spec in favor of running dedicated task 2014-09-20 21:49:30 +10:00
Taylor Griffin
e3f590ede5 abstract strings in home views into locale file 2014-09-20 21:47:18 +10:00
pozorvlak
6efeb04449 Merge pull request #416 from oshiho3/bugfix_markdown
updated regex for crop in markdown
2014-09-19 23:45:16 +01:00
pozorvlak
52b4e27d8c Merge pull request #415 from oshiho3/bugfix_plantphoto
added planting_id param to Flickr set search (new_photo_path form).
2014-09-19 16:42:49 +01:00
Shiho Takagi
60354264d6 Included PT bug# to its test description. Test using the case from the bug 2014-09-19 16:00:25 +10:00
Shiho Takagi
87643c3d1a Merge branch 'bugfix_plantphoto' of https://github.com/oshiho3/growstuff into bugfix_plantphoto 2014-09-19 15:33:35 +10:00
Shiho Takagi
aa028db2dc added planting_id param to Flickr set search (new_photo_path form). 2014-09-19 15:29:12 +10:00
Taylor Griffin
983fa8ede0 abstract strings out of blurb partial 2014-09-19 07:29:04 +10:00
Taylor Griffin
16f4d2f80e fix spec to check href with newly added locale query param 2014-09-19 07:17:08 +10:00
Shiho Takagi
dd75f2aef9 updated regex for crop in markdown 2014-09-18 14:18:18 +10:00
Taylor Griffin
f8ee9d0589 don't scope routes to locale to make url prettier because it breaks tests like whoa 2014-09-18 07:14:35 +10:00
Taylor Griffin
87df8661c7 raise exception on missing translations in test and dev environment 2014-09-18 06:24:59 +10:00
Taylor Griffin
f355c393f0 basic setup 2014-09-18 06:15:59 +10:00
Shiho Takagi
eeb2bf9938 added planting_id param to Flickr set search (new_photo_path form). 2014-09-17 21:38:43 +10:00
Skud
374c17c928 Merge pull request #413 from Skud/talklinks
Fixed mailing list link to point to Talk instead
2014-09-12 09:10:42 +10:00
Skud
46eaf37437 Fixed mailing list link to point to Talk instead 2014-09-12 09:10:13 +10:00
Skud
9bd4160102 Merge branch 'Skud-finished2' into dev 2014-09-12 08:41:46 +10:00
Skud
29d43f4e5b Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished2 2014-09-12 08:40:57 +10:00
Skud
aefbce3b1f Merge pull request #411 from Skud/crowdfunding
added sitewide crowdfunding banner
2014-09-12 08:39:27 +10:00
Skud
374987488f Fixed broken tests. 2014-09-12 08:30:44 +10:00
Skud
fa9c029493 added sitewide crowdfunding banner 2014-09-12 08:10:58 +10:00
Skud
85b5ac12ca added validation for finished_at (must be after planted_at) 2014-09-12 07:50:25 +10:00
Skud
03235f3952 Add warning about plantings being marked as finished 2014-09-12 07:43:41 +10:00
Skud
51d9bfe97e Merge branch 'Skud-finished' into dev 2014-09-10 09:12:44 +10:00
Skud
9d5c15a7da Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished
Conflicts:
	spec/features/plantings/planting_a_crop_spec.rb
2014-09-10 09:12:27 +10:00
Skud
e0485ade1d Added test to make sure the wrong plantings aren't finished 2014-09-10 08:06:07 +10:00
Skud
fb91c78933 Merge pull request #409 from tygriffin/prefill-crop-bug
Prefill crop bug
2014-09-09 22:05:15 +10:00
Taylor Griffin
138904bd82 write regression test for creating plantings, harvests and seeds form crop page 2014-09-09 21:52:50 +10:00
Taylor Griffin
00b24890f4 accept a default value in options hash of autosuggest helper 2014-09-09 21:27:21 +10:00
Skud
0c944357c0 Merge pull request #408 from catfriend/dev
Added placeholder text for crop auto suggest
2014-09-06 15:15:17 +10:00
catfriend
885ffab012 added contributor info 2014-09-05 20:36:58 -07:00
catfriend
b0ee83bc3e added test for adding placeholder text 2014-09-05 16:23:33 -07:00
catfriend
4caf7b9b28 added placeholder text per 78178814 2014-09-05 15:30:34 -07:00
Skud
56eaea9c06 Merge pull request #405 from Skud/cropmess
Crop and photo bugfixes
2014-09-04 21:23:31 +10:00
Skud
3c968ea6be Merge pull request #406 from Skud/branding2
Branding
2014-09-04 20:02:16 +10:00
Skud
a3213a99e8 Added apple icon for iOS users 2014-09-04 19:03:07 +10:00
Skud
495f4194e7 Fixed test for branding in navbar 2014-09-04 19:02:38 +10:00
Skud
7543221f73 Added 'skip navigation menu' link for screenreaders 2014-09-04 18:40:51 +10:00
Skud
7184b04397 Added favicon 2014-09-04 18:37:27 +10:00