11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
ancyentMariner	491982f8f3	added security contact info to readme ... udpated to actual email address added name to contributors	2017-08-20 17:21:14 +12:00
deppbot	58e6411bbe	Bundle Update on 2017-08-03	2017-08-03 16:34:56 +08:00
Daniel O'Connor	ac7e116eae	Merge pull request #1375 from Growstuff/bundle-update-2017-07-25-161454 ... Bundle Update on 2017-07-25	2017-08-03 14:17:43 +09:30
deppbot	1526257a0d	Bundle Update on 2017-07-25	2017-07-25 16:14:55 +08:00
deppbot	7234848c5f	Bundle Update on 2017-07-22	2017-07-24 06:57:44 +12:00
deppbot	6e453707b9	Bundle Update on 2017-07-18	2017-07-20 21:24:40 +12:00
Daniel O'Connor	dac2d1d4c2	Merge pull request #1367 from Growstuff/bundle-update-2017-06-28-101508 ... Bundle Update on 2017-06-28	2017-07-17 23:31:09 +09:30
deppbot	6c4c1ff8ba	Bundle Update on 2017-06-25 release27	2017-06-30 07:06:28 +12:00
deppbot	93d1bfd05d	Bundle Update on 2017-06-22	2017-06-30 07:06:28 +12:00
deppbot	6167e291d2	Bundle Update on 2017-06-18	2017-06-30 07:06:28 +12:00
Cesy Avon	deb1e27176	Making rubocop happy	2017-06-30 07:06:28 +12:00
Cesy Avon	82bb6c2f3b	Putting jquery-ui-rails back so things work	2017-06-30 07:06:28 +12:00
Cesy Avon	24d9d714b2	Bundle update	2017-06-30 07:06:28 +12:00
Cesy Avon	d9ad55db7c	Removing any locks on versions that don't have comments explaining why	2017-06-30 07:06:28 +12:00
deppbot	4dad76e635	Bundle Update on 2017-06-15	2017-06-30 07:06:28 +12:00
deppbot	252791b47d	Bundle Update on 2017-06-12	2017-06-30 07:06:28 +12:00
deppbot	aa849c2e1f	Bundle Update on 2017-06-28	2017-06-28 10:15:09 +08:00
Shiny	b03a59cb93	Merge branch 'master' into dev	2017-06-25 12:09:34 +12:00
deppbot	e761ecc356	Bundle Update on 2017-06-25	2017-06-25 12:08:30 +12:00
deppbot	69b887ba79	Bundle Update on 2017-06-22	2017-06-22 08:09:01 +12:00
deppbot	e4c2f777ac	Bundle Update on 2017-06-18	2017-06-19 23:06:24 +12:00
Daniel O'Connor	f0cb635b42	Merge pull request #1362 from cesy/bundleupdate2 ... Upgrade and unpin some gems	2017-06-16 07:52:55 +09:30
Cesy Avon	4116e201b5	Making rubocop happy	2017-06-15 15:28:50 +00:00
Cesy Avon	5788c0c5ce	Putting jquery-ui-rails back so things work	2017-06-15 15:28:50 +00:00
Cesy Avon	6f6e0a58a3	Bundle update	2017-06-15 15:28:50 +00:00
Cesy Avon	15b49672ee	Removing any locks on versions that don't have comments explaining why	2017-06-15 15:28:14 +00:00
Daniel O'Connor	9e2c7d0748	Merge pull request #1361 from Growstuff/bundle-update-2017-06-15-181612 ... Bundle Update on 2017-06-15	2017-06-15 20:04:07 +09:30
deppbot	5ff0e2c565	Bundle Update on 2017-06-15	2017-06-15 18:16:13 +08:00
Cesy	d40665fb08	Merge pull request #1360 from Growstuff/bundle-update-2017-06-12-143439 ... Bundle Update on 2017-06-12	2017-06-12 09:03:45 +01:00
Cesy	3b6a42b8f2	Merge pull request #1343 from Growstuff/dev ... Release 26 release26	2017-06-12 09:01:10 +01:00
deppbot	cf3772af43	Bundle Update on 2017-06-12	2017-06-12 14:34:40 +08:00
Cesy	2f30343303	Merge pull request #1341 from Br3nda/issue-1044-account-deletion ... Issue 1044 account deletion	2017-06-11 19:01:00 +01:00
Brenda Wallace	8de7e7a00b	remove pending admin deletion specs. covered by model spec	2017-06-09 23:35:04 +12:00
Brenda Wallace	46efcf3e61	Spec for Forum owners and Crop creators deleting their accounts	2017-06-09 23:25:40 +12:00
Brenda Wallace	7968f3e407	Marked some un-written specs as pending	2017-06-09 23:00:38 +12:00
Brenda Wallace	639232bc87	Removal from newsletter spec is in model spec	2017-06-09 22:55:11 +12:00
Brenda Wallace	e0bc1c936a	Spec for comments by deleted members	2017-06-09 22:54:36 +12:00
Brenda Wallace	910a9673dc	Unsubscribes newsletter before member destroying	2017-06-09 22:39:07 +12:00