Brenda Wallace
|
ffee6ada83
|
Simplify member.update_newsletter_subscription
|
2017-02-04 11:18:00 +13:00 |
|
Brenda Wallace
|
63b71a9265
|
Reduce controller complexity
|
2017-02-04 11:18:00 +13:00 |
|
pozorvlak
|
3ecc7ba99b
|
Merge pull request #1178 from Br3nda/bw/plantingshelper-simplify
PlantingsHelper simplification
|
2017-02-03 13:36:42 +00:00 |
|
pozorvlak
|
3e81419e78
|
Merge branch 'dev' into bw/plantingshelper-simplify
|
2017-02-03 12:08:54 +00:00 |
|
pozorvlak
|
7cd8dfa0c7
|
Merge pull request #1176 from Br3nda/bw/seeds-controller-complexity
Reduce complexity of seeds controller
|
2017-02-03 12:08:45 +00:00 |
|
pozorvlak
|
9182c8ceb1
|
Merge branch 'dev' into bw/seeds-controller-complexity
|
2017-02-03 11:12:20 +00:00 |
|
pozorvlak
|
ec8096233c
|
Merge pull request #1179 from CloCkWeRX/repair_gemfile
Repair missing items from Gemfile.lock - jasmine/phantomjs
|
2017-02-03 11:11:28 +00:00 |
|
Brenda Wallace
|
19aa3a1ca4
|
PlantingsHelper simplification
|
2017-02-03 20:42:15 +13:00 |
|
Shiny
|
e574ee166c
|
Merge branch 'dev' into bw/seeds-controller-complexity
|
2017-02-03 20:32:29 +13:00 |
|
Daniel O'Connor
|
93e9428bb6
|
Repair missing items from Gemfile.lock
|
2017-02-03 11:11:47 +10:30 |
|
pozorvlak
|
fcf453b9d9
|
Merge pull request #1173 from Br3nda/bw/inactive-gardens
hide inactive gardens by default
|
2017-02-02 22:57:54 +00:00 |
|
pozorvlak
|
909164ea70
|
Merge branch 'dev' into bw/inactive-gardens
|
2017-02-02 22:40:21 +00:00 |
|
pozorvlak
|
b5a5aca67b
|
Merge pull request #1175 from Br3nda/bw/plantings-controller-complexity
Reduce complexity of plantings controller
|
2017-02-02 22:22:41 +00:00 |
|
Shiny
|
2424e7de87
|
Merge branch 'dev' into bw/inactive-gardens
|
2017-02-02 14:48:31 +13:00 |
|
Shiny
|
d367b44da1
|
Merge branch 'dev' into bw/plantings-controller-complexity
|
2017-02-02 14:48:14 +13:00 |
|
Shiny
|
fe999d7170
|
Merge branch 'dev' into bw/seeds-controller-complexity
|
2017-02-02 14:47:10 +13:00 |
|
Daniel O'Connor
|
3267fd7d1f
|
Merge pull request #1177 from Br3nda/bw/simplify-harvest-to-s
Simplified harvest.to_s
|
2017-02-02 10:58:16 +10:30 |
|
Brenda Wallace
|
355419b6cb
|
Reduce complexity of seeds controller
|
2017-02-02 00:01:48 +00:00 |
|
Brenda Wallace
|
dfa23a6564
|
Simplified harvest.to_s
|
2017-02-01 23:55:45 +00:00 |
|
Brenda Wallace
|
9099ee5779
|
Reduce complexity of plantings controller
|
2017-02-01 23:51:14 +00:00 |
|
Brenda Wallace
|
7ba9049908
|
spec only show active gardens
|
2017-02-01 18:25:56 +13:00 |
|
Brenda Wallace
|
c82127f1fb
|
Modify specs for new titles on garden nav buttons
|
2017-02-01 17:37:03 +13: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 |
|
Daniel O'Connor
|
e8e1e33a07
|
Merge pull request #1172 from pozorvlak/install_d3
Install d3-rails gem in production and staging
|
2017-01-31 11:01:41 +10:30 |
|
Miles Gould
|
18e6e8510c
|
Install d3-rails gem in production and staging
It was only being installed in development and test environments,
causing deployment failures.
Fixes #1170
|
2017-01-30 20:17:42 +00:00 |
|
Daniel O'Connor
|
64d7c2535b
|
Merge pull request #1168 from Br3nda/likeable
Reviving Likeable
|
2017-01-27 12:30:36 +10:30 |
|
Daniel O'Connor
|
15106a051c
|
Merge branch 'dev' into likeable
|
2017-01-27 12:05:13 +10:30 |
|
Daniel O'Connor
|
62fe72c9f4
|
Merge pull request #1143 from pozorvlak/bw/bar_graphs
[WIP] bar graphs
|
2017-01-27 12:01:03 +10:30 |
|
Daniel O'Connor
|
43519809f5
|
Merge branch 'dev' into bw/bar_graphs
|
2017-01-27 11:54:12 +10:30 |
|
Shiny
|
7731623397
|
Merge branch 'dev' into likeable
|
2017-01-27 14:21:53 +13:00 |
|
pozorvlak
|
3b3e14fadb
|
Merge pull request #1161 from Br3nda/bw/pending-crops
Member can see crops they have requested
|
2017-01-26 11:21:24 +00:00 |
|
Daniel O'Connor
|
271242eca9
|
Merge branch 'dev' into bw/bar_graphs
|
2017-01-25 13:00:25 +10:30 |
|
Daniel O'Connor
|
a607fdc6ec
|
Merge branch 'dev' into likeable
|
2017-01-25 12:58:55 +10:30 |
|
Daniel O'Connor
|
6d1bdf9ae1
|
Merge branch 'dev' into bw/pending-crops
|
2017-01-25 12:55:13 +10:30 |
|
Daniel O'Connor
|
25058d02fc
|
Merge pull request #1164 from Br3nda/bw/link-from-harvest-to-planting
Link from harvest to planting, instead of garden
|
2017-01-25 12:54:42 +10:30 |
|
Shiny
|
b80e7f677c
|
Merge branch 'dev' into likeable
|
2017-01-24 19:44:42 +13:00 |
|
pozorvlak
|
576426c30d
|
Merge pull request #1166 from Br3nda/bw/fix-notify-sys-exit
Fix crashing on email send - HOTFIX to master
|
2017-01-23 17:54:19 +00:00 |
|
Shiny
|
c9b464771d
|
Merge branch 'master' into bw/fix-notify-sys-exit
|
2017-01-23 21:50:22 +13:00 |
|
Shiny
|
76af02f2a5
|
Merge branch 'dev' into bw/bar_graphs
|
2017-01-23 20:18:19 +13:00 |
|
Shiny
|
346970b471
|
Merge branch 'dev' into bw/pending-crops
|
2017-01-23 20:17:44 +13:00 |
|
Shiny
|
e6d3c257e8
|
Merge branch 'dev' into bw/link-from-harvest-to-planting
|
2017-01-23 20:17:34 +13:00 |
|
Daniel O'Connor
|
7224ef8848
|
Merge pull request #1159 from Br3nda/bw/garden-display-fix
Fix display of gardens on smaller screens
|
2017-01-23 14:59:43 +10:30 |
|
Brenda Wallace
|
dd9a0071d2
|
Link from harvest to planting, instead of garden
|
2017-01-23 09:58:25 +13:00 |
|
Brenda Wallace
|
65b4b2d23e
|
Feature spec for requested crops
|
2017-01-23 09:49:47 +13:00 |
|
Brenda Wallace
|
4fedc7f23f
|
Member can see crops they have requested
|
2017-01-23 09:49:47 +13:00 |
|
Shiny
|
26b3e28171
|
Merge branch 'dev' into bw/garden-display-fix
|
2017-01-23 09:41:37 +13:00 |
|
Daniel O'Connor
|
29765c7bab
|
Merge pull request #1160 from Br3nda/bw/fix-notify-sys-exit
change deliver_later to deliver_now, so we don't sys.exit() crash
|
2017-01-23 00:21:47 +10:30 |
|
Brenda Wallace
|
370938c9f9
|
change deliver_later to deliver_now, so we don't sys.exit() crash
|
2017-01-22 21:22:30 +13:00 |
|
Cesy
|
e578ca2c77
|
Merge pull request #1153 from Growstuff/dev
Release 18
release18
|
2017-01-22 07:47:42 +00:00 |
|