2550 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Marshall	fcfda13a73	Patching a couple of minor regressions	2014-05-28 16:10:28 +10:00
Will Marshall	5eb54d1ac3	Merge branch 'groups_page' into fixing_modals	2014-05-28 16:04:55 +10:00
Will Marshall	33829d9044	Only rendering images if they exist	2014-05-28 16:03:42 +10:00
Will Marshall	9bb059493e	Fixing the image render	2014-05-28 16:03:42 +10:00
Will Marshall	b8cc9d3343	Modding image sizing on groups	2014-05-28 16:03:42 +10:00
Will Marshall	f65ff5af18	Automatically sorting out image rotation	2014-05-28 16:03:42 +10:00
Will Marshall	a7105fc3a8	Tweaking image sizing on enterprise	2014-05-28 16:03:42 +10:00
Will Marshall	50c7bd55be	Adding url strip and re-construction of http	2014-05-28 15:06:01 +10:00
Will Marshall	0c8ee2488b	Moving back to ng-bind-html	2014-05-28 14:58:53 +10:00
Will Marshall	c26462db57	Addin some URL stripping	2014-05-28 14:45:26 +10:00
Will Marshall	576f10dbc3	Adding ng-if checks ... Conflicts: app/views/modals/_producer.html.haml	2014-05-28 14:44:17 +10:00
Will Marshall	1af82bd4fb	Forcing scope to parent scope so we don't child our child ... Conflicts: app/assets/javascripts/darkswarm/directives/modal.js.coffee	2014-05-28 14:43:16 +10:00
summerscope	1a79b966e9	Adding in links to homepage buttons for Groups & Producers	2014-05-28 12:21:25 +10:00
summerscope	3c3409bc1f	Tweaks to styling on groups page	2014-05-27 18:03:12 +10:00
summerscope	9fe4bef7df	Adding groups icon into background for visual consistency	2014-05-27 17:55:51 +10:00
summerscope	2130470eaf	Styling for groups page	2014-05-27 17:11:42 +10:00
Will Marshall	aa23b03f98	Always showing social media	2014-05-23 17:29:18 +10:00
Will Marshall	fb7b9a051a	Hack patching the modals	2014-05-23 17:22:27 +10:00
Will Marshall	40f116783c	Merge branch 'new_shop' ... Conflicts: app/assets/stylesheets/darkswarm/images.css.sass app/views/modals/_producer.html.haml	2014-05-23 16:02:20 +10:00
Will Marshall	58112fb105	Adding primary taxon	2014-05-23 16:01:24 +10:00
Will Marshall	110a6f2d14	Adding primary taxon to admin forms	2014-05-23 15:59:06 +10:00
Will Marshall	fd1e7ebaa3	Adding primary taxon field to product	2014-05-23 15:59:06 +10:00
Will Marshall	6d24a6555e	Adding fields to product supplier	2014-05-23 15:59:06 +10:00
summerscope	84b6f99321	Styling for shop page product modal	2014-05-23 15:59:06 +10:00
Rohan Mitchell	9e46108e9a	Enterprise user can only add order cycle exchanges where it manages the participant enterprise	2014-05-23 12:18:22 +10:00
Rohan Mitchell	14dee8d7fe	OrderCycleFormApplicator requires permitted_enterprises to be set explicitly	2014-05-23 12:09:38 +10:00
Rohan Mitchell	095b9bf67a	Enterprise user can only update order cycle exchanges where it manages the participant enterprise	2014-05-23 12:05:46 +10:00
Rohan Mitchell	9b15c213d1	When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges	2014-05-23 11:28:00 +10:00
summerscope	4657285769	Producers modal styling and markup	2014-05-22 16:35:48 +10:00
Will Marshall	1a7c6f87ed	Adding fields to product supplier	2014-05-22 14:47:27 +10:00
summerscope	d7bc1a9b95	Styling for shop page product modal	2014-05-22 14:40:35 +10:00
Will Marshall	015403c282	Merge branch 'new_shop'	2014-05-22 12:40:48 +10:00
Will Marshall	d1b27edefe	Reworking the JS specs	2014-05-22 12:40:46 +10:00
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +10:00
Will Marshall	0140472fbc	Adding working modals	2014-05-22 12:40:46 +10:00
Will Marshall	d6512a78d4	Removing position fixed	2014-05-22 12:39:52 +10:00
Will Marshall	c69a4a5f1a	Adding social media links	2014-05-22 12:12:10 +10:00
Will Marshall	70f549e92a	Patching our modified admin login	2014-05-22 11:46:06 +10:00
Will Marshall	34c31afabe	Adding large image	2014-05-22 11:34:46 +10:00
Rohan Mitchell	a16f726377	Extract have_relationship test	2014-05-22 11:32:37 +10:00
Rohan Mitchell	c2f762d570	Enterprise user can only see relationships involving their enterprises	2014-05-22 11:27:19 +10:00
Rohan Mitchell	d7b4318aff	Find enterprise relationships involving any of a number of enterprises	2014-05-22 11:25:37 +10:00
Rohan Mitchell	06955a024f	Enterprise user can only create relationships with their own enterprises as parent	2014-05-22 11:02:03 +10:00
Rohan Mitchell	fb05ad57e1	Tidy up spec helper, clean database before suite run	2014-05-22 11:00:29 +10:00
Rohan Mitchell	66cd5c937f	Add a helper to make capybara specs fail fast	2014-05-22 10:59:41 +10:00
Rohan Mitchell	f6bc1a82be	Enterprise user can manage enterprise relationships	2014-05-22 10:54:51 +10:00
Will Marshall	12dfcd0de9	Fixing auth workflowsg	2014-05-22 10:43:26 +10:00
Will Marshall	250b76ec79	Merge branch 'master' into new_shop	2014-05-22 10:43:02 +10:00
Will Marshall	f997026796	Reworking the JS specs	2014-05-22 10:42:44 +10:00
Will Marshall	67e72f4504	Setting up after_login redirects	2014-05-22 10:42:44 +10:00