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
|
3cf2a50a34
|
modified Planting.interesting to have some options re: howmany and photos
|
2014-09-12 13:20:41 +10:00 |
|
Skud
|
09bef3f9d8
|
Added options for if you didn't plant/harvest anything
|
2014-09-12 12:30:27 +10:00 |
|
Skud
|
2bbccfc44d
|
Added tests for planting reminder email
|
2014-09-12 12:30:04 +10:00 |
|
Skud
|
00f58511ac
|
Merge pull request #414 from Growstuff/dev
Production push: finished plantings, crowdfunding banner, etc
|
2014-09-12 10:13:44 +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 |
|
Marlena Compton
|
80532e94f1
|
Merge remote-tracking branch 'origin/dev'
|
2014-09-11 06:46:41 -07:00 |
|
Mackenzie Morgan
|
550f3c5326
|
removing unneeded photo-related files
|
2014-09-09 22:18:43 -04:00 |
|
Mackenzie Morgan
|
ed537e583b
|
whitespace fixes and um oops no there shouldn't be a secret key in that config file
|
2014-09-09 20:31:14 -04:00 |
|
Mackenzie Morgan
|
2b7b5bad63
|
including all the new files needed for harvest photos, this time
|
2014-09-09 20:21:16 -04:00 |
|
Mackenzie Morgan
|
512ccdbaa2
|
merging the schema changes from finished plantings and making the timestamp newer, then making the styling on harvest photos match the new styling (no li) on planting photos
|
2014-09-09 20:19:25 -04:00 |
|
Mackenzie Morgan
|
7d54ab347f
|
Adding photo functionality to harvests
|
2014-09-09 19:55:40 -04: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 |
|