consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

9884 Commits

Author SHA1 Message Date
Alberto Miedes Garcés
96d688e286 Created graphql comment_type 2016-09-29 11:31:08 +02:00
Alberto Miedes Garcés
5c7f03bdf1 Added more fields to graphql proposal_type 2016-09-29 11:22:18 +02:00
Alberto Miedes Garcés
b90a6664b0 Deleted useless file 2016-09-29 11:21:25 +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
022340b1cf Created GraphQL Schema and query root 2016-09-28 12:48:24 +02:00
Alberto Miedes Garcés
ab333d6627 Created controller and route to answer GraphQL queries 2016-09-28 12:47:07 +02:00
rgarcia
6387d28157 adds booth info to poll show 2016-09-28 12:34:24 +02:00
rgarcia
e97e7e20dc maintains poll date and status in index for demo 2016-09-28 12:01:58 +02:00
rgarcia
a8ea86fae1 removes unused attributes from poll show 2016-09-28 12:00:26 +02:00
rgarcia
2c3127b6bd adds booth backend for index, show, create and edit actions 2016-09-28 11:56:19 +02:00
rgarcia
7db3683c27 adds consistency to syntax 2016-09-28 11:55:11 +02:00
Marcia
4269f3810b Merge remote-tracking branch 'upstream/master' into admin_password_expired 2016-09-27 13:26:08 +02:00
Marcia
78c6a30424 optimize code 2016-09-27 13:07:06 +02:00
rgarcia
a7279d2d67 removes poll unused attributes 2016-09-25 10:26:32 +02:00
rgarcia
e2a0b051e9 allow officers to be created without a poll 2016-09-25 10:21:58 +02:00
rgarcia
04c58135ee adds admin submit button helper 2016-09-25 10:21:34 +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
ac2d218707 Merge branch 'polling' into polling-views 2016-09-23 08:45:38 +02:00
Alberto Garcia Cabeza
7781edf879 Adds content to booths index and show views 2016-09-20 12:32:23 +02:00
rgarcia
5bcd8f1e9d fixes conflicts with poll branch 2016-09-20 11:53:40 +02:00
rgarcia
a6384af527 updates query to be more efficient 2016-09-20 11:48:35 +02:00
rgarcia
88e7af70d0 displays voter name if already voted 2016-09-19 18:48:19 +02:00
rgarcia
48d2aaa845 validates user has not already voted 2016-09-19 18:48:18 +02:00
rgarcia
0ec3a8e8bf validates voter in census 2016-09-19 18:47:17 +02:00
Alberto Garcia Cabeza
5ce886bc6a Add views for admin booths 2016-09-19 18:32:21 +02:00
Alberto Garcia Cabeza
e2c6470df3 Merge branch 'polling-views' of github.com:consul/consul into polling-views 2016-09-19 17:26:59 +02:00
Alberto Garcia Cabeza
fcf7920a40 Adds booths index content 2016-09-19 17:26:48 +02:00
rgarcia
118d163979 hot fix to load last poll on officer's index 2016-09-19 17:25:51 +02:00
Alberto Garcia Cabeza
4872c7a4e8 Adds content to edit and show views 2016-09-19 13:36:42 +02:00
rgarcia
72e173b8ea closes missing div 2016-09-16 20:25:12 +02:00
rgarcia
7d4d9b0ead sorts archived proposals by votes 2016-09-16 19:42:18 +02:00
Alberto Garcia Cabeza
5ff3e2c599 Adds i18n and styles to admin polls index and new 2016-09-16 19:07:12 +02:00
rgarcia
b5bebaa6c7 adds view placeholders for officing polls 2016-09-16 13:06:30 +02:00
Alberto Garcia Cabeza
a39506f54b Polish voting proposals banner 2016-09-16 12:08:38 +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
Juanjo Bazán
e0c3f7c029 Merge pull request #1213 from consul/archived-proposals 
Archived proposals
 2016-09-15 13:22:05 +02:00
Marcia
8d883b1e17 mejoras de codigo 2016-09-15 11:45:03 +02:00
rgarcia
cd5266046b fixes translation key 2016-09-14 14:25:38 +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
Alberto Garcia Cabeza
076e237320 Improves proposal ballot banner, deletes unused partial 2016-09-14 10:40:16 +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
Juanjo Bazán
8d48eccfed adds not_archived scope to proposal 2016-09-13 12:10:31 +02:00
Juanjo Bazán
da03311f99 archived proposals can not accept votes 2016-09-12 18:47:56 +02:00