4886 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	79cf7b452c	removing some cms stuff	2018-01-04 14:31:24 +13:00
Brenda Wallace	9d2732fffa	removing comfortable mexican sofa for now	2018-01-04 14:29:09 +13:00
Brenda Wallace	e3a3c22e69	Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5	2018-01-04 14:05:41 +13:00
Shiny	ba2e4b5dce	Merge branch 'dev' into upgrade/rails-5	2018-01-04 14:03:19 +13:00
pozorvlak	196707e6e8	Merge pull request #1508 from Br3nda/fix/1502 ... Fix/1502 Missing ordering, crops form	2018-01-03 11:07:11 +00:00
Brenda Wallace	7bc91e415a	Re-instate active_median gem	2018-01-03 19:09:32 +13:00
Brenda Wallace	d456d045cd	Changed order of photo association relationship declarations	2018-01-03 17:24:51 +13:00
Brenda Wallace	4917ab9ae8	Fixed order->member relationship, after change to paranoia gem	2018-01-03 17:21:40 +13:00
Brenda Wallace	46d56fde31	Application job for Rails 5	2018-01-03 17:20:08 +13:00
Brenda Wallace	65d5b2d61a	Application mailer for rails 5	2018-01-03 17:18:41 +13:00
Brenda Wallace	b6c9b13d4d	Models inherit from application record	2018-01-03 17:16:14 +13:00
Brenda Wallace	f4af682d45	Updated code for Rail 5	2018-01-03 17:12:17 +13:00
Brenda Wallace	f1c8743623	Config for rails 5	2018-01-03 17:10:50 +13:00
Brenda Wallace	26f525e88a	Upgrade gems for rails 5 ... Note: Unlocks elastic search gem, and removes debuggers	2018-01-03 17:06:54 +13:00
Brenda Wallace	00130b3c0a	Merge remote-tracking branch 'origin/fix/1502' into fix/1502	2018-01-03 15:12:31 +13:00
Brenda Wallace	d86de897c7	Wrap long line	2018-01-03 15:12:09 +13:00
Brenda Wallace	466a9d6d8a	Merge remote-tracking branch 'upstream/dev' into dev	2018-01-03 15:10:08 +13:00
Shiny	0db3b3d532	Merge branch 'dev' into fix/1502	2018-01-03 15:10:00 +13:00
Brenda Wallace	a39c304fac	Fix ordering of crops' parent on form	2018-01-03 15:06:55 +13:00
Shiny	7d51ba98ec	Merge pull request #1500 from Growstuff/bundle-update-2017-12-24-080947 ... Bundle Update on 2017-12-24	2017-12-24 16:43:34 +13:00
deppbot	4ba210cf81	Bundle Update on 2017-12-24	2017-12-24 08:09:48 +08:00
Cesy	c08beb5291	Merge pull request #1495 from Growstuff/dev ... Release 37 release37	2017-12-22 09:54:32 +00:00
pozorvlak	269f3164b7	Merge pull request #1497 from Br3nda/feature/admin-nicer ... Nicer admin interface	2017-12-18 11:33:02 +00:00
Shiny	9d47b2b029	Merge branch 'dev' into feature/admin-nicer	2017-12-18 15:10:36 +13:00
Daniel O'Connor	81e26aaf02	Merge pull request #1496 from Br3nda/feature/ordering ... Feature/ordering	2017-12-18 09:30:51 +10:30
Shiny	d62322b498	Merge branch 'dev' into feature/admin-nicer	2017-12-18 06:59:33 +13:00
Shiny	ebb2f90294	Merge branch 'dev' into feature/ordering	2017-12-18 06:59:17 +13:00
Shiny	72922a160d	Merge pull request #1498 from Growstuff/bundle-update-2017-12-18-000857 ... Bundle Update on 2017-12-18	2017-12-18 06:58:50 +13:00
deppbot	0699716c19	Bundle Update on 2017-12-18	2017-12-18 00:08:58 +08:00
Brenda Wallace	4c35987cb7	Ignore long method in ability.rb	2017-12-17 17:57:19 +13:00
Brenda Wallace	54e0806f38	don't check role is there's no member	2017-12-17 17:55:14 +13:00
Brenda Wallace	99828c7c01	Updated spec for new admin#index	2017-12-17 17:54:13 +13:00
Brenda Wallace	25d2773464	Use nested module/class definitions instead of compact style.	2017-12-17 17:50:30 +13:00
Brenda Wallace	233a30a045	Haml code style fix up	2017-12-17 17:49:05 +13:00
Brenda Wallace	01a7463ae8	Split up ability.rb into methods	2017-12-17 12:47:41 +13:00
Brenda Wallace	8a446ecbfc	Member admin	2017-12-17 12:45:19 +13:00
Brenda Wallace	efc60e6313	Nicer layout on editing roles	2017-12-17 12:11:55 +13:00
Brenda Wallace	406b2dbf04	Make admin index a bit nicer	2017-12-17 12:06:03 +13:00
Brenda Wallace	ac056b4eb5	Merge remote-tracking branch 'upstream/dev' into dev	2017-12-17 12:05:42 +13:00
Brenda Wallace	2394f4d237	One view for showing photos on an item	2017-12-17 11:40:55 +13:00
Brenda Wallace	2a4fd57050	Merge remote-tracking branch 'upstream/dev' into feature/ordering	2017-12-17 10:18:25 +13:00
Shiny	5c885d675e	Merge branch 'master' into dev	2017-12-17 10:05:25 +13:00
Shiny	0b08691160	Merge pull request #1474 from Br3nda/feature/photos-1457 ... Polymorphic relationship to photos	2017-12-17 10:04:30 +13:00
Brenda Wallace	b1052a2dbf	Order posts by most recent	2017-12-17 10:01:51 +13:00
Brenda Wallace	95a923ff5f	Order the plantings on the front page	2017-12-17 10:01:51 +13:00
deppbot	c8e34b640e	Bundle Update on 2017-12-14	2017-12-17 10:01:51 +13:00
Brenda Wallace	6f2b4b13cd	Only show photo pagination if there are photos	2017-12-17 09:55:52 +13:00
Brenda Wallace	970da53873	Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457	2017-12-17 09:15:24 +13:00
Brenda Wallace	3aa2f0bd3b	Paginate photos on seeds#show (inc feature specs)	2017-12-17 08:55:08 +13:00
Shiny	8c1514bc04	Merge branch 'dev' into feature/photos-1457	2017-12-15 17:13:12 +13:00