Amaia Castro
|
d65f1998d0
|
Sort comments in sidebar by number of votes
|
2017-02-09 12:42:00 +01:00 |
|
Amaia Castro
|
60c7947cb4
|
Merge branch 'master' into legislation-module-stable
|
2017-02-08 12:24:40 +01:00 |
|
Amaia Castro
|
32dc39860c
|
Merge pull request #109 from medialab-prado/annotation-improvements
Annotation improvements
|
2017-02-08 12:17:33 +01:00 |
|
Raimond Garcia
|
5a20a4d190
|
Merge pull request #1406 from consul/quoting
avoids error 500 if invalid random_seed
|
2017-02-07 19:40:50 +01:00 |
|
Juanjo Bazán
|
ba0b39a45c
|
avoids error 500 if invalid random_seed
|
2017-02-07 19:29:17 +01:00 |
|
Enrique García
|
11736f742b
|
Merge pull request #1405 from consul/quoting
quotes random seed
|
2017-02-07 19:13:47 +01:00 |
|
Juanjo Bazán
|
e93461356c
|
quotes random seed
|
2017-02-07 19:05:04 +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
|
ea33dce3a6
|
Allow 5 levels of highlighting
|
2017-02-06 12:59:57 +01:00 |
|
Fernando Blat
|
ee90bca24d
|
Highlight current annotation
|
2017-02-06 12:57:30 +01:00 |
|
Fernando Blat
|
09b14d9687
|
Annotation pointer cursor
|
2017-02-06 12:54:07 +01:00 |
|
Amaia Castro
|
996aa7b2be
|
Merge pull request #96 from medialab-prado/94-hide-comments-when-showing-index
Hide comments box when showing index
|
2017-01-26 13:23:22 +01:00 |
|
Juanjo Bazán
|
b1a5a324c7
|
adds missing checkbox label for unfeasible investments
|
2017-01-26 13:15:43 +01:00 |
|
Fernando Blat
|
08987f7c0c
|
Merge pull request #95 from medialab-prado/69-find-annotation-with-same-ranges
Create a new comment instead of a new annotation with the same ranges
|
2017-01-25 16:31:51 +01:00 |
|
Amaia Castro
|
53d13d8524
|
Create a new comment instead of a new annotation with the same ranges
|
2017-01-25 16:04:10 +01:00 |
|
Amaia Castro
|
b0b65f9853
|
Hide comments box when showing index
|
2017-01-23 19:18:13 +01:00 |
|
Fernando Blat
|
7e30c6998b
|
Merge pull request #89 from medialab-prado/66-sync-scroll-in-markdown-editor
Sync scroll in markdown editor
|
2017-01-23 15:28:30 +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
|
763f3c28de
|
Merge pull request #93 from medialab-prado/92-hide-legislation-editor
Hide legislation text when the full-screen editor is not active
|
2017-01-23 15:06:48 +01:00 |
|
Fernando Blat
|
f7a6f8399b
|
Add pending translations
|
2017-01-23 14:58:12 +01:00 |
|
Martín González
|
deb9d2a508
|
Fix typo
|
2017-01-23 14:25:51 +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 |
|
Martín González
|
7ce2d2802b
|
Same styles on editor and preview
|
2017-01-23 12:13:32 +01:00 |
|
Fernando Blat
|
6c2e7fc3b1
|
Merge pull request #91 from medialab-prado/add-url-helpers-for-legislation-again
Add url helpers for legislation again
|
2017-01-23 11:18:31 +01:00 |
|
Amaia Castro
|
6e9750bcd8
|
Merge branch 'legislation-module-stable' into add-url-helpers-for-legislation-again
|
2017-01-21 21:52:44 +01:00 |
|
Amaia Castro
|
7a55ac1561
|
Merge branch 'master' into legislation-module-stable
|
2017-01-21 21:52:17 +01:00 |
|
Juanjo Bazán
|
29f57e7da2
|
Merge pull request #1365 from medialab-prado/flaky-spec-ballots-hover
Try to avoid intermittent poltergeist error on hover
|
2017-01-21 19:44:30 +01:00 |
|
Amaia Castro
|
7692fb9cb0
|
Try to avoid poltergeist error on hover
|
2017-01-20 19:56:33 +01:00 |
|
Amaia Castro
|
c4265e76a3
|
Don’t send notifications when commenting on an annotation
First level comments are considered different threads, so no need to notify the first commenter about other threads
|
2017-01-20 18:46:57 +01:00 |
|
Amaia Castro
|
289b8e044b
|
Fix url to notifiable when it is a Legislation Question or Annotation
|
2017-01-20 18:46:57 +01:00 |
|
Fernando Blat
|
7613091d2e
|
Merge pull request #88 from medialab-prado/publish-comment-from-comments-box
Publish comment from comments box
|
2017-01-20 18:45:38 +01:00 |
|
Fernando Blat
|
63a986d31c
|
If the comment has errors, show the textarea with the error message
|
2017-01-20 18:35:34 +01:00 |
|
Fernando Blat
|
3d8724b13b
|
Remove unnecessary hidden fields
|
2017-01-20 18:33:07 +01:00 |
|
Fernando Blat
|
2a5d21f8d4
|
Focus on textarea when showing the comments box
|
2017-01-20 18:28:15 +01:00 |
|
Fernando Blat
|
563ca99ab8
|
Merge pull request #87 from medialab-prado/77-nav-hover
Add hover effect for the main menu
|
2017-01-20 18:17:56 +01:00 |
|
Amaia Castro
|
b04030b7ff
|
Sync scroll in markdown editor
|
2017-01-20 12:32:23 +01:00 |
|
Martín González
|
116b211e88
|
Add hover effect for main process menu
|
2017-01-20 12:02:50 +01:00 |
|
Amaia Castro
|
78219b5c31
|
Merge branch 'master' into legislation-module-stable
|
2017-01-20 11:50:15 +01:00 |
|
Amaia Castro
|
47b35a8149
|
Add spec for publishing a comment from the comments box for a draft
|
2017-01-20 11:42:14 +01:00 |
|
Juanjo Bazán
|
4957ea2bf1
|
Merge pull request #1364 from medialab-prado/increase-poltergeist-timeout
Increase Poltergeist timeout in specs
|
2017-01-20 11:28:31 +01:00 |
|
Juanjo Bazán
|
da2d264f7a
|
adds missing budget_id parameter
|
2017-01-19 18:30:32 +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 |
|
Amaia Castro
|
551e8dc6c1
|
Increase Poltergeist timeout in specs
This is to try to avoid flaky js specs in Travis
|
2017-01-19 13:38:06 +01:00 |
|
Amaia Castro
|
35d2c54b4e
|
Merge branch 'master' into legislation-module-stable
|
2017-01-19 12:40:07 +01:00 |
|
Amaia Castro
|
9f7d0b8195
|
Merge pull request #73 from medialab-prado/legislation-text-index-style
Legislation text index styles
|
2017-01-19 12:37:30 +01:00 |
|
Fernando Blat
|
e58b382dfa
|
Merge pull request #86 from medialab-prado/fixes-1
A couple of small fixes
|
2017-01-19 11:19:12 +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 |
|