Angel Perez
|
d9d03079e1
|
Adapt Poll::Question 'show' action to mockup
|
2017-10-03 13:29:07 -04:00 |
|
Bertocq
|
ccb80ce967
|
Fix recount spec to take into account already existing values and mandatory officer_assigment
|
2017-10-03 11:40:36 +02:00 |
|
Bertocq
|
6c998768e8
|
Fix Poll Recount model spec after default amount value added
|
2017-10-03 00:19:12 +02:00 |
|
BertoCQ
|
fbbbd38932
|
Merge pull request #1965 from consul/polls-voting
Polls voting
|
2017-10-02 22:25:51 +02:00 |
|
BertoCQ
|
356eb4ca8a
|
Merge pull request #1959 from consul/polls-index
Polls index view
|
2017-10-02 21:42:59 +02:00 |
|
BertoCQ
|
1b4f6d5cae
|
Merge pull request #1938 from consul/imageable-polish
Imageable polish
|
2017-10-02 21:42:15 +02:00 |
|
BertoCQ
|
01e4447050
|
Merge pull request #1923 from wairbut-m2c/iagirre-preview-budget-results
Admins can see the preview of the budgets' results before the balloti…
|
2017-10-02 21:40:04 +02:00 |
|
BertoCQ
|
01107e2257
|
Merge pull request #1968 from consul/fix/recount_default_amounts
Set default 0 for Poll Recount amounts
|
2017-10-02 21:19:53 +02:00 |
|
Bertocq
|
d401a2cd92
|
Add default 0 value for Poll Recount amounts
|
2017-10-02 21:16:22 +02:00 |
|
Bertocq
|
5aa063668f
|
Remove no longer used befor block with comments
|
2017-10-02 19:57:02 +02:00 |
|
Raimond Garcia
|
a743b6b823
|
Merge branch 'master' into polls-voting
|
2017-10-02 17:11:21 +02:00 |
|
BertoCQ
|
890f6720e5
|
Merge pull request #1963 from consul/chore/poll_recount
Swap Poll White/Null/Total Results for Poll Recount
|
2017-10-02 16:38:38 +02:00 |
|
rgarcia
|
085991c624
|
allows voting only in one origin: booth or web
|
2017-10-02 16:22:31 +02:00 |
|
rgarcia
|
0147401fbe
|
adds origin to poll voters
|
2017-10-02 16:18:08 +02:00 |
|
Bertocq
|
b5cf28cb35
|
Swap Poll White/Null/Total usage for Poll Recount
|
2017-10-02 15:46:49 +02:00 |
|
Bertocq
|
6c297ae789
|
Add Poll Recount model, factory and spec
|
2017-10-02 14:57:40 +02:00 |
|
Bertocq
|
9d7be9b57c
|
Sort Shift recount and scrutiny dates
|
2017-10-02 13:46:02 +02:00 |
|
rgarcia
|
60fb142fff
|
adds comprehensive validation specs
|
2017-10-02 13:39:55 +02:00 |
|
rgarcia
|
b623422805
|
allows users to change their vote without refreshing the page
|
2017-10-02 13:14:58 +02:00 |
|
Bertocq
|
5c513d8051
|
Fix typo on general proposal share text
|
2017-10-02 12:30:31 +02:00 |
|
decabeza
|
f497227e3f
|
improves layout for polls index view
|
2017-10-02 12:24:31 +02:00 |
|
BertoCQ
|
c3d5041717
|
Merge pull request #1945 from consul/depfu/upgrade/byebug-9.1.0
Upgrade byebug to version 9.1.0
|
2017-09-30 09:30:03 +02:00 |
|
Raimond Garcia
|
f68d86a2e5
|
Merge pull request #1824 from rockandror/user-recomendations
User recomendations
|
2017-09-29 19:02:03 +02:00 |
|
depfu[bot]
|
2fde9ec1b8
|
Upgrade byebug to version 9.1.0
|
2017-09-29 12:00:16 +00:00 |
|
Bertocq
|
07592f6b0d
|
Correct Poll current/expired/incoming scopes and helper functions
|
2017-09-29 11:50:23 +02:00 |
|
Raimond Garcia
|
583fb65c79
|
Merge pull request #1937 from consul/depfu/update/nokogiri-1.8.1
🚨 [security] Update nokogiri to version 1.8.1
|
2017-09-29 11:47:55 +02:00 |
|
decabeza
|
1a0467d2c6
|
adds data equalizer watch to prevent js errors
|
2017-09-29 09:23:05 +02:00 |
|
decabeza
|
f44f3f5bc1
|
fixes css to shows error messages correctly
|
2017-09-28 17:52:28 +02:00 |
|
Alessandro Cuoghi
|
20fd176b6a
|
Change again margin-top to button.hollow
|
2017-09-28 17:13:45 +02:00 |
|
Alessandro Cuoghi
|
4eee5f6eba
|
Fixed orbit-bullets. Decreased margin-top to button.hollow.expanded.
|
2017-09-28 17:03:50 +02:00 |
|
depfu[bot]
|
9a6e3219c9
|
Update nokogiri to version 1.8.1
|
2017-09-28 14:14:06 +00:00 |
|
decabeza
|
876a2b530b
|
fixes lint warnings
|
2017-09-28 16:03:08 +02:00 |
|
decabeza
|
fd78eb30cc
|
shows hr tag on forms only when expanded
|
2017-09-28 15:20:47 +02:00 |
|
decabeza
|
8aaa0cb718
|
adds data equalizer to fix height on items with images
|
2017-09-28 15:20:00 +02:00 |
|
Senén Rodero Rodríguez
|
92c774cdeb
|
Merge with master
|
2017-09-28 13:36:20 +02:00 |
|
BertoCQ
|
4e5b80f79f
|
Merge pull request #1928 from consul/feature/1924#poll_shifts_creation
Add Shift tasks
|
2017-09-28 13:30:45 +02:00 |
|
BertoCQ
|
121109f967
|
Merge branch 'master' into feature/1924#poll_shifts_creation
|
2017-09-28 13:03:34 +02:00 |
|
Raimond Garcia
|
e590e31053
|
Merge pull request #1864 from rockandror/maps-frontend
Maps frontend
|
2017-09-28 12:53:17 +02:00 |
|
Bertocq
|
3da4ee4ee3
|
Check Poll Shift creation date ranges are correct
|
2017-09-28 12:18:47 +02:00 |
|
Bertocq
|
49b4af5e04
|
Add flash error for shift creation without date, increase spec
|
2017-09-28 10:53:15 +02:00 |
|
María Checa
|
08cdf93ecc
|
Switch date selects for shift tasks
|
2017-09-28 10:40:48 +02:00 |
|
decabeza
|
fff643db8c
|
improves delete image button on proposal show
|
2017-09-28 09:16:08 +02:00 |
|
decabeza
|
33d9d2d005
|
adds new icon image
|
2017-09-28 09:15:46 +02:00 |
|
Bertocq
|
13aa5a3ba8
|
Increase Admin Shift creation scenarios for both tasks options
|
2017-09-27 18:47:06 +02:00 |
|
BertoCQ
|
e526d3b883
|
Merge pull request #1930 from consul/admin-filters
Admin filters
|
2017-09-27 18:17:44 +02:00 |
|
Bertocq
|
f40a0d09ed
|
Add Shift vote and recount date ranges, filter selected one on controller
|
2017-09-27 18:08:03 +02:00 |
|
decabeza
|
c8341fc5f1
|
adds missing translation
|
2017-09-27 18:08:01 +02:00 |
|
decabeza
|
407c0fc702
|
fixes styles for filters, orders and subnavs on admin
|
2017-09-27 17:57:54 +02:00 |
|
taitus
|
a0603985ef
|
Refactor.
|
2017-09-27 14:51:35 +02:00 |
|
taitus
|
51c53b6f31
|
Add missing specs from Maps on New, Edit and Show.
|
2017-09-27 14:50:54 +02:00 |
|