Commit Graph

169 Commits

Author SHA1 Message Date
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