Commit Graph

2824 Commits

Author SHA1 Message Date
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
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
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
Amaia Castro
f974883556 Refactor legislation comments partials 2017-01-11 16:27:22 +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
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
Juanjo Bazán
7ff27997a7 adds url for Budget::Investment to mailer_helper 2017-01-10 22:24:00 +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
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
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
4f539b374f View comments for draft text 2017-01-10 17:25:02 +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
Alberto Garcia Cabeza
508de35320 polishes forms styles on devise views 2017-01-09 19:10:15 +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
Amaia Castro
f43f13e826 Create first comment automatically from the annotation 2017-01-09 17:03:00 +01:00
Juanjo Bazán
e2118f701b removes hardcoded age, favours setting 2017-01-09 16:05:27 +01:00
Juanjo Bazán
220e7397e1 adds Setting: minimum age to participate 2017-01-09 16:04:49 +01:00
Juanjo Bazán
c5278bfb3b Merge pull request #1331 from consul/budgets-tags
Adds tags to investments
2017-01-09 14:35:43 +01:00
rgarcia
cc891b4f30 fixes specs 2017-01-09 14:10:07 +01:00
rgarcia
19a79801d3 fixes i18n specs 2017-01-09 13:54:29 +01:00
Alberto Garcia Cabeza
5fa6131e28 fixes management layout 2017-01-09 13:37:47 +01:00
rgarcia
f2d23b56e0 fixes conflicts with budgets 2017-01-09 13:33:01 +01:00
rgarcia
b84ec0857c fixes specs 2017-01-09 11:02:15 +01:00
Amaia Castro
b8f034d896 Legislation annotations/comments page 2017-01-09 09:29:15 +01:00
Alberto Garcia Cabeza
8722699cd8 fixes typos and spec for budgets investments 2017-01-08 22:17:14 +01:00
rgarcia
b4cd1ea9d7 merges with budgets 2017-01-08 19:58:53 +01:00
rgarcia
be10972406 fixes management specs 2017-01-08 13:39:01 +01:00
rgarcia
3ba57bbab2 adds valuator tags 2017-01-08 13:24:05 +01:00
rgarcia
fd28f6c2b3 adds tags to investment 2017-01-08 11:37:02 +01:00
kikito
b7a0aa3b57 Fixes i18n errors now that they are detected by i18n-tasks 2017-01-06 19:55:23 +01:00
kikito
9669767c8a Removes unnecessary helper (all investments have a header now) 2017-01-06 18:47:16 +01:00