Commit Graph

2545 Commits

Author SHA1 Message Date
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
rgarcia
20cb044015 adds search and filter for poll questions 2016-11-29 11:46:30 +01:00
kikito
2a2179d0f3 Merge branch 'master' into budget 2016-11-28 11:41:49 +01:00
kikito
f0b8cfd4a2 Time.now -> Time.current 2016-11-23 19:19:19 +01:00
rgarcia
e12f183775 fixes typo 2016-11-19 14:03:10 +01:00
rgarcia
724dac4df2 cherry picks creating poll question from successful proposals 2016-11-18 21:09:28 +01:00
rgarcia
004ed296bc fixes missing translations 2016-11-18 20:29:32 +01:00
Alberto Miedes Garcés
8b30aaa6d4 Merge branch 'master' into api-dev 2016-11-18 16:40:33 +01:00
rgarcia
4955daf886 adds poll and poll question's specs 2016-11-17 22:48:00 +01:00
Alberto Miedes Garcés
6fca1f02fe Added clarifying comments related to GraphQL return types 2016-11-17 17:23:57 +01:00
rgarcia
198b0018f7 adds admin poll question's show 2016-11-17 10:45:37 +01:00
rgarcia
d9ad658758 adds admin interface for poll questions 2016-11-17 09:30:42 +01:00
rgarcia
6fe965a9b8 adds question's show 2016-11-16 19:41:29 +01:00
rgarcia
ac58f30498 removes proposal ballots 2016-11-16 19:39:20 +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
kikito
1f9945d0aa Implements answering questions 2016-11-14 13:36:00 +01:00
Alberto Miedes Garcés
f6cd7a3456 Disable CSRF protection for GraphQL controller
Related documentation at:
http://api.rubyonrails.org/classes/ActionController/RequestForgeryProtec
tion/ClassMethods.html
2016-11-13 20:07:09 +01:00
kikito
219e139efb Adds poll_partial_result factory 2016-11-11 19:10:56 +01:00
kikito
0c9e6db04d Implements answers in a partial 2016-11-11 19:10:11 +01:00
kikito
506cf0dd70 Refactors polls_controller using answerable_by. Implements more specs 2016-11-07 17:43:53 +01:00
kikito
35a5136d9f Implements filtering in polls/index 2016-11-03 17:52:15 +01:00
kikito
575aa62960 Starts introducing valid answers to poll questions 2016-10-31 16:31:48 +01:00
kikito
3eca3faacd First version of Polls Controller 2016-10-31 14:13:56 +01:00
Juanjo Bazán
db7b2ef8af Merge branch 'master' into polling-views-plus 2016-10-19 13:50:08 +02:00
Alberto Miedes Garcés
dc62f6c914 Skip authorization check in GraphQL controller 2016-10-12 17:28:01 +02:00
Alberto Miedes Garcés
fe2546dbbb Added clarifying comments related to security 2016-10-01 08:50:16 +02:00
Alberto Miedes Garcés
eae18d9e37 Deleted useless debugging comment 2016-09-30 11:34:12 +02:00
rgarcia
527b734e0e assigns officers to booths 2016-09-28 18:39:01 +02:00
Alberto Miedes Garcés
530da6b893 Implemented simple test query to proposals 2016-09-28 12:51:05 +02:00
Alberto Miedes Garcés
ab333d6627 Created controller and route to answer GraphQL queries 2016-09-28 12:47:07 +02:00
rgarcia
2c3127b6bd adds booth backend for index, show, create and edit actions 2016-09-28 11:56:19 +02:00
rgarcia
e2a0b051e9 allow officers to be created without a poll 2016-09-25 10:21:58 +02:00
rgarcia
0795da02d8 adds poll CRU actions 2016-09-25 10:21:16 +02:00
rgarcia
c965e2dda1 tmp commit poll index, show and new 2016-09-23 09:13:02 +02:00
rgarcia
b5bebaa6c7 adds view placeholders for officing polls 2016-09-16 13:06:30 +02: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
rgarcia
c9b8a58e3f creates polling officers from admin 2016-09-14 13:53:35 +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
Raimond Garcia
9a2d45f25d Merge pull request #1219 from consul/budget-management
Budget management
2016-09-13 18:45:30 +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
kikito
13ffd73fee UNFINISHED budget management 2016-09-13 12:33:34 +02:00
kikito
2bc9e7be78 started working on budget manatement 2016-09-12 12:11:47 +02:00
rgarcia
22373c3ddd Review my votes page 2016-09-10 16:22:41 +02:00
rgarcia
9d4f2d1aff Displays budget groups 2016-09-10 16:22:41 +02:00
rgarcia
1c8f4d5ff0 can remove investment projects 2016-09-10 16:22:41 +02:00
rgarcia
9839d7afd0 can add investments to ballot 2016-09-10 16:22:40 +02:00
Alberto Garcia Cabeza
41312ca2a5 Creates archived proposals method 2016-09-09 17:31:05 +02:00
Juanjo Bazán
8aa62f8ce7 Merge branch 'budget' into admin-budgets 2016-09-09 15:13:05 +02:00