Alberto Garcia Cabeza
|
1c75dca13a
|
adds styles for offering voters views
|
2016-10-14 19:00:58 +02:00 |
|
Juanjo Bazán
|
fb8669292e
|
adds missing i18n keys to settings
|
2016-10-13 11:25:29 +02:00 |
|
Raimond Garcia
|
593e77147c
|
Merge pull request #1232 from usabi/custom_locales_load_fix
Fixes custom locales inclusion.
|
2016-10-06 16:47:31 +02:00 |
|
Raimond Garcia
|
c43ba27b1b
|
Merge pull request #1203 from jaimeiniesta/fix-readme-setup
no need to db:create here
|
2016-10-06 16:40:50 +02:00 |
|
Raimond Garcia
|
39160f0a91
|
Merge pull request #1229 from gentooza/master
added linux config instructions
|
2016-10-06 16:29:50 +02:00 |
|
Raimond Garcia
|
4a1e34c415
|
Merge pull request #1106 from gitmarcia/admin_password_expired
Expire admin passwords once a year #885
|
2016-10-06 16:27:11 +02:00 |
|
Marcia
|
680c0636ed
|
expired password last
|
2016-10-06 14:19:48 +02:00 |
|
Juanjo Bazán
|
df46b806cb
|
Merge pull request #1240 from consul/error-pages
updates image url for error pages
|
2016-10-05 12:43:45 +02:00 |
|
rgarcia
|
ac6b75e8f9
|
updates image url for error pages
|
2016-10-04 18:38:10 +02:00 |
|
Juanjo Bazán
|
407c6e022d
|
updates capistrano-rails
|
2016-10-03 14:40:06 +02:00 |
|
Juanjo Bazán
|
263bef42bc
|
updates dependencies
all minor upgrades
|
2016-10-03 14:36:05 +02:00 |
|
Marcia
|
1f72c5cc74
|
improves expired password view
|
2016-09-30 10:10:20 +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 |
|
rgarcia
|
f3ad806c8b
|
updates dev seeds with booths
|
2016-09-28 11:54:29 +02:00 |
|
rgarcia
|
042cb14dbd
|
moves poll spec to poll folder
|
2016-09-28 11:53:54 +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 |
|
Enrique García
|
03dca699ac
|
removes unused budget feature info from schema.rb
|
2016-09-21 15:53:38 +02:00 |
|
Juanjo Bazán
|
8fa8729c0b
|
Merge pull request #1233 from consul/initialjs
updates initial.js to support unicode
|
2016-09-21 13:08:20 +02:00 |
|
kikito
|
dc74a180b6
|
updates initial.js to support unicode
|
2016-09-21 12:22:16 +02:00 |
|
Ignacio Aliende García
|
e4e2706af6
|
Fixes custom locales inclusion.
|
2016-09-20 17:34:26 +01:00 |
|
Juanjo Bazán
|
d4cbce5472
|
Merge pull request #1230 from consul/polling-voters
Polling voters
|
2016-09-20 14:24:42 +02:00 |
|
prointegra
|
b107c2461b
|
improved text
|
2016-09-20 14:16:47 +02:00 |
|
rgarcia
|
fd220bdf22
|
fixes specs
|
2016-09-20 13:49:48 +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
|
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 |
|