kikito
|
e935629fdb
|
i18n
|
2017-01-24 19:01:28 +01:00 |
|
kikito
|
a4585b00f2
|
Merge branch 'polls' into polls-geozones
|
2017-01-24 18:26:23 +01:00 |
|
kikito
|
15b531f068
|
Fixes failing specs
|
2017-01-24 18:10:41 +01:00 |
|
kikito
|
6ed73f34b6
|
Adds activerecord translations
|
2017-01-24 18:10:30 +01:00 |
|
kikito
|
ddf8d5f811
|
Removes answerable/non_answerable questions in polls
Now they are either all answerable or non-answerable, so it is not
worth it to make the distinction in code
|
2017-01-24 18:10:13 +01:00 |
|
kikito
|
6711063c7d
|
Moves geozones from question to poll in user show views
|
2017-01-24 18:09:27 +01:00 |
|
kikito
|
ab63c18d01
|
Moves geozones from questions to polls in admin show views
|
2017-01-24 18:08:48 +01:00 |
|
kikito
|
176a190149
|
Moves geozones from questions to polls in admin forms
|
2017-01-24 18:08:15 +01:00 |
|
kikito
|
65b0d27995
|
Moves geozones from questions to polls in admin controllers
|
2017-01-24 18:06:41 +01:00 |
|
kikito
|
86b895a7af
|
Adds checkbox toggle js library
|
2017-01-24 17:51:18 +01:00 |
|
Juanjo Bazán
|
8bd74d2a20
|
fixes specs
namespace method defined in AdminHelper now returns
X/Y instead of X::Y
|
2017-01-24 13:07:49 +01:00 |
|
Juanjo Bazán
|
467ca1ba68
|
Merge branch 'master' into polls
|
2017-01-24 12:08:59 +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 |
|
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 |
|