Commit Graph

1394 Commits

Author SHA1 Message Date
Juanjo Bazán
0dd122833a removes booths link from admin menu 2016-11-14 13:58:00 +01:00
Alberto Garcia Cabeza
1a56d5bbe6 adds styles to officing voters views 2016-11-14 13:58:00 +01:00
Alberto Garcia Cabeza
70752e217d adds styles for offering voters views 2016-11-14 13:58:00 +01:00
rgarcia
5ba72f0fe3 assigns officers to booths 2016-11-14 13:58:00 +01:00
rgarcia
de330b1c02 adds booth info to poll show 2016-11-14 13:57:16 +01:00
rgarcia
e810fe3e34 maintains poll date and status in index for demo 2016-11-14 13:57:16 +01:00
rgarcia
963bb4b602 removes unused attributes from poll show 2016-11-14 13:57:16 +01:00
rgarcia
63ccac963a adds booth backend for index, show, create and edit actions 2016-11-14 13:57:16 +01:00
rgarcia
6d7d6e67ea adds consistency to syntax 2016-11-14 13:56:49 +01:00
rgarcia
daac86a7a8 removes poll unused attributes 2016-11-14 13:56:49 +01:00
rgarcia
3251e4944e allow officers to be created without a poll 2016-11-14 13:56:49 +01:00
rgarcia
c1a9caeab0 adds poll CRU actions 2016-11-14 13:56:49 +01:00
rgarcia
304743f64e tmp commit poll index, show and new 2016-11-14 13:56:49 +01:00
Alberto Garcia Cabeza
5e3fff6825 Adds content to booths index and show views 2016-11-14 13:56:49 +01:00
Alberto Garcia Cabeza
7f0d233bce Add views for admin booths 2016-11-14 13:51:09 +01:00
Alberto Garcia Cabeza
faecb51054 Adds booths index content 2016-11-14 13:51:09 +01:00
rgarcia
5d2a9bead3 hot fix to load last poll on officer's index 2016-11-14 13:51:09 +01:00
Alberto Garcia Cabeza
7b24e73999 Adds content to edit and show views 2016-11-14 13:51:09 +01:00
Alberto Garcia Cabeza
2acd1a69cd Adds i18n and styles to admin polls index and new 2016-11-14 13:51:09 +01:00
rgarcia
503338e47b adds view placeholders for officing polls 2016-11-14 13:51:09 +01:00
rgarcia
08fbe745a8 fixes translation key 2016-11-14 13:51:09 +01:00
rgarcia
1ca821c520 creates polling officers from admin 2016-11-14 13:51:09 +01:00
Juanjo Bazán
87ec74b49f Merge pull request #1253 from consul/refactor-styles
Refactor styles
2016-10-31 17:27:52 +01:00
Alberto Garcia Cabeza
6fd5e6a67a unifies styles for participation not allowed 2016-10-31 16:50:13 +01:00
Alberto Garcia Cabeza
7d4f92f10a unifies styles of page forms 2016-10-31 13:11:23 +01:00
rgarcia
c0f400a4d9 Adds custom locale name for Português 2016-10-31 11:50:24 +01:00
Alberto Garcia Cabeza
5c1e1f96ea deletes unused wrap class 2016-10-25 16:23:45 +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
Marcia
1e87810593 improves expired password view 2016-09-29 14:34:37 +02:00
Marcia
4269f3810b Merge remote-tracking branch 'upstream/master' into admin_password_expired 2016-09-27 13:26:08 +02:00
rgarcia
72e173b8ea closes missing div 2016-09-16 20:25:12 +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
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