consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,771 Commits 1 Branch 0 Tags
cb15a2e25b3db45815f23589797812884785b35c
Commit Graph

8771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rgarcia
a6384af527 updates query to be more efficient 2016-09-20 11:48:35 +02:00
rgarcia
e0951a2f2d adds spacing to factories 2016-09-20 11:48:28 +02:00
rgarcia
55f4a6bbae removes officer factory 2016-09-20 11:48:21 +02:00
rgarcia
4c08058f80 updates db schema 2016-09-20 11:48:12 +02:00
Juanjo Bazán
38da12b7da Merge pull request #1222 from consul/polling-create-officers 
creates polling officers from admin
 2016-09-20 11:03:18 +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
gentooza
ae22d94255 added linux config instructions 2016-09-18 20:08:57 +02:00
Juanjo Bazán
7c08948574 Merge pull request #1228 from consul/archived-proposals-polish 
Archived proposals polish
 2016-09-16 20:45:47 +02:00
rgarcia
72e173b8ea closes missing div 2016-09-16 20:25:12 +02:00
rgarcia
0c873649c5 updates dev seed with archived proposals 2016-09-16 20:24:25 +02:00
Raimond Garcia
782aa2e4d8 Merge pull request #1227 from consul/archived-proposals-order 
sorts archived proposals by votes
 2016-09-16 20:08:41 +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
4ebb4a1104 updates dev_seeds with polls 2016-09-16 13:06:39 +02:00
rgarcia
b5bebaa6c7 adds view placeholders for officing polls 2016-09-16 13:06:30 +02:00
Juanjo Bazán
a5f85a414c Merge pull request #1226 from consul/polish-banner 
Polish voting proposals banner
 2016-09-16 12:10:40 +02:00
Alberto Garcia Cabeza
a39506f54b Polish voting proposals banner 2016-09-16 12:08:38 +02:00
Juanjo Bazán
902bdb8bd3 Merge pull request #1223 from consul/binstubs 
updates binstubs for rails 4
 2016-09-15 14:29:50 +02:00
rgarcia
a1c893ce28 updates binstubs for rails 4 2016-09-15 14:16:45 +02:00
Raimond Garcia
86ab58e7f7 Merge pull request #1206 from consul/voting-proposals 
Proposal ballots
 2016-09-15 14:10:08 +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
Juanjo Bazán
dd8352a0c4 Merge pull request #1220 from consul/binstubs 
updates binstubs
 2016-09-15 13:21:49 +02:00
Marcia
fa833f5a4a modificado otro mensaje en los test 2016-09-15 13:06:03 +02:00
Marcia
4832558948 modificado mensaje en el test 2016-09-15 12:21:25 +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
89340d4647 Deletes author_id on specs 2016-09-14 12:20:22 +02:00
rgarcia
67096725ed updates binstubs 2016-09-14 11:50:11 +02:00
Alberto Garcia Cabeza
30c11c9e22 Fixes specs 2016-09-14 11:41:29 +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
Raimond Garcia
c41699fdf0 Merge pull request #1207 from consul/spending_proposals_import 
Spending proposals import
 2016-09-13 18:35:50 +02:00
Raimond Garcia
76cd435808 Merge pull request #1217 from albertomg994/iss-1209 
Development environment setup documentation
 2016-09-13 18:18:19 +02:00
Alberto Miedes Garcés
2c54e19df4 Dev environment setup docs for Mac OS X (spanish) 2016-09-13 14:12:09 +02:00
Alberto Miedes Garcés
955d531683 Dev environment setup docs for Mac OS X (english) 2016-09-13 14:11:57 +02:00
Raimond Garcia
9fb387def1 Merge pull request #1215 from consul/budget-styles 
Budget styles
 2016-09-13 13:02:46 +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