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

767 Commits

Author SHA1 Message Date
Amaia Castro
2b6df62dd7 Refactor process phases pages 2017-01-04 14:02:25 +01:00
Amaia Castro
ee9fa3db15 Base Legislation Annotations 2017-01-04 12:56:58 +01:00
Amaia Castro
6d99a24740 Fix draft versions list 2017-01-04 10:13:55 +01:00
Amaia Castro
f040759693 Show only published draft versions to users (and also drafts to admins) 2017-01-03 22:08:54 +01:00
Amaia Castro
5627b18be2 Draft Version page 2017-01-02 18:05:15 +01:00
Amaia Castro
30ec5bdcb5 Build one option for the questions form when creating a new question 2016-12-30 11:22:39 +01:00
Amaia Castro
8c5b4d8c74 Merge pull request #37 from medialab-prado/sandbox-html 
Legislation Processes HTML [WIP]
 2016-12-30 10:52:29 +01:00
Amaia Castro
5b3dcd7886 Force processes order 2016-12-29 09:59:29 +01:00
Amaia Castro
5584835314 Merge branch 'legislation-module-stable' into sandbox-html 2016-12-29 09:27:07 +01:00
Amaia Castro
f505d6fec7 Check if debate phase is open to create answers 2016-12-28 22:02:08 +01:00
Amaia Castro
2693393eb0 Answer question through ajax 2016-12-28 16:21:58 +01:00
Amaia Castro
a6ceab6d73 Answer legislation questions 2016-12-27 19:49:03 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00
Amaia Castro
e03522e267 Merge branch 'legislation-module-stable' into sandbox-html 2016-12-27 12:36:10 +01:00
Amaia Castro
eed8f1dd83 Set admin layout for admin sandbox templates 2016-12-27 12:32:07 +01:00
Juanjo Bazán
d057c9457d Merge branch 'master' into signature-sheets 2016-12-23 20:23:56 +01:00
Fernando Blat
704dffe7c5 Merge pull request #39 from medialab-prado/28-question-page-comments 
Comments in legislation question page
 2016-12-23 18:20:27 +01:00
Amaia Castro
33266e41fe Merge branch 'master' into legislation-module-stable 2016-12-23 16:00:55 +01:00
Amaia Castro
55eb03531c Comments in legislation question page 2016-12-23 09:35:02 +01:00
Alberto Miedes Garcés
d83c370c6a Remove duplicated code in Admin::BannersController 2016-12-22 17:18:27 +01:00
Amaia Castro
36399277ec Legislation Process page 2016-12-22 11:23:49 +01:00
rgarcia
675081141c refactors signatures 2016-12-21 18:46:31 +01:00
Amaia Castro
fe92752069 Merge branch 'sandbox-html' into legislation-module-stable 2016-12-21 15:49:37 +01:00
Amaia Castro
d25d6c178c Legislation Questions model and basic admin 2016-12-20 18:52:43 +01:00
rgarcia
4eb700e3d4 refactors signature sheets 2016-12-20 16:46:08 +01:00
rgarcia
3c682b8a9b adds signature sheets 2016-12-20 12:21:05 +01:00
Amaia Castro
54f8549c43 Set up sandbox 2016-12-16 18:57:10 +01:00
Amaia Castro
a4055a1578 Legislation processes home page 2016-12-16 17:59:44 +01:00
Amaia Castro
766f509f8e Base legislation processes and draft versions page structure for public site 2016-12-15 11:32:20 +01:00
Amaia Castro
e4315f94c8 Merge branch 'master' into legislation-module-stable 2016-12-15 11:26:22 +01:00
Amaia Castro
400b510b71 Store the processed html from the markdown text body field 2016-12-14 11:32:28 +01:00
Alberto Miedes Garcés
c22a80b48f Move geozone 'safe to destroy' check from controller to model 2016-12-13 12:30:47 +01:00
Alberto Miedes Garcés
60da2a875b CRUD html_map_coordinates geozone attribute 2016-12-08 16:50:36 +01:00
Alberto Miedes Garcés
6b53020185 Show districts ordered by name 2016-12-08 13:47:23 +01:00
Alberto Miedes Garcés
93e79228a7 Ability to delete geozones from admin dashboard 2016-12-08 13:16:42 +01:00
Alberto Miedes Garcés
fea2009396 Ability to edit geozones from admin dashboard 2016-12-07 22:08:22 +01:00
Alberto Miedes Garcés
323c1b7593 Fixed layout for Admin::GeozonesController 2016-12-07 19:19:24 +01:00
Amaia Castro
a210914cb4 Avoid creating two instances of DraftVersion 2016-12-07 11:35:17 +01:00
Amaia Castro
e4fe499e66 DraftVersion base model and very basic admin pages 2016-12-06 12:10:20 +01:00
Amaia Castro
369804a2ba Base Legislation::Process model and admin page 2016-12-05 13:24:23 +01:00
Alberto Miedes Garcés
6175990533 Admin geozones: index, create 
Modified Geozone factory and seeds to be more complete
 2016-12-04 21:19:36 +01:00
Amaia Castro
9a9f1da5a0 Renames Legislation model to LegacyLegislation 
Renames the model and related stuff from Legislation 
to LegacyLegislation to avoid name clashes with 
the future Legislation module.
 2016-11-30 12:00:05 +01:00
kikito
f0b8cfd4a2 Time.now -> Time.current 2016-11-23 19:19:19 +01:00
rgarcia
bb3c4c6399 adds consistency to ruby code style 
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
 2016-11-15 11:18:43 +01:00
Alberto Garcia Cabeza
910b24936d Merge branch 'master' into voting-proposals 
Conflicts:
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/show.html.erb
	spec/support/common_actions.rb
 2016-09-15 13:58:53 +02:00
Alberto Garcia Cabeza
7abd31e4bf Renames variable, updates text 2016-09-15 13:47:53 +02:00
Alberto Garcia Cabeza
db6f82fa4c Moves banner to a partial and includes it on debates index 2016-09-14 11:09:36 +02:00
Juanjo Bazán
2142351743 archived proposals should not appear in 'featured' 2016-09-13 12:56:49 +02:00
Juanjo Bazán
11dbc05a80 removes archived proposals from index/search pages 2016-09-13 12:56:10 +02:00
Alberto Garcia Cabeza
41312ca2a5 Creates archived proposals method 2016-09-09 17:31:05 +02:00