Commit Graph

187 Commits

Author SHA1 Message Date
decabeza
5e0d5fc8c3 Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation 2017-05-22 18:43:49 +02:00
Alberto
6bbcc71ecb Merge branch 'master' into polls 2017-04-06 14:16:49 +02:00
Juanjo Bazán
3f15565f9e uses new jquery-ui widgets path in require 2017-03-24 22:02:34 +01:00
Martín González
ea9d9728d8 Fix comment boxes login warning display 2017-03-10 19:12:39 +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
Amaia Castro
4f0fc6a4aa TOC expanded by default 2017-03-07 23:07:42 +01:00
Amaia Castro
854d51dd8e Calculate annotations weight and add weight css classes for color intensity 2017-03-02 14:25:23 +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
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
Fernando Blat
667d86788e Fix annotation highlighting for multimode annotation 2017-02-13 10:12:03 +01:00
Fernando Blat
04ad8bb6c7 Refactor JS and add update test 2017-02-10 09:48:28 +01:00
Amaia Castro
132d5622ca Checkboxes for process dates 2017-02-09 19:09:59 +01:00
Fernando Blat
5cd263b79c In mobile, don't load comments in the sidebar, but use the permalink page 2017-02-06 13:15:37 +01:00
Fernando Blat
ee90bca24d Highlight current annotation 2017-02-06 12:57:30 +01:00
kikito
86b895a7af Adds checkbox toggle js library 2017-01-24 17:51:18 +01:00
Amaia Castro
b0b65f9853 Hide comments box when showing index 2017-01-23 19:18:13 +01:00
Fernando Blat
c543d1c8d5 Merge branch 'legislation-module-stable' into 66-sync-scroll-in-markdown-editor 2017-01-23 15:08:25 +01:00
Fernando Blat
f7a6f8399b Add pending translations 2017-01-23 14:58:12 +01:00
Martín González
dca072beaf Hide legislation text when the full-screen editor is not active 2017-01-23 12:55:05 +01:00
Amaia Castro
b04030b7ff Sync scroll in markdown editor 2017-01-20 12:32:23 +01:00
Amaia Castro
1af047089f Add form to publish a new first level comment from the comments box 2017-01-19 15:42:50 +01:00
Fernando Blat
6970a8f72c Open tree when there's an anchor 2017-01-19 11:15:42 +01:00
Fernando Blat
3bb77b7536 Only open annotations if the anchor is for an annotation 2017-01-19 11:06:41 +01:00
Fernando Blat
6f698ec9a6 Remove console log 2017-01-19 11:03:03 +01:00
Fernando Blat
cba1f8bd9d Draft text index tree navigator 2017-01-19 11:02:45 +01:00
Amaia Castro
fcfb435adb Merge branch 'master' into legislation-module-stable 2017-01-18 17:35:15 +01:00
Amaia Castro
b8e0a5e7a5 Merge pull request #84 from medialab-prado/alert-when-leaving-form
Ask for confirmation when changing the page and the forms watched do have changes
2017-01-18 16:48:27 +01:00
Fernando Blat
6560e77554 Ask for confirmation when changing the page and
the forms watched do have changes
2017-01-18 13:37:11 +01:00
Martín González
146db24d58 Refactor header toggle and show additional info on the small header 2017-01-18 12:26:45 +01:00
Alberto Garcia Cabeza
d890b0a98b adds fixed bar js 2017-01-17 18:58:13 +01:00
Amaia Castro
7be2901535 Only highlight text and send request if phase is open 2017-01-17 10:47:33 +01:00
Amaia Castro
e651ef5b9c Merge pull request #59 from medialab-prado/18-create-comment
Create annotations and comments
2017-01-16 19:30:45 +01:00
Amaia Castro
65fcd83ee5 Don’t show new annotation/comment form if allegations phase is not open 2017-01-16 19:06:06 +01:00
Amaia Castro
ce6b278f55 Merge pull request #60 from medialab-prado/frontend-improvements
Frontend improvements
2017-01-16 11:58:45 +01:00
Fernando Blat
046c021c0c Complete create comment details 2017-01-14 16:43:40 +01:00
Fernando Blat
f47cef5a93 Highlight text when creating a comment 2017-01-14 16:43:26 +01:00
Fernando Blat
d253c4c09f Restore custom position 2017-01-14 16:42:59 +01:00
Fernando Blat
17a68f5c14 Load annotations on click event 2017-01-14 16:42:57 +01:00
Fernando Blat
4431d95d31 Basic annotation creation 2017-01-14 16:42:12 +01:00
Martín González
046bcbfb0f Fix small header toggle 2017-01-12 12:48:14 +01:00
Amaia Castro
306e3fa59f Don’t show comments panel if seeing final version 2017-01-11 23:11:11 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
Amaia Castro
174fe5ee04 Don’t scroll and show comments when there isn’t an anchor in the url 2017-01-10 18:59:18 +01:00
Amaia Castro
f3daf2aca2 Show comments box when scrolling to annotation 2017-01-10 18:24:55 +01:00
Amaia Castro
4f539b374f View comments for draft text 2017-01-10 17:25:02 +01:00
Fernando Blat
7100156b28 Show full header when click on expand button 2017-01-05 10:55:53 +01:00