Commit Graph

7442 Commits

Author SHA1 Message Date
decabeza
92dbb4fb73 removes unnecessary close button for admin menu 2017-10-16 19:39:29 +02:00
decabeza
3ec12cfad7 removes box shadow for off canvas content 2017-10-16 19:39:06 +02:00
BertoCQ
2e4c6dce2e Merge pull request #2062 from consul/2031-trim_shift_dates_with_officer_shifts
Excluded officer shift dates from each task date range
2017-10-16 19:26:40 +02:00
María Checa
7d22b386b9 Added tests 2017-10-16 16:08:15 +02:00
María Checa
a6d533a767 Helper improvements 2017-10-16 13:47:10 +02:00
María Checa
45f73aa1ba Excluded officer shift dates from each task date range 2017-10-16 12:22:54 +02:00
Raimond Garcia
1c5a1d1677 Merge pull request #2054 from wairbut-m2c/iagirre-answer-resize-reorder
Iagirre answer resize reorder
2017-10-16 10:49:35 +02:00
Raimond Garcia
b75480a5c9 Merge pull request #2058 from consul/booth-shifts-back
Booth shifts back link
2017-10-16 10:48:56 +02:00
Raimond Garcia
ddbcdee105 Merge pull request #2060 from consul/consul-design
Consul design
2017-10-16 10:48:41 +02:00
Alberto García
9a47adb885 Merge pull request #2059 from consul/officer-search
Searches for officers assigned to a poll
2017-10-16 10:45:42 +02:00
decabeza
99e6097695 updates admin tags specs 2017-10-13 21:32:19 +02:00
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
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