Commit Graph

363 Commits

Author SHA1 Message Date
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
Juanjo Bazán
83e58f0cc9 adds account section to management
for now it only has the option to delete account
2016-04-08 11:43:26 +02:00
Juanjo Bazán
ce477273da adds managers option to delete a level 2 account 2016-04-08 11:03:30 +02:00
Juanjo Bazán
58fb6e68ea cleans up routes: use blocks only when necessary 2016-04-06 19:25:27 +02:00
Juanjo Bazán
fc5f5eec8b changes default order in management sps to votes 2016-04-06 18:45:58 +02:00
Juanjo Bazán
cb05231794 adds index/show/voting to management for sps 2016-04-06 12:05:43 +02:00
Juanjo Bazán
3c37575f88 adds management spending proposals index to routes 2016-04-06 11:04:22 +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
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
c09e6f95d7 users can now delete their own spending proposals
via the 'my activity' page
2016-03-14 12:53:00 +01:00
rgarcia
e586a1df58 fixes conflicts with master 2016-03-08 14:31:18 +01:00
rgarcia
951505ce7d admins can tag spending proposals 2016-03-08 12:40:35 +01:00
Juanjo Bazán
fcd6d0ce8b adds dossier edition to valuators 2016-03-08 11:35:04 +01:00
Juanjo Bazán
0160ed816c adds valuation namespace 2016-03-04 20:19:42 +01:00
Juanjo Bazán
23c6a04179 removes highlights 2016-03-04 18:46:27 +01:00
rgarcia
b38558f2f3 adds index and create of valuators 2016-03-01 20:10:52 +01:00
Juanjo Bazán
2cddad22d6 redux admin for spending proposals
adds dossier info
adds assignments to admin and valuators
2016-02-24 19:39:02 +01:00
kikito
81b5ae7089 Implements /cuentasegura 2016-02-22 13:40:49 +01:00
rgarcia
b41729b129 uses investment_projects urls 2016-02-21 20:58:42 +01:00
rgarcia
a95fb75103 adds participatory_budget scope 2016-02-21 20:57:24 +01:00
rgarcia
f82a590e1e reverts debate links 2016-02-19 19:08:35 +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
Enrique García
be8f6da9ea Merge pull request #892 from consul/public-stats
Public stats
2016-02-15 13:34:00 +01:00
Juanjo Bazán
16db3f8537 adds minimal public stats 2016-02-08 14:12:37 +01:00
palomahnhp
2ee90ac76e share links to debate 2016-02-08 10:32:57 +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
dbc19090ed cleans up 2016-01-26 12:13:29 +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
rgarcia
82279b4f6b uses get instead of post to check username 2016-01-21 17:27:43 +01:00
rgarcia
cade157acd fixes conflicts with master 2016-01-21 17:27:02 +01:00
Juanjo Bazán
34456320e1 adds spending proposals to Management 2016-01-20 13:08:54 +01:00
Antonio Tapiador del Dujo
9610a6a933 Adds Tolk gem for i18n web interface
Closes #793
2016-01-14 14:57:06 +01:00
Juanjo Bazán
e5caf84c02 adds show view in admin for spending proposals 2016-01-11 14:25:33 +01:00
Juanjo Bazán
3f05864a16 adds spending proposals to admin 2016-01-11 13:45:10 +01:00
Juanjo Bazán
864ef6e73b adds basic spending proposals index 2016-01-11 12:16:31 +01:00
Julian Herrero
7bbfcd74e2 check if username is available in registration form 2016-01-10 19:17:20 +01:00
Juanjo Bazán
307b29736d Merge branch 'master' into notifications 2016-01-08 15:07:16 +01:00
rgarcia
816a95b7b7 adds comment show view 2016-01-07 15:18:28 +01:00
rgarcia
e2f419e625 destroy notifications when marked as read 2016-01-07 12:02:01 +01:00
Julian Herrero
d9ba3edc2a mostrar notificaciones a los usuarios cuando alguien comenta en su
debate o responde a su comentario
2016-01-05 17:43:44 +01:00
rgarcia
996e87cb13 adds legislations 2015-12-16 11:45:46 +01:00