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 |
|
Amaia Castro
|
174fe5ee04
|
Don’t scroll and show comments when there isn’t an anchor in the url
|
2017-01-10 18:59:18 +01:00 |
|
Amaia Castro
|
1966c5b8fd
|
Use mouse over event in spec
|
2017-01-10 18:30:30 +01:00 |
|
Amaia Castro
|
87a548a298
|
Adjust panel widths to maintain the same width for the center text
|
2017-01-10 18:24:55 +01:00 |
|
Amaia Castro
|
f3daf2aca2
|
Show comments box when scrolling to annotation
|
2017-01-10 18:24:55 +01:00 |
|
Amaia Castro
|
329b288c01
|
Try to fix poltergeist error in spec
|
2017-01-10 17:56:35 +01:00 |
|
Amaia Castro
|
4f539b374f
|
View comments for draft text
|
2017-01-10 17:25:02 +01:00 |
|
Raimond Garcia
|
ccdaca8d93
|
Merge pull request #1339 from consul/comments_on_investments
Comments on investments
|
2017-01-10 14:58:54 +01:00 |
|
Juanjo Bazán
|
76d818dd1b
|
adds Budget::Investment comments specs
|
2017-01-10 14:31:28 +01:00 |
|
Juanjo Bazán
|
b71bcdd4b5
|
adds permissions to comment Investments as admin/moderator
|
2017-01-10 14:31:02 +01:00 |
|
Juanjo Bazán
|
ad435040bd
|
adds helper to fix links to commentable
|
2017-01-10 13:54:50 +01:00 |
|
Juanjo Bazán
|
f102f9f753
|
adds Budget::Investment to valid commentable types
|
2017-01-10 13:30:30 +01:00 |
|
Amaia Castro
|
7d8c3bd39c
|
Merge pull request #55 from medialab-prado/22-draft-version-comments-page
Legislation annotations/comments page
|
2017-01-10 13:13:09 +01:00 |
|
Juanjo Bazán
|
205b988f49
|
changes copy
|
2017-01-10 13:10:39 +01:00 |
|
Juanma
|
fcebfe4440
|
Fixes specs.
|
2017-01-10 12:34:02 +01:00 |
|
Alberto Garcia Cabeza
|
508de35320
|
polishes forms styles on devise views
|
2017-01-09 19:10:15 +01:00 |
|
Alberto Garcia Cabeza
|
ea70e0a5db
|
removes duplicated i18n keys
|
2017-01-09 18:49:45 +01:00 |
|
Alberto Garcia Cabeza
|
201a222cd3
|
improves styles for omniauth buttons
|
2017-01-09 18:49:29 +01:00 |
|
Juanjo Bazán
|
a5338a4455
|
removes problematic html_safe link from flash notice
No need for it now that investments are public
|
2017-01-09 18:16:59 +01:00 |
|
Alberto Garcia Cabeza
|
42d147a462
|
changes general styles for devise layout
|
2017-01-09 18:07:04 +01:00 |
|
Raimond Garcia
|
e60a56ea8f
|
Merge pull request #1335 from consul/under_age_setting
Minimum age setting
|
2017-01-09 17:46:44 +01:00 |
|
Alberto Garcia Cabeza
|
428c539684
|
fixes lineheight on official labels
|
2017-01-09 17:16:17 +01:00 |
|
Alberto Garcia Cabeza
|
2a3cbee96a
|
Merge branch 'budgets' of github.com:consul/consul into budgets
|
2017-01-09 17:10:46 +01:00 |
|
Alberto Garcia Cabeza
|
e6cc09a460
|
adds budget icon on investment show when no aside
|
2017-01-09 17:10:36 +01:00 |
|
Alberto Garcia Cabeza
|
f9c4649fd1
|
adds active class on subnavigation for budgets investments
|
2017-01-09 17:09:40 +01:00 |
|