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 |
|
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 |
|
Juanjo Bazán
|
d4cbce5472
|
Merge pull request #1230 from consul/polling-voters
Polling voters
|
2016-09-20 14:24:42 +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 |
|
Alberto Garcia Cabeza
|
4872c7a4e8
|
Adds content to edit and show views
|
2016-09-19 13:36:42 +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 |
|
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 |
|
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 |
|
Alberto García Cabeza
|
cebc83f97c
|
Merge pull request #1204 from jaimeiniesta/fix-spec
Fixes failing spec for badges
|
2016-09-12 12:25:27 +02:00 |
|
Juanjo Bazán
|
9c2f5e3944
|
Merge pull request #1205 from jaimeiniesta/docs-typos
fixes typos in docs
|
2016-09-07 14:30:50 +02:00 |
|
Jaime Iniesta
|
56b7474f68
|
fixes typos in docs
|
2016-09-07 14:21:44 +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 |
|
Raimond Garcia
|
9e72b91ef0
|
Merge pull request #1200 from jaimeiniesta/typos
fixes a few typos
|
2016-09-06 18:28:33 +02:00 |
|
Jaime Iniesta
|
2e6328d502
|
fixes a few typos
|
2016-09-06 18:21:15 +02:00 |
|
Raimond Garcia
|
362f45378c
|
Merge pull request #1197 from consul/shut-up-sprockets
downgrades sprockets to 3.6.3 to avoid warnings
|
2016-09-01 15:30:59 +02:00 |
|
Raimond Garcia
|
6a0f756a88
|
Merge pull request #1196 from consul/ckeditor-conf
Ckeditor conf
|
2016-09-01 12:44:39 +02:00 |
|
kikito
|
fb31a4782f
|
downgrades sprockets to 3.6.3 to avoid warnings
|
2016-08-30 18:35:53 +02:00 |
|
kikito
|
7ad4a21229
|
Tries to make ckeditor work correctly with the asset pipeline
Reference: https://github.com/galetahub/ckeditor/issues/519
|
2016-08-30 12:05:46 +02:00 |
|
kikito
|
345e34d422
|
adds ckeditor config
|
2016-08-29 16:49:52 +02:00 |
|
Juanjo Bazán
|
c84108ae60
|
updates rails version
(security fix)
|
2016-08-12 13:41:51 +02:00 |
|