Commit Graph

15242 Commits

Author SHA1 Message Date
Amaia Castro
d3d6681902 Change annotation weight colors 2017-03-02 16:55:16 +01:00
Amaia Castro
854d51dd8e Calculate annotations weight and add weight css classes for color intensity 2017-03-02 14:25:23 +01:00
Alberto
ff4c72aaae Merge pull request #1429 from struebano/fix/fix-closed-div-and-thead-in-admin-budgets-groups-edit-block
fix close div and close thead in admin budgets groups edit partial
2017-02-27 13:46:05 +01:00
Susana Truebano
e6f6a34054 fix close div and close thead in admin budgets groups edit partial 2017-02-27 13:04:56 +01:00
Amaia Castro
5f61e9f270 Clear box before showing comments for anchor 2017-02-24 16:31:47 +01:00
Amaia Castro
c7eaadb4b2 Show comment boxes for all annotations at the clicked point 2017-02-24 15:45:36 +01:00
Fernando Blat
83e4c2bd03 Merge pull request #121 from medialab-prado/118-annotations-loading-twice
Avoid loading annotations twice when creating new one
2017-02-24 10:39:31 +01:00
Amaia Castro
d21b416ca0 Merge branch 'master' into legislation-module-stable 2017-02-23 19:14:47 +01:00
Amaia Castro
8b80efd534 Fix scroll to anchor 2017-02-23 19:05:36 +01:00
Amaia Castro
20bfe5e0e5 Fix annotation highlight on click 2017-02-23 16:04:55 +01:00
Amaia Castro
7061d70f22 Avoid loading annotations twice when creating new one 2017-02-23 16:04:30 +01:00
Juanjo Bazán
25a88e8747 adds order to booth selects in results/final_recounts forms 2017-02-21 12:59:35 +01:00
Juanjo Bazán
4a195e07c4 improves notice/alert messages on poll recounting 2017-02-18 13:23:29 +01:00
Raimond Garcia
4efe444cff Merge pull request #1425 from consul/fix-null-white-results
fix bug storing null results as white results
2017-02-18 12:34:29 +01:00
Juanjo Bazán
58b1ad950a fix bug storing null results as white results 2017-02-18 12:11:49 +01:00
Juanjo Bazán
e21dc04093 Merge branch 'master' into polls 2017-02-18 11:43:22 +01:00
Juanjo Bazán
e65cd46285 Merge pull request #1424 from consul/portuguese
fixes date order symbols and syntax of portuguese locale
2017-02-18 11:32:45 +01:00
rgarcia
0cd72894ff fixes date order symbols and syntax of portuguese locale 2017-02-18 11:21:59 +01:00
Juanjo Bazán
1b2061f95b fixes date/datetime comparison 2017-02-17 15:27:04 +01:00
Fernando Blat
f3d1be93ec Merge pull request #117 from medialab-prado/107-fix-share-buttons-position
Invert share buttons layout
2017-02-16 16:28:43 +01:00
Fernando Blat
16c365ca1d Improve social networks share text 2017-02-16 16:13:31 +01:00
Juanjo Bazán
478f4e65b9 Merge pull request #1423 from consul/mobile-layout
Improves mobile layout
2017-02-16 13:49:11 +01:00
Alberto Garcia Cabeza
92133b2e0a shows locale switcher and top links on mobile version 2017-02-15 21:15:32 +01:00
Martín González
9962202b0d Invert share buttons layout 2017-02-15 19:47:58 +01:00
Raimond Garcia
660ec6fa09 Merge pull request #1422 from consul/fix-question-comments-show
adds Question case for commentable route
2017-02-15 14:54:17 +01:00
Juanjo Bazán
c81b8550f0 adds Question case for commentable route 2017-02-15 14:27:09 +01:00
Amaia Castro
73d580b5ba Merge pull request #113 from medialab-prado/107-social-share-for-annotations
Social share buttons for annotation
2017-02-15 13:37:50 +01:00
Juanjo Bazán
0a2c6c0921 reorders booth_assignments query 2017-02-15 10:46:38 +01:00
Raimond Garcia
d9ada6ecf5 Merge pull request #1421 from consul/admin-polls-improvements
Admin polls improvements
2017-02-14 19:58:00 +01:00
Juanjo Bazán
d68be1f6f0 adds automatic recount to admin poll and paginates recounts 2017-02-14 19:44:19 +01:00
Juanjo Bazán
2b68f02b95 paginates booths 2017-02-14 19:09:31 +01:00
Juanjo Bazán
8129131a3c adds pagination to officer assignments 2017-02-14 19:09:19 +01:00
Amaia Castro
311388969d Changes annotations text for twitter share button 2017-02-14 18:15:01 +01:00
Amaia Castro
2efa72ddd5 Merge branch 'legislation-module-stable' into 107-social-share-for-annotations 2017-02-14 18:14:00 +01:00
Juanjo Bazán
2905c03037 Merge pull request #1420 from consul/poll-semi-verified
makes officing residence spec verify users
2017-02-14 18:09:34 +01:00
kikito
a8b653739c makes officing residence spec verify users 2017-02-14 17:30:22 +01:00
Martín González
af52fb5670 Improve social share buttons position for the annotations index and specific annotations 2017-02-14 17:11:02 +01:00
Alberto Garcia Cabeza
799bbbe6cb fixes ul close tag on admin polls subnav 2017-02-14 16:40:18 +01:00
Juanjo Bazán
e04cc55eb7 shows add booth link only for not assigned booths 2017-02-14 16:07:34 +01:00
Juanjo Bazán
4beee7bacc improves naming consistency 2017-02-14 16:05:28 +01:00
Juanjo Bazán
c359b93fd0 fixes booth search in admin 2017-02-14 16:01:09 +01:00
Enrique García
61ca14e6ec Merge pull request #1418 from consul/poll-show-breaking
Break admin's poll show view
2017-02-14 15:33:55 +01:00
Juanjo Bazán
47745f5e6d removes unused route 2017-02-14 15:10:51 +01:00
Juanjo Bazán
75d088b472 fixes specs 2017-02-14 15:01:04 +01:00
Juanjo Bazán
2d722f1ad4 redux admin poll subnav 2017-02-14 14:57:49 +01:00
Juanjo Bazán
0bd87c7e43 extracts results from admin's poll/show 2017-02-14 14:26:46 +01:00
Juanjo Bazán
2fae5c3b73 makes admin menu aware of recounts 2017-02-14 14:08:19 +01:00
Juanjo Bazán
bedb9f29e7 extracts recounting from admin's poll/show 2017-02-14 14:07:22 +01:00
Juanjo Bazán
19ec7f93b3 extracts officer_assignments from admin's poll/show 2017-02-14 13:47:33 +01:00
Juanjo Bazán
20e31133a8 extracts booth_assignment from admin's poll/show 2017-02-14 13:00:19 +01:00