consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,173 Commits 1 Branch 0 Tags
2b6df62dd74906b51a06d971841db5af5d256aae
Commit Graph

189 Commits

Author SHA1 Message Date
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
Abigail Sosa
e2f6950dc4 Carga anotaciones de la propuesta 2015-12-16 11:45:46 +01:00
Abigail Sosa
189a6426b1 Se agregan anotaciones a propuestas existentes 2015-12-16 11:45:46 +01:00
Josep Jaume Rey Peroy
80104d100f Normalize page paths 
Normalize page paths so they can be accessed by `page_path(:id)`.

The benefit of this is that we can add any arbitrary amount of pages
without affecting the routing layer.
 2015-12-12 10:22:27 +01:00
Juanjo Bazán
349288b992 removes provisional transparency page 2015-12-03 12:51:51 +01:00
Juanjo Bazán
7f1fe034a3 adds user's public show page 2015-11-03 19:29:35 +01:00
Raimond Garcia
5582e1016d Merge pull request #632 from AyuntamientoMadrid/faq_page 
Adds faq page
 2015-10-22 12:24:40 +02:00
Juanjo Bazán
1136c5546a adds featured proposals 
via new action featured_vote
Featured proposals are never duplicated in the filtered lists
Featured are not calculated/shown in searches.
 2015-10-22 11:54:17 +02:00
Alberto Garcia Cabeza
05be2f55e8 Adds faq page 2015-10-22 02:14:52 +02:00
kikito
3ab579999e merges with master and fixes conflicts 2015-10-20 16:28:22 +02:00
rgarcia
a6fd1fb489 moves letter verification to letter controller 2015-10-19 19:38:22 +02:00
rgarcia
fd8684e713 redirects to show after asking for letter 2015-10-19 19:32:53 +02:00
rgarcia
ce13486272 uses english for method and filenames 2015-10-19 19:27:03 +02:00
Alberto Garcia Cabeza
65e0becafc adds verify account page for letter code 2015-10-19 19:24:23 +02:00
kikito
9cc158540e implements a first version of the forms. Missing: a) tests and b) check db constraints (duplicate email "", etc) 2015-10-16 20:04:16 +02:00
rgarcia
dc93ea6dba displays proposal created within management layout 2015-10-13 15:00:23 +02:00
rgarcia
b2bd3d455b differentiates between manager session and managed user session 2015-10-12 14:05:51 +02:00
rgarcia
54a7597168 destroys manager and managed_user session 2015-10-11 16:57:09 +02:00
rgarcia
22c6b7fad0 fixes conflicts 2015-10-09 17:37:45 +02:00
kikito
f7ac7a526d merge with master 2015-10-08 15:26:33 +02:00
rgarcia
015e57ddad adds print of new proposals 2015-10-08 12:43:33 +02:00
rgarcia
0acdf5722b adds creation of proposals by managers 2015-10-08 12:43:33 +02:00
rgarcia
4881f5bd1e basic proposal voting my managers 2015-10-08 12:43:32 +02:00
rgarcia
74b92ca317 tmp commit manager vote 2015-10-08 12:43:32 +02:00
kikito
5f74528f12 Modifies devise so that unconfirmed users w/o password can set it when confirming their account 2015-10-07 20:18:54 +02:00