4447 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	191c8e4e9d	Display messages even when member is deleted	2017-10-20 23:44:51 +13:00
deppbot	edc763cd8c	Bundle Update on 2017-10-19	2017-10-20 23:23:02 +13:00
pozorvlak	62eaa07862	Merge pull request #1401 from Br3nda/fix/codestyle ... Another code style fixup	2017-10-18 10:52:38 +01:00
pozorvlak	f26420c380	Merge branch 'dev' into fix/codestyle	2017-10-18 10:41:03 +01:00
pozorvlak	6de13b7327	Merge pull request #1402 from Br3nda/fix/heroku-deploys ... Update heroku maintenance script - maintenance is just an attribute now	2017-10-18 10:34:33 +01:00
Brenda Wallace	310f631f40	Ignore one Style/ClassAndModuleChildren	2017-10-18 20:45:27 +13:00
Brenda Wallace	bec59aba43	Merge remote-tracking branch 'origin/fix/codestyle' into fix/codestyle	2017-10-18 19:27:36 +13:00
Brenda Wallace	c86902967d	Merge remote-tracking branch 'upstream/dev' into fix/codestyle	2017-10-18 19:27:08 +13:00
Brenda Wallace	361e3df692	Added hound config	2017-10-18 19:26:36 +13:00
Shiny	ce18bef892	Merge branch 'dev' into fix/codestyle	2017-10-18 14:01:57 +13:00
Shiny	ac2b0d04ea	Merge branch 'dev' into fix/heroku-deploys	2017-10-18 13:40:52 +13:00
Brenda Wallace	9d0b48b84c	Update heroku maintenance script ... maintenance is just an attribute now	2017-10-18 13:37:54 +13:00
Brenda Wallace	d8f41b5ca0	Use ! to indicate the method changes class variables	2017-10-18 12:20:28 +13:00
Brenda Wallace	b5fbfaf515	Fixed duplicated code in growstuff member link markdown	2017-10-18 12:13:05 +13:00
Brenda Wallace	ce9a71cdad	Moved member look up to a method (less duplicate code)	2017-10-18 12:10:59 +13:00
Brenda Wallace	42a10bcd80	Fixed members link in growstuff markdown	2017-10-18 12:10:04 +13:00
Brenda Wallace	33656a4104	Fixed links to crops in growstuff markdown	2017-10-18 12:05:22 +13:00
pozorvlak	ca200c1f30	Merge pull request #1400 from Br3nda/fix/heroku-deploys ... Migrate to new heroku platform api - maintenance mode trigger	2017-10-17 14:52:16 +01:00
Brenda Wallace	ccd352d699	Removed some rubocop todos	2017-10-17 22:33:22 +13:00
Brenda Wallace	bd396dabfe	More simplification of growstuff markup	2017-10-17 22:29:02 +13:00
Brenda Wallace	1279dd63bc	Reduced complexity of growstuff_markdown	2017-10-17 22:20:17 +13:00
Brenda Wallace	8d681dd90a	Another code style fixup	2017-10-17 17:29:48 +13:00
Brenda Wallace	dfd0e1dbf5	Migrate to new heroku platform api - maintenance mode trigger	2017-10-17 16:23:12 +13:00
deppbot	0d555542c2	Bundle Update on 2017-10-16	2017-10-16 18:46:50 +13:00
deppbot	99a69cd492	Bundle Update on 2017-09-28	2017-10-16 14:52:16 +13:00
deppbot	e8e9aa23b2	Bundle Update on 2017-09-25	2017-09-25 09:34:12 +13:00
pozorvlak	2fafc6f3e4	Merge pull request #1391 from Br3nda/feature/bundle-update-and-heroku-api-change ... Bundle update and change to platform-api instead of heroku	2017-09-24 14:59:44 +01:00
Brenda Wallace	6b1714eb05	Only install elastic search in travis on the matix that tests elasticsearch	2017-09-24 18:50:23 +13:00
Brenda Wallace	8e5c52e85e	Outputs which version of elasticsearch we are running on travis	2017-09-24 18:40:50 +13:00
Brenda Wallace	c749f4a813	Install elastic search 2.4.0 when running on travis	2017-09-24 18:35:39 +13:00
Brenda Wallace	5ed5f9ec7e	Sleep before tests ... as suggested here https://docs.travis-ci.com/user/database-setup/#ElasticSearch	2017-09-24 15:17:39 +13:00
Brenda Wallace	f4658df208	Further gem updates	2017-09-24 14:28:51 +13:00
Brenda Wallace	e21b95a353	Use floats, so the percentage calc works	2017-09-13 22:21:15 +12:00
Brenda Wallace	19205cb6a8	update from erubi to erubis gem broke stuff - rolling back	2017-09-13 22:08:21 +12:00
Brenda Wallace	17521cde17	Set required executable to jshint linting	2017-09-13 22:01:33 +12:00
Brenda Wallace	5f7d48c633	Don't need to create database if just running linters	2017-09-05 14:30:03 +12:00
Brenda Wallace	94bb3bf6bb	Remove git guilt	2017-09-05 14:22:52 +12:00
Brenda Wallace	c9aacd0110	Specify the executable in the npm installed linters	2017-09-05 14:20:28 +12:00
Brenda Wallace	ca5f14bb37	Specify the executable in the npm installed linters	2017-09-05 14:19:24 +12:00
Brenda Wallace	43da004ccb	Bundle update and change to platform-api instead of heroku	2017-09-05 13:58:56 +12:00
Cesy	2704fcf515	Merge pull request #1387 from Br3nda/ruby-2-4-1 ... Bump ruby version to 2.4.1	2017-09-04 11:21:40 +01:00
Shiny	1af19335d7	Merge branch 'dev' into ruby-2-4-1	2017-09-01 13:00:46 +12:00
Shiny	4d33c32866	Merge branch 'master' into dev	2017-09-01 12:20:15 +12:00
Brenda Wallace	01333bf965	Use string.start_with? instead of a regexp	2017-09-01 12:11:57 +12:00
Brenda Wallace	a145abff56	Changed regex to matches? to appease rubocop	2017-08-31 21:27:22 +12:00
Brenda Wallace	9732553d3b	Added xmlrpc gem to solve rake errors on travis	2017-08-31 21:04:55 +12:00
Brenda Wallace	9142613b6b	Bump ruby version to 2.4.1	2017-08-22 13:49:43 +12:00
Cesy	7132c95b61	Merge pull request #1382 from Growstuff/bundle-update-2017-08-03-163455 ... Bundle Update on 2017-08-03	2017-08-21 09:40:49 +01:00
Shiny	38b2d8de0f	Merge branch 'dev' into master release28	2017-08-20 17:25:01 +12:00
Shiny	8f76ccf836	Merge branch 'dev' into bundle-update-2017-08-03-163455	2017-08-20 17:21:38 +12:00