Commit Graph

6458 Commits

Author SHA1 Message Date
kikito
8dbc72c374 moves geozones from poll question to poll in dev_seeds 2017-01-20 18:58:19 +01:00
kikito
d024505960 moves geozones from poll question to poll in models 2017-01-20 18:58:03 +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
kikito
063c94822d Removes all_geozones from poll_questions table 2017-01-20 17:47:49 +01:00
kikito
d53c867ba4 Adds geozone_restricted to polls 2017-01-20 17:45:11 +01:00
kikito
67c287dc14 Migrates geozones from poll questions to polls 2017-01-20 16:50:03 +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
bd6514d4a4 Merge branch 'master' into polls 2017-01-20 11:34:12 +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
Alberto Garcia Cabeza
d30c97c0c2 fixes } scss 2017-01-19 18:04:04 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +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
Amaia Castro
536784ee04 Merge pull request #72 from medialab-prado/back-improvements
Back improvements
2017-01-19 10:27:12 +01:00
Martín González
4c5fde956f Add open and closing classes 2017-01-19 10:14:57 +01:00
Martín González
b447ba1fad Basic index styles 2017-01-19 10:14:57 +01:00
rgarcia
c918c9e081 adds specs for many tags in a budget investment 2017-01-19 10:03:38 +01:00
Raimond Garcia
fce5eb9803 Merge pull request #1361 from consul/taggable_path
adds taggables/s path helper
2017-01-18 18:50:30 +01:00
Juanjo Bazán
c3635f4182 adds taggables/s path helper 2017-01-18 18:17:02 +01:00
Amaia Castro
fcfb435adb Merge branch 'master' into legislation-module-stable 2017-01-18 17:35:15 +01:00
Amaia Castro
98ebdc733a Merge pull request #85 from medialab-prado/78-fixed-index
Make draft index fixed on scroll
2017-01-18 17:21:49 +01:00
Amaia Castro
c0a958b708 Remove subscription html 2017-01-18 17:02:18 +01:00
Amaia Castro
9c8102b9f3 Refactor path helpers for comments 2017-01-18 16:58:16 +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
Amaia Castro
d80d1f7afa Merge pull request #83 from medialab-prado/75-unify-font-size-header
Unify processes header type
2017-01-18 16:46:48 +01:00
Martín González
287b144bcf Make draft index fixed on scroll 2017-01-18 16:42:51 +01:00
Martín González
bf91f0731d Fix list alignment and markdown renderer quirk 2017-01-18 15:26:23 +01:00
Martín González
bf1a23bd53 Add styles for uls 2017-01-18 15:02:32 +01:00
Martín González
90e071c218 Unify processes header type 2017-01-18 14:56:09 +01:00
Amaia Castro
67a3162aa5 Merge pull request #82 from medialab-prado/76-key-dates-svg-margin
Full width key dates, fix SVG margin
2017-01-18 14:55:25 +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
076c5d2784 Use the full width key dates html where is possible, fix svg margin 2017-01-18 13:05:16 +01:00
Amaia Castro
4afb472054 Merge pull request #81 from medialab-prado/80-fix-small-header
Refactor header toggle and show additional info on the small header
2017-01-18 12:50:15 +01:00