 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 |
|
|
Brenda Wallace
|
08d407f041
|
Fix display of gardens on smaller screens
|
2017-01-22 20:33:37 +13:00 |
|
|
Shiny
|
d6de147661
|
Merge branch 'dev' into bw/bar_graphs
|
2017-01-22 18:39:53 +13:00 |
|
|
Brenda Wallace
|
9cadbdec2b
|
Regenerated schema file
|
2017-01-22 18:27:32 +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 |
|
|
Daniel O'Connor
|
c4c50a4174
|
Merge pull request #1158 from Br3nda/bw/controller-translations
more controller translations
|
2017-01-22 15:34:14 +10:30 |
|
|
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 |
|
|
Daniel O'Connor
|
eab9bcb37d
|
Merge pull request #1157 from Br3nda/bw/rubocop-hash-braces
Removed unnecesary braces on hash args
|
2017-01-22 13:22:11 +10:30 |
|
|
Brenda Wallace
|
40a981c94d
|
Removed unnecesary braces on hash args
|
2017-01-22 15:10:11 +13:00 |
|
|
Cesy
|
dd2af6a0e3
|
Merge pull request #1155 from CloCkWeRX/2017-01-21-gem-updates
2017 01 21 gem updates
|
2017-01-21 19:49:05 +00:00 |
|
|
Daniel O'Connor
|
9192ccf52b
|
Update coveralls
|
2017-01-21 17:02:40 +10:30 |
|
|
Daniel O'Connor
|
4e79fd201c
|
Update omniauth
|
2017-01-21 17:01:59 +10:30 |
|
|
Daniel O'Connor
|
d266d7ed1a
|
Update i18n-tasks
|
2017-01-21 16:52:24 +10:30 |
|
|
Daniel O'Connor
|
f7f1907b74
|
Silence config/routes.rb:1:39: W: Lint/UnneededDisable: Unnecessary disabling of Metrics/BlockLength for now
|
2017-01-21 16:45:04 +10:30 |
|
|
Daniel O'Connor
|
c42e9ca410
|
Upgrade factory_girl_rails
|
2017-01-21 16:42:04 +10:30 |
|
|
Daniel O'Connor
|
f97c465a92
|
Update geocoder
|
2017-01-21 16:41:15 +10:30 |
|
|
Daniel O'Connor
|
a5b566a207
|
Update lumberjack
|
2017-01-21 16:40:27 +10:30 |
|
|
Daniel O'Connor
|
c6d16c92f5
|
Update public_suffix
|
2017-01-21 16:40:04 +10:30 |
|
|
Daniel O'Connor
|
c5b2e37730
|
Update diff-lcs
|
2017-01-21 16:39:31 +10:30 |
|
|
Daniel O'Connor
|
5c642dfef9
|
Really disable
|
2017-01-21 16:37:30 +10:30 |
|
|
Daniel O'Connor
|
a9b8253dfa
|
Update connection_pool
|
2017-01-21 16:35:33 +10:30 |
|
|
Daniel O'Connor
|
58a3cbf569
|
Disable check for now
|
2017-01-21 16:28:57 +10:30 |
|
|
Daniel O'Connor
|
8b4c8fef3b
|
Pin to earlier version of rainbow until https://github.com/sickill/rainbow/issues/44 is sorted
|
2017-01-21 16:14:37 +10:30 |
|