Commit Graph

298 Commits

Author SHA1 Message Date
rgarcia
00fc5b77e5 adds permissions in view for direct messages 2016-06-09 17:42:13 +02:00
rgarcia
fea3aef5bb updates permissions for direct messages 2016-06-09 17:35:19 +02:00
rgarcia
0e86cd89d6 adds permissions with cancan for new, create and show 2016-06-08 13:46:17 +02:00
Juanjo Bazán
e4a7989b15 Merge branch 'master' into budget 2016-06-02 12:35:44 +02:00
kikito
fa6f34bf5c Adds basic Budget controller / views 2016-05-31 19:26:56 +02:00
kikito
7005faabe6 adds admin permissions for investments 2016-05-30 14:13:36 +02:00
kikito
2a82e9e33a Redoes the common balloting permissions 2016-05-30 14:01:47 +02:00
kikito
13f43d8b67 Adds valuator investment abilities 2016-05-30 13:55:12 +02:00
kikito
daa8783b02 Adds common Investment abilities 2016-05-30 13:53:30 +02:00
Alberto Garcia Cabeza
7d1bf7344a Removes unused file and style 2016-05-23 19:05:16 +02:00
MaiteHdezRivas
3b2bfc46cf Admin option to add banners and show banners 2016-05-19 13:18:30 +02:00
Juanjo Bazán
c4bf90f576 adds managers section to admin 2016-05-11 11:24:38 +02:00
rgarcia
4bbd3d7233 adds summary of spending proposals by valuator 2016-04-26 22:06:02 +02:00
Juanjo Bazán
66dd511979 Merge pull request #1041 from consul/select-featured-debates
Select featured debates
2016-04-25 18:19:40 +02:00
Juanjo Bazán
479b48796f Merge pull request #1085 from consul/retire-proposals
Retire proposals
2016-04-25 18:00:34 +02:00
Juanjo Bazán
58a5e2a283 authors can retire proposals now 2016-04-23 13:24:15 +02:00
rgarcia
de84480788 adds admin summary page for spending proposals 2016-04-22 15:03:46 +02:00
MaiteHdezRivas
3e7db9d1b5 Best practices code changes 2016-04-20 16:40:58 +02:00
Alberto Garcia Cabeza
3fd8e76a79 Merge branch 'select_debates_which_display_as_featured' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-select_debates_which_display_as_featured
Conflicts:
	db/schema.rb
2016-04-05 14:05:27 +02:00
Raimond Garcia
c581aad9bf Merge pull request #1018 from consul/investment-project-vote
Investment project vote
2016-03-29 18:57:05 +02:00
rgarcia
6f723a871f allows only admins to delete spending proposals 2016-03-29 17:08:31 +02:00
rgarcia
ed1ec1c553 adds votes to spending proposals 2016-03-29 14:53:46 +02:00
MaiteHdezRivas
68f9a76cea Mark debates as featured 2016-03-20 13:56:05 +01:00
Juanjo Bazán
decf0f2683 changes admin/valuator permissions
not allowed to create/destroy spending proposals anymore
2016-03-14 14:35:57 +01:00
Juanjo Bazán
142c981cdf adds ability to level 2 users to delete owned sps 2016-03-14 12:51:58 +01:00
Juanjo Bazán
8fc302cb46 valuators can manage spending proposals 2016-03-04 20:19:42 +01:00
rgarcia
b38558f2f3 adds index and create of valuators 2016-03-01 20:10:52 +01:00
Juanjo Bazán
11d6d0b6d6 adds spending proposal show for valuator and admin 2016-02-18 19:00:24 +01:00
rgarcia
6540092bcd displays the top 3 proposals for every category 2016-02-16 12:17:37 +01:00
MaiteHdezRivas
5dd4633d6a Merge branch 'suggest_before_creating'
Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb
2016-01-27 13:11:23 +01:00
MaiteHdezRivas
7406904c51 adding suggest with coffescript 2016-01-27 12:32:44 +01:00
rgarcia
21b9e31f11 uses geozones instead of district tags 2016-01-25 22:28:46 +01:00
Perisso
7d1d4cea4a filter by districts and categories 2016-01-25 22:28:17 +01:00
Juanjo Bazán
1ab0b31d4b only level 2 users can create spending proposals 2016-01-13 13:35:21 +01:00
Juanjo Bazán
eb4c352f7d removes before_action in favor of cancancan 2016-01-13 12:56:27 +01:00
Juanjo Bazán
2c36ceb10c adds abilities for SpendingProposals 2016-01-11 12:15:42 +01:00
rgarcia
816a95b7b7 adds comment show view 2016-01-07 15:18:28 +01:00
kikito
60e78e58fa Rename ability 2015-12-16 18:44:27 +01:00
kikito
cf04b48d4e Allow anyone to search and read annotations 2015-12-16 18:10:17 +01:00
kikito
fc8a1fc84b allows not-logged-in users to read existing annotations 2015-12-16 16:26:59 +01:00
rgarcia
9c3fda076d adds legislation permissions 2015-12-16 11:45:47 +01:00
Abigail Sosa
189a6426b1 Se agregan anotaciones a propuestas existentes 2015-12-16 11:45:46 +01:00
Juanjo Bazán
7f1fe034a3 adds user's public show page 2015-11-03 19:29:35 +01:00
Juanjo Bazán
c896fc3eef adds ability for featured_votes of proposals 2015-10-22 11:53:32 +02:00
kikito
e76d2b9ad6 fixes travis 2015-09-28 17:19:53 +02:00
kikito
636e6bd479 second attempt at fixing travis 2015-09-28 15:49:28 +02:00
kikito
65ec39ebb3 attempts to fix failing travis 2015-09-28 15:22:15 +02:00
kikito
82af488ce3 Splits ability.rb and specs into several smaller files
I'm doing this in preparation for the "Manager" ability, which will
require even more refactors of the abilities (for example,
manager can not modify their own account)
2015-09-28 13:51:42 +02:00