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 |
|
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 |
|
Amaia Castro
|
b298fb7316
|
Show annotation context in annotation page
Only works with quotes within the same html node for now
|
2017-02-10 15:35:42 +01:00 |
|
Amaia Castro
|
faa6cb90ed
|
Merge pull request #114 from medialab-prado/103-redirect-to-main-phase
Redirect to main phase and activate/deactivate phases
|
2017-02-10 10:45:33 +01:00 |
|
Fernando Blat
|
c81f98c963
|
Change text
|
2017-02-10 09:48:32 +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 |
|
Amaia Castro
|
28de717300
|
Show only active phases
|
2017-02-09 17:32:38 +01:00 |
|
Amaia Castro
|
5d37997a69
|
Redirect to allegations phase if open
|
2017-02-09 16:59:02 +01:00 |
|
Amaia Castro
|
d656de680d
|
Social share buttons for annotation
|
2017-02-09 15:32:42 +01:00 |
|
Fernando Blat
|
5d060d6d8c
|
Merge pull request #110 from medialab-prado/101-open-rsponses-only-for-verified-users
Check open phase and user verification for questions open answers
|
2017-02-09 14:45:42 +01:00 |
|
Fernando Blat
|
a22cb764ad
|
Merge pull request #111 from medialab-prado/99-make-process-texts-optional
Make process texts optional
|
2017-02-09 14:43:59 +01:00 |
|
Fernando Blat
|
beea28493b
|
Merge pull request #112 from medialab-prado/98-sort-by-votes
Sort comments in sidebar by number of votes
|
2017-02-09 14:40:27 +01:00 |
|
Amaia Castro
|
d65f1998d0
|
Sort comments in sidebar by number of votes
|
2017-02-09 12:42:00 +01:00 |
|
Amaia Castro
|
08ab7474d0
|
Make process texts optional
|
2017-02-09 12:27:16 +01:00 |
|
Amaia Castro
|
3009706b0d
|
Don’t allow comments on questions for unverified users and when the phase is closed
|
2017-02-08 18:19:10 +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 |
|