Commit Graph

4893 Commits

Author SHA1 Message Date
Amaia Castro
5e6d80f7a3 Merge branch 'master' into legislation-module-stable 2017-03-10 10:41:15 +01:00
Amaia Castro
13ff9816ae Merge pull request #124 from medialab-prado/122-color-intensity
Annotations color intensity according to (comments) weight
2017-03-09 16:27:14 +01:00
Amaia Castro
1cedf73a39 Merge pull request #123 from medialab-prado/120-hidden-comments
Several comments boxes
2017-03-09 16:26:33 +01:00
kikito
dcb0e03cf4 small i18n change 2017-03-08 13:32:25 +01:00
Fernando Blat
ebd88b80e1 Merge pull request #127 from medialab-prado/126-toc-expanded-by-default
TOC expanded by default
2017-03-08 08:16:15 +01:00
Amaia Castro
d95f902fdf Merge branch 'master' into legislation-module-stable 2017-03-07 23:19:26 +01:00
Amaia Castro
4f0fc6a4aa TOC expanded by default 2017-03-07 23:07:42 +01:00
Enrique García
15101c0d3e Merge pull request #1434 from consul/valuation-tags
displays only valuation tags for filtering
2017-03-07 19:14:44 +01:00
rgarcia
712d5f2d9a displays only valuation tags for filtering 2017-03-07 18:19:53 +01:00
kikito
8f91b1e2cc fixes incorrect title/setup in spec 2017-03-07 16:42:45 +01:00
Juanjo Bazán
a3b4b6b30d Merge pull request #1433 from consul/budget-investments-delete
Budget investments delete
2017-03-07 11:22:01 +01:00
Alberto Garcia Cabeza
f67b8d8aee improves styles of delete button 2017-03-06 19:34:47 +01:00
kikito
3dbdc8f455 Adds delete link to budget investment list in user activities 2017-03-06 19:24:10 +01:00
Alberto
32036f2964 Merge pull request #1432 from consul/accesibility
Accesibility
2017-03-06 14:48:00 +01:00
Alberto Garcia Cabeza
b5fd8cc8b2 fixes missing i18n 2017-03-06 14:04:17 +01:00
Alberto Garcia Cabeza
1e3ea14c99 improves color contrast on hollow buttons 2017-03-06 14:00:08 +01:00
Alberto Garcia Cabeza
737d347c4a changes alt text of header logo 2017-03-06 13:45:11 +01:00
kikito
24920e73f6 Adds permissions for authors to destroy budget investments 2017-03-06 13:42:52 +01:00
Alberto Garcia Cabeza
5cf9a98e6a adds lang attribute on error pages 2017-03-06 13:38:40 +01:00
Alberto Garcia Cabeza
ad9d6d0713 fixes tabs role on proposals show 2017-03-06 13:31:18 +01:00
Alberto Garcia Cabeza
580ed6e4c6 adds alternative text for share on WhatsApp links 2017-03-06 13:15:12 +01:00
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
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
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
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
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
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
Fernando Blat
9478ca3b60 Merge pull request #116 from medialab-prado/106-show-annotation-context
Show annotation context in annotation page
2017-02-13 11:42:41 +01:00
Amaia Castro
58b9135c71 Add context to annotation in index view 2017-02-13 11:18:33 +01:00
Amaia Castro
151200cc3f Merge pull request #115 from medialab-prado/105-highlight-current-annotation
Fix annotation highlighting for multimode annotation
2017-02-13 11:08:47 +01:00
Fernando Blat
667d86788e Fix annotation highlighting for multimode annotation 2017-02-13 10:12:03 +01:00
Amaia Castro
8e741a6b4f Refactor and use first node start + quote + last node end for the context 2017-02-13 09:53:36 +01:00
Amaia Castro
6737d6afdd Make annotation context work with multi-node annotations 2017-02-10 18:16:09 +01:00
Amaia Castro
4cb1bba5a7 Use range offsets instead of quote for substitution 2017-02-10 15:55:03 +01:00