consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,891 Commits 1 Branch 0 Tags
db7b2ef8afeb7e1dbba2f7929bee614794b00380
Commit Graph

1391 Commits

Author SHA1 Message Date
Juanjo Bazán
db7b2ef8af Merge branch 'master' into polling-views-plus 2016-10-19 13:50:08 +02:00
Juanjo Bazán
32abb1eadd removes booths link from admin menu 2016-10-19 13:44:05 +02:00
Juanjo Bazán
179cb3d611 Merge pull request #1247 from consul/direct-messages-format 
fixes text format on direct messages
 2016-10-19 11:26:30 +02:00
Alberto Garcia Cabeza
c835d9b1d1 improves styles for flash notices 2016-10-19 10:54:48 +02:00
Alberto Garcia Cabeza
e8312ff86a fixes text format on direct messages 2016-10-18 16:40:59 +02:00
Alberto Garcia Cabeza
5a78e51de2 adds styles to officing voters views 2016-10-17 16:42:50 +02:00
Alberto Garcia Cabeza
1c75dca13a adds styles for offering voters views 2016-10-14 19:00:58 +02:00
Marcia
1e87810593 improves expired password view 2016-09-29 14:34:37 +02:00
rgarcia
527b734e0e assigns officers to booths 2016-09-28 18:39:01 +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
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
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
Alberto Garcia Cabeza
7781edf879 Adds content to booths index and show views 2016-09-20 12:32:23 +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
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
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
Alberto Garcia Cabeza
6fac3c67ff Merge branch 'voting-proposals' of github.com:consul/consul into voting-proposals 2016-09-12 18:07:22 +02:00
Alberto Garcia Cabeza
77077b28b8 Removes question and supports on successfull proposals 2016-09-12 18:06:43 +02:00
Alberto Garcia Cabeza
d5af06da5d Adds proposal's total votes in index/show views 2016-09-12 17:56:15 +02:00
Alberto Garcia Cabeza
fa3b503c47 Adds specs 2016-09-09 17:32:21 +02:00
Alberto Garcia Cabeza
e8b70a48fa Adds tab in index & removes support button in index/show 2016-09-09 17:32:03 +02:00
Juanjo Bazán
974c4d6d70 adds specs for proposal ballots 2016-09-08 12:43:06 +02:00
Alberto Garcia Cabeza
cff1f43a90 Adds banner, styles, and updates icons font 2016-09-07 16:42:57 +02:00
Jaime Iniesta
9c48a46f0a adjusts style for badge in featured proposals 2016-09-07 13:22:52 +02:00
Jaime Iniesta
8af944ce56 Fixes failing spec for badges. 
spec/features/official_positions_spec.rb:56 was failing because the expected
badge was not being shown in featured proposals.
 2016-09-07 13:13:06 +02:00
Alberto Garcia Cabeza
b107790039 Adds links, texts and i18n 2016-09-07 12:46:29 +02:00
Alberto Garcia Cabeza
a527de4f92 Adds proposal ballots controller and views 2016-09-07 12:43:12 +02:00
Juanjo Bazán
fb810c1b90 Merge pull request #1188 from consul/custom-folders 
Custom folders
 2016-07-21 13:19:52 +02:00
rgarcia
a23666683f fixes conflicts with master 2016-07-19 15:50:22 +02:00
Alberto Garcia Cabeza
a30d9218d4 Deletes alt text for decorative images 2016-07-14 18:07:45 +02:00