 Brenda Wallace
|
8d24ffbffb
|
spec for harvesting from a planting
|
2017-02-13 17:21:11 +13:00 |
|
|
Brenda Wallace
|
cce9f513db
|
Linking existing harvests to a planting
|
2017-02-13 17:21:11 +13:00 |
|
|
Brenda Wallace
|
c37ba9f041
|
Use @harvest.planting, instead of @planting
|
2017-02-13 17:21:11 +13:00 |
|
|
Brenda Wallace
|
2c871abd03
|
don't allow owner in params
|
2017-02-13 07:41:53 +13:00 |
|
|
Mackenzie
|
4fa423bcab
|
Merge pull request #1205 from Br3nda/dry-notifications
DRY for the notifications controller
|
2017-02-12 10:21:31 -05:00 |
|
|
Mackenzie
|
97d0bb6752
|
Merge pull request #1207 from Br3nda/DRY-plantparts
DRY the plant parts controller
|
2017-02-12 10:20:30 -05:00 |
|
|
Mackenzie
|
b9edd2f89b
|
Merge pull request #1203 from Br3nda/access
Added cancan ability for likes (and DRY-ed)
|
2017-02-12 10:20:03 -05:00 |
|
|
Brenda Wallace
|
1275aa0102
|
DRY the plant parts controller
|
2017-02-12 22:58:17 +13:00 |
|
|
Brenda Wallace
|
f40ff18949
|
You can only reply to messages that were sent to you.
|
2017-02-12 22:15:50 +13:00 |
|
|
Brenda Wallace
|
f25d4dbf8c
|
DRY for the notifications controller
|
2017-02-12 21:52:22 +13:00 |
|
|
Brenda Wallace
|
b8e06a1d1d
|
Specs for deleting someone else's like
|
2017-02-12 20:50:50 +13:00 |
|
|
Brenda Wallace
|
fa0c00aa9c
|
Named arg (liked_by_member) fixed
cos i was writing python when this is meant to be ruby
|
2017-02-12 17:37:32 +13:00 |
|
|
Brenda Wallace
|
72d0514e75
|
Further checks in likes controller
|
2017-02-12 15:33:54 +13:00 |
|
|
Brenda Wallace
|
dc62365c7d
|
DRY likes controller further
|
2017-02-12 15:23:58 +13:00 |
|
|
Brenda Wallace
|
d8d94d178c
|
Moved some of likes#destroy out to new methods
|
2017-02-12 15:23:58 +13:00 |
|
|
Brenda Wallace
|
6afb12c157
|
Split up big methods in like controller
|
2017-02-12 15:23:58 +13:00 |
|
|
Brenda Wallace
|
a0be52fdaa
|
likes doesn't have an index
|
2017-02-12 15:23:58 +13:00 |
|
|
Shiny
|
23ae7fcd8c
|
Merge branch 'dev' into time-zones
|
2017-02-12 12:14:01 +13:00 |
|
|
Brenda Wallace
|
01c6a6da9f
|
improvements to alternate names controller
|
2017-02-11 19:45:33 +13:00 |
|
|
Brenda Wallace
|
be2426c99f
|
Use timezone when creating dates
|
2017-02-10 21:53:18 +13:00 |
|
|
Brenda Wallace
|
33b7952ed3
|
Simplified OmniauthCallbacksController
|
2017-02-04 11:21:15 +13:00 |
|
|
Brenda Wallace
|
1217ba5b48
|
Reduce complexity of ApplicationController.store_location
|
2017-02-04 11:19:11 +13:00 |
|
|
Shiny
|
e574ee166c
|
Merge branch 'dev' into bw/seeds-controller-complexity
|
2017-02-03 20:32:29 +13:00 |
|
|
pozorvlak
|
909164ea70
|
Merge branch 'dev' into bw/inactive-gardens
|
2017-02-02 22:40:21 +00:00 |
|
|
Brenda Wallace
|
355419b6cb
|
Reduce complexity of seeds controller
|
2017-02-02 00:01:48 +00:00 |
|
|
Brenda Wallace
|
9099ee5779
|
Reduce complexity of plantings controller
|
2017-02-01 23:51:14 +00:00 |
|
|
Brenda Wallace
|
666394906b
|
Active gardens only on profiles
|
2017-02-01 17:37:03 +13:00 |
|
|
Brenda Wallace
|
150393b1c3
|
Show only active gardens by default
|
2017-02-01 17:37:03 +13:00 |
|
|
Shiny
|
7731623397
|
Merge branch 'dev' into likeable
|
2017-01-27 14:21:53 +13:00 |
|
|
Shiny
|
b80e7f677c
|
Merge branch 'dev' into likeable
|
2017-01-24 19:44:42 +13:00 |
|
|
Brenda Wallace
|
4fedc7f23f
|
Member can see crops they have requested
|
2017-01-23 09:49:47 +13:00 |
|
|
Brenda Wallace
|
370938c9f9
|
change deliver_later to deliver_now, so we don't sys.exit() crash
|
2017-01-22 21:22:30 +13:00 |
|
|
Brenda Wallace
|
5e61be9853
|
Merge remote-tracking branch 'upstream/dev' into HEAD
|
2017-01-22 18:26:38 +13:00 |
|
|
Brenda Wallace
|
ff50ec65d0
|
Merge remote-tracking branch 'upstream/dev' into HEAD
|
2017-01-22 18:26:29 +13:00 |
|
|
Brenda Wallace
|
a1c74bfdfb
|
Translations for members controller
|
2017-01-22 17:36:48 +13:00 |
|
|
Brenda Wallace
|
2f9453780e
|
Translations for harvests controller
|
2017-01-22 17:28:49 +13:00 |
|
|
Brenda Wallace
|
725ae817d4
|
Translations for gardens controller
|
2017-01-22 17:26:30 +13:00 |
|
|
Brenda Wallace
|
40a981c94d
|
Removed unnecesary braces on hash args
|
2017-01-22 15:10:11 +13:00 |
|
|
Shiny
|
6121a9bc6e
|
Merge branch 'dev' into bw/translations
|
2017-01-20 21:05:31 +11:00 |
|
|
Brenda Wallace
|
b198305d36
|
Translations for account controller
|
2017-01-20 22:48:04 +13:00 |
|
|
Brenda Wallace
|
7d7f5bfda3
|
Translations for account types
|
2017-01-20 22:46:12 +13:00 |
|
|
pozorvlak
|
cc59c4f49b
|
Merge branch 'dev' into bw/rubocop
|
2017-01-17 16:47:07 +00:00 |
|
|
Brenda Wallace
|
0fa9f54c9c
|
Rename member.has_role? to role?
|
2017-01-14 20:54:43 +13:00 |
|
|
Brenda Wallace
|
c1da5e4dc8
|
Split plantings#index into two methods to simplify
|
2017-01-14 16:47:29 +13:00 |
|
|
Brenda Wallace
|
6bdfe5a669
|
Moved plantings nav bar to own file and simplified
|
2017-01-14 16:32:03 +13:00 |
|
|
Shiny
|
15de4ac08c
|
Merge branch 'dev' into bw/active-plantings
|
2017-01-08 11:16:19 +13:00 |
|
|
Shiny
|
5ca8829727
|
Merge branch 'dev' into bw/active-plantings
|
2017-01-05 16:35:39 +13:00 |
|
|
Shiny
|
d40eccdb63
|
Merge branch 'dev' into bw/harvests-linkto-plantings
|
2017-01-05 16:31:22 +13:00 |
|
|
Brenda Wallace
|
283bb76a9e
|
Link a harvest to a planting, and display
|
2017-01-04 22:45:49 +13:00 |
|
|
Brenda Wallace
|
b27b361e2f
|
Show active plantings by default
|
2017-01-04 16:25:19 +13:00 |
|