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
|
819c9efcc3
|
Fix and complete feature specs
|
2017-01-14 17:19:27 +01:00 |
|
Fernando Blat
|
f1be212eeb
|
Fix and complete controller specs
|
2017-01-14 16:56:55 +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
|
755ddab2cb
|
Amend translations
|
2017-01-14 16:42:59 +01:00 |
|
Fernando Blat
|
72ff1de2ab
|
CSS fix
|
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 |
|
Fernando Blat
|
4fe656bdd4
|
Merge pull request #61 from medialab-prado/50-draft-final-version
Drafts final version
|
2017-01-14 16:35:15 +01:00 |
|
Amaia Castro
|
49f4bf5bc5
|
Destroy object when their parent object is destroyed
|
2017-01-13 19:34:17 +01:00 |
|
Amaia Castro
|
49e66a431c
|
Check phase dates and that draft version is not final before creating annotations
|
2017-01-13 19:11:05 +01:00 |
|
Martín González
|
eadf933c22
|
Change debate questions class to avoid colliding with other CSS
|
2017-01-13 16:42:59 +01:00 |
|
Martín González
|
db8084ddb8
|
Fix merge
|
2017-01-13 16:21:38 +01:00 |
|
Martín González
|
5a5fed975a
|
Push changes
|
2017-01-13 16:19:57 +01:00 |
|
Martín González
|
02d49266e0
|
Increase margin on questions to fix a cosmetic issue
|
2017-01-13 16:14:44 +01:00 |
|
Martín González
|
3f956294ed
|
Fix legislation question comments markup
|
2017-01-13 15:51:12 +01:00 |
|
Martín González
|
1cf074a297
|
Fix identation and markup issue on the legislation question page
|
2017-01-13 15:41:23 +01:00 |
|
Martín González
|
046bcbfb0f
|
Fix small header toggle
|
2017-01-12 12:48:14 +01:00 |
|
Martín González
|
495c7e8099
|
Key dates SVG fix
|
2017-01-12 12:16:45 +01:00 |
|
Martín González
|
a0011b7c5c
|
More css fixes
|
2017-01-12 11:55:12 +01:00 |
|
Martín González
|
be024f0fe1
|
Push legislation comments style fixes
|
2017-01-12 11:19:30 +01:00 |
|
Martín González
|
203bc740ac
|
Adjust home and process index styles
|
2017-01-12 10:54:39 +01:00 |
|
Amaia Castro
|
a56898fed7
|
Fix version chooser for annotations page
|
2017-01-11 23:11:11 +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 |
|
Fernando Blat
|
f7aca52706
|
Merge pull request #58 from medialab-prado/refactor-legislation-comments
Refactor legislation comments partials
|
2017-01-11 17:03:11 +01:00 |
|
Amaia Castro
|
f974883556
|
Refactor legislation comments partials
|
2017-01-11 16:27:22 +01:00 |
|
Fernando Blat
|
58226d38cf
|
Merge pull request #57 from medialab-prado/refactor-admin-namespace-helper
Revert change in admin namespace helper and redefine it in the controller
|
2017-01-11 16:10:34 +01:00 |
|
Amaia Castro
|
4a5276f089
|
Revert change in admin namespace helper and redefine it in the controller
|
2017-01-11 15:43:46 +01:00 |
|
Raimond Garcia
|
6952e7eac6
|
Merge pull request #1343 from consul/budgets-back-links
Budgets back links
|
2017-01-11 13:17:38 +01:00 |
|
Juanjo Bazán
|
bdb55805a1
|
uses back_link_helper all around
|
2017-01-11 13:03:12 +01:00 |
|
Juanjo Bazán
|
b4b8e4f787
|
fixes investment back link to avoid pointing to /new action
|
2017-01-11 13:02:46 +01:00 |
|
Juanjo Bazán
|
dd268c18d7
|
adds back_link_to helper
|
2017-01-11 13:01:49 +01:00 |
|
Juanjo Bazán
|
7ef481ef0c
|
Merge pull request #1337 from consul/devise-views
Devise views
|
2017-01-11 12:38:41 +01:00 |
|
Raimond Garcia
|
f2dc822bfa
|
Merge pull request #1334 from consul/budgets
WIP Budgets
|
2017-01-10 22:43:27 +01:00 |
|
Juanjo Bazán
|
7ff27997a7
|
adds url for Budget::Investment to mailer_helper
|
2017-01-10 22:24:00 +01:00 |
|
Juanjo Bazán
|
05ca715dee
|
Merge pull request #1341 from consul/budgets-settings
Sets spending proposal's settings to nil
|
2017-01-10 21:47:20 +01:00 |
|
Raimond Garcia
|
398093884c
|
Merge pull request #1342 from consul/fix_commentables
Fix commentables
|
2017-01-10 21:40:11 +01:00 |
|
rgarcia
|
53c5ea7e90
|
fixes specs
|
2017-01-10 21:30:38 +01:00 |
|
Juanjo Bazán
|
9f55b7bc84
|
removes link from 'My activity' page if feature is disabled
|
2017-01-10 21:28:39 +01:00 |
|
Juanjo Bazán
|
053a3e7b41
|
makes user page to show only active feature comments
|
2017-01-10 21:28:04 +01:00 |
|
Juanjo Bazán
|
7a448b6890
|
adds BudgetInvestment case to users_helpers
|
2017-01-10 20:58:01 +01:00 |
|
rgarcia
|
4d5b885b7e
|
sets spending proposal's settings to nil
|
2017-01-10 20:13:48 +01:00 |
|
Juanjo Bazán
|
dc4d965414
|
Merge pull request #1340 from consul/devise-mailer
Updates Devise sender email
|
2017-01-10 20:07:42 +01:00 |
|
rgarcia
|
0049b6154c
|
testing devise mailer
|
2017-01-10 20:04:01 +01:00 |
|
Fernando Blat
|
96f0f766ab
|
Merge pull request #56 from medialab-prado/18-view-legislation-comments
View comments
|
2017-01-10 19:58:02 +01:00 |
|