Commit Graph

7983 Commits

Author SHA1 Message Date
decabeza
1da787e2ff fixes lint warnings using single quoted on icons.scss 2017-10-13 21:01:23 +02:00
decabeza
b52abfb922 uses correct i18n key 2017-10-13 21:00:45 +02:00
decabeza
d91388b2b3 improves layout and unifies design of admin moderated content 2017-10-13 20:57:19 +02:00
decabeza
ae74e1ba07 improves admin tags layout 2017-10-13 19:31:02 +02:00
decabeza
599c243f62 removes unnecessary helper for welcome page 2017-10-13 18:58:58 +02:00
decabeza
127ae893fc replaces polls and budgets help icons to add consistency 2017-10-13 18:55:14 +02:00
decabeza
2e6072ef19 adds missing icons on admin menu 2017-10-13 18:54:48 +02:00
decabeza
96bd8cec00 fixes styles on admin legislation processes subnav 2017-10-13 18:54:26 +02:00
rgarcia
f2d99d6747 searches for officers assigned to a poll 2017-10-13 18:39:13 +02:00
decabeza
bf5021c6a5 changes back link to available booths when manage shifts 2017-10-13 18:11:41 +02:00
BertoCQ
7af18ff77a Merge pull request #2057 from consul/polls-admin
Polls admin
2017-10-13 17:54:11 +02:00
decabeza
36a1e4a376 fixes admin polls index table 2017-10-13 17:41:09 +02:00
Bertocq
16f499d5fd Force shift dates to start on current date at minimun 2017-10-13 17:19:51 +02:00
Bertocq
79c8c2f826 Add scope on shift creation date ranges to current/recounting/incoming polls, plus cover with test 2017-10-13 17:01:48 +02:00
Bertocq
9146d68c53 Add current_or_recounting_or_incoming method to Poll model 2017-10-13 16:53:03 +02:00
Bertocq
ca2d9a1d68 Add recounting Poll scope with trait and spec 2017-10-13 16:51:58 +02:00
Bertocq
540e12a3ac Add RECOUNT_DURATION Poll constant for recount period duration 2017-10-13 16:47:47 +02:00
Raimond Garcia
5d39ce2f03 Merge pull request #2053 from consul/officing-voter-message
Officing voter message
2017-10-13 15:30:49 +02:00
rgarcia
200db22cbb only update the poll that was just voted 2017-10-13 15:15:54 +02:00
decabeza
234d4d3f54 hides can vote callout when voted 2017-10-13 14:45:30 +02:00
Bertocq
99471a3d15 Comment out slug assignment until Poll slug feature is ported back from madrid's fork 2017-10-13 14:42:43 +02:00
iagirre
d198f1a928 Merge branch 'iagirre-answer-resize-reorder' of github.com:wairbut-m2c/consul into iagirre-answer-resize-reorder 2017-10-13 14:41:05 +02:00
decabeza
6b721e7750 moves table content to partials 2017-10-13 14:40:39 +02:00
iagirre
2c6c320fa1 When answer 2 more info expand is clicked, it expands on top of the first one, not below. Same if the expand is clicked for the first answer 2017-10-13 14:38:30 +02:00
iagirre
54068ce7cb When answer 2 more info expand is clicked, it expands on top of the first one, not below. Same if the expand is clicked for the first answer 2017-10-13 14:35:14 +02:00
decabeza
f94a376392 updates text on specs 2017-10-13 14:16:46 +02:00
decabeza
5540f130e1 removes unused partials 2017-10-13 14:16:33 +02:00
decabeza
386fe785c7 improves text and layouts for officing voters views 2017-10-13 14:16:21 +02:00
BertoCQ
29cac6b93b Merge pull request #2051 from consul/clean-folders
Clean folders
2017-10-13 13:42:05 +02:00
BertoCQ
df5934e0c2 Merge pull request #2026 from consul/polls-admin-polish
Polls admin polish
2017-10-13 12:59:27 +02:00
Bertocq
916f9ba40b Correctly query and order poll question answers for description block 2017-10-13 12:44:55 +02:00
Bertocq
ecf95c4ea3 Add slug to Polls on dev seed rake 2017-10-13 12:44:36 +02:00
rgarcia
c097cf236c updates specs 2017-10-13 12:41:43 +02:00
rgarcia
cd6cf3bda1 uses default rails helper to disable submit button 2017-10-13 12:41:33 +02:00
rgarcia
560ff7c51d does not use custom implementation to disable submit button 2017-10-13 12:40:42 +02:00
decabeza
89553d346a removes unused old images and styles 2017-10-12 19:12:53 +02:00
decabeza
cdddddd972 removes example images 2017-10-12 19:10:12 +02:00
BertoCQ
1d59dcac7c Merge pull request #2049 from consul/booth-edit-button
Edit booth button
2017-10-11 20:32:55 +02:00
BertoCQ
e08d6ca872 Merge pull request #2050 from consul/polls-show-ui
Polls show UI
2017-10-11 20:22:54 +02:00
decabeza
3a20a6bc2a adds margin to read more answer description link 2017-10-11 20:16:38 +02:00
decabeza
7a58b49851 updates specs 2017-10-11 20:14:25 +02:00
decabeza
811c348f0f hides edit booth button when available filter 2017-10-11 19:36:23 +02:00
decabeza
bdc3538100 Merge branch 'master' into polls-admin-polish 2017-10-11 19:12:34 +02:00
Bertocq
34c278db74 Small fixes for Poll Question Answer ordering 2017-10-11 12:05:20 +02:00
BertoCQ
5ff0047c9f Merge pull request #2037 from wairbut-m2c/iagirre-question-ansers-ordenable
Iagirre question ansers ordenable
2017-10-11 11:53:39 +02:00
iagirre
644d09ebd2 PR comments applied and poll_question_answer default name changed in factory. 2017-10-11 09:42:52 +02:00
BertoCQ
8ef0e554ea Merge pull request #2039 from consul/poll-comments-exception
Fixes exception when sending a poll comment's email
2017-10-10 19:48:54 +02:00
iagirre
44474e7686 Deleted a forgotten comment 2017-10-10 16:39:19 +02:00
iagirre
943c1f23af Spects added to test the order of answers. Default order for question_answers set. 2017-10-10 16:38:55 +02:00
iagirre
2b10b59e2a Order in the admin page using jquery-ui sortable widget. 2017-10-10 16:38:29 +02:00