4119 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rafael Schouten	08cd273be3	Merge branch 'migrate_ent_types' into bugfix ... Conflicts: app/models/spree/ability_decorator.rb	2014-10-18 07:37:41 +11:00
Rafael Schouten	2a7dd8b8f1	update ability specs for reports	2014-10-18 06:53:38 +11:00
Rafael Schouten	b71a40ae6d	show all permitted enterprises in order cycle summery	2014-10-18 03:26:57 +11:00
Rafael Schouten	87cc1d6217	create db/backup folder if it dosnt exist	2014-10-18 01:43:19 +11:00
Rafael Schouten	577cb06371	make navCallback actually versatile	2014-10-18 01:42:29 +11:00
Rob Harrington	6a6f603754	Correct syntax for update column	2014-10-17 10:03:34 +11:00
Rafael Schouten	2e3cb171a3	don't remove indexes after you remove one of their columns!	2014-10-17 08:22:52 +11:00
Rafael Schouten	b853f908d3	bugfix email dummy	2014-10-17 08:08:10 +11:00
Rafael Schouten	1a40c83a48	update chema with indexes	2014-10-17 07:59:51 +11:00
Rafael Schouten	9536b3e764	add navigation directive default	2014-10-17 07:58:08 +11:00
Rafael Schouten	f1280a31a6	Merge branch 'reports' into bugfix	2014-10-17 07:41:30 +11:00
Rafael Schouten	245c1eb305	use a directive for navigation check to attach it to the page instead of the controller	2014-10-17 07:40:08 +11:00
Rafael Schouten	bda1eafcec	add migrating for dummy emails	2014-10-17 06:37:22 +11:00
Rafael Schouten	dd3101f27a	remove some bangs	2014-10-17 06:14:39 +11:00
Rafael Schouten	45b0581b7b	Merge branch 'master' into bugfix	2014-10-17 05:35:10 +11:00
Rafael Schouten	3234bc328f	Merge branch 'master' into reports	2014-10-17 04:02:29 +11:00
Rafael Schouten	4defb38cf4	update karma config	2014-10-17 04:01:36 +11:00
Rafael Schouten	1150e69500	fix visible bug	2014-10-17 03:59:48 +11:00
Rafael Schouten	6fd9741daf	use build instead of create, and reorganise code	2014-10-16 16:51:09 +11:00
Rafael Schouten	a1d74649f3	rename spec and clear todo	2014-10-16 16:50:19 +11:00
Rafael Schouten	f145db46f1	use self.x	2014-10-16 16:49:49 +11:00
Rafael Schouten	1b0000a1de	use bangs	2014-10-16 16:48:01 +11:00
Rafael Schouten	425105174e	return space remover	2014-10-16 16:26:50 +11:00
Rafael Schouten	c5afd8cebf	move visible filter to pages, and use category	2014-10-16 16:26:50 +11:00
Rafael Schouten	027189ac3c	rename check methods	2014-10-16 16:26:49 +11:00
Rafael Schouten	f0a3296e52	change enterprise category name ans use symbols instead of strings	2014-10-16 16:26:49 +11:00
Rafael Schouten	2e8417d9e8	bugfix migration and add indexes	2014-10-16 16:05:07 +11:00
Rafael Schouten	fd7191f476	add missing orders_and_distributors perm	2014-10-16 05:26:38 +11:00
Rafael Schouten	9343c3608b	allow supplier enterprise manager to see bulk coop reports	2014-10-16 04:29:33 +11:00
Rafael Schouten	1577c01a77	add reports abilities specs	2014-10-16 04:29:33 +11:00
Rafael Schouten	46df14c0d9	refator reports controller a little	2014-10-16 04:29:33 +11:00
Rafael Schouten	e44fed2ff0	add authorization to reports listings on index page	2014-10-16 04:29:33 +11:00
Rafael Schouten	0d715ce615	split report permissions	2014-10-16 04:29:16 +11:00
Rafael Schouten	5e41865871	add utils angular module and navigation check factory	2014-10-14 00:26:04 +11:00
Rafael Schouten	5dd9879b96	validate description max lenth	2014-10-12 21:57:01 +11:00
Rafael Schouten	01c179856a	set maxlength for short description field	2014-10-12 21:19:59 +11:00
Rafael Schouten	9a6958573a	Merge branch 'master' into bugfix ... Conflicts: app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee	2014-10-12 21:19:02 +11:00
Rafael Schouten	e7b847542f	bugfix tab selection	2014-10-08 01:59:56 +11:00
Rafael Schouten	20a94b4365	Merge branch 'master' into migrate_ent_types ... Conflicts: app/serializers/api/admin/enterprise_serializer.rb	2014-10-07 10:52:26 +11:00
Rafael Schouten	9b6db2bff4	simplify tab selection	2014-10-07 10:49:57 +11:00
Rafael Schouten	6fc36a3e6c	swap redundant producer modal for general enterprise modal	2014-10-07 10:48:04 +11:00
Rafael Schouten	e476324c60	fix for_order_cycle test	2014-10-07 00:22:45 +11:00
Rafael Schouten	ec6805f573	use shared partial for no results	2014-10-06 23:51:19 +11:00
Rafael Schouten	7805d46743	more angular documentation	2014-10-06 23:20:43 +11:00
Rafael Schouten	881e82e825	add some angular documentation	2014-10-06 22:59:06 +11:00
Rafael Schouten	2ae325455a	fix producer taxon filtering bug	2014-10-06 22:58:48 +11:00
Rafael Schouten	922e335e83	add is_hub to model	2014-10-06 15:42:23 +11:00
Rafael Schouten	cc6af82823	move reports abilitiy to can manage products block, producers need to use this too	2014-10-06 15:40:41 +11:00
Rafael Schouten	76e170eb3a	move icons into cached, for now	2014-10-06 10:44:49 +11:00
Rafael Schouten	c495e967cb	bugfix and extend angular enterprise spec	2014-10-06 01:36:18 +11:00