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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
kikito
|
3c9e08b06f
|
Adds organization_name attribute to budget investments
|
2017-01-06 18:43:55 +01:00 |
|
rgarcia
|
864c703ac4
|
Merge branch 'budgets' into budgets-tags
|
2017-01-06 18:28:52 +01:00 |
|
Alberto Garcia Cabeza
|
54691fe7f4
|
improves styles for budgets ballot
|
2017-01-05 20:37:34 +01:00 |
|
kikito
|
b36bb7bb97
|
fixes permission error when entering my ballot
|
2017-01-05 18:25:00 +01:00 |
|
Alberto Garcia Cabeza
|
f4f0980fe9
|
Merge branch 'budgets-baltasar' of github.com:consul/consul into budgets-baltasar
|
2017-01-05 17:50:28 +01:00 |
|
Alberto Garcia Cabeza
|
f503c492f3
|
improves styles for budgets investments ballot and votes
|
2017-01-05 17:43:57 +01:00 |
|
kikito
|
248755a801
|
Modifies the investment orders shown by phase
|
2017-01-05 17:38:36 +01:00 |
|
Alberto Garcia Cabeza
|
0171538a2d
|
updates i18n
|
2017-01-05 17:23:50 +01:00 |
|
Alberto Garcia Cabeza
|
e0d3752f72
|
improves styles of budgets investments views
|
2017-01-05 17:23:30 +01:00 |
|
kikito
|
7eba0fee50
|
Deactivates /ballot view when not in the balloting phase
|
2017-01-05 15:18:16 +01:00 |
|
kikito
|
28e6a10382
|
Hides balloting controls when not in the balloting phase
|
2017-01-05 15:17:49 +01:00 |
|
Raimond Garcia
|
e2cb390d43
|
Merge pull request #1328 from consul/budgets-polish-views
budgets views
|
2017-01-05 13:48:55 +01:00 |
|
rgarcia
|
c3380d18fa
|
fixes conflicts with budgets
|
2017-01-05 13:14:09 +01:00 |
|
Juanjo Bazán
|
a5b4a79f62
|
Merge pull request #1325 from consul/budgets-gaspar
Budgets - several fixes
|
2017-01-05 13:06:48 +01:00 |
|
Alberto Garcia Cabeza
|
e8dafde39f
|
adds message for not logged users
|
2017-01-05 13:03:11 +01:00 |
|
Alberto Garcia Cabeza
|
01ba8f7ea9
|
improves styles on budgets groups show
|
2017-01-05 12:56:46 +01:00 |
|
kikito
|
5eec8c7da2
|
attempts to fix travis again
|
2017-01-05 12:32:36 +01:00 |
|
rgarcia
|
dde1d34172
|
fixes conflicts with master
|
2017-01-05 01:56:35 +01:00 |
|
Alberto Garcia Cabeza
|
8b1e8fed5b
|
improves styles for budgets views
|
2017-01-04 19:18:41 +01:00 |
|
Alberto Garcia Cabeza
|
9c2857e75b
|
changes budget color
|
2017-01-04 19:17:58 +01:00 |
|
Alberto Garcia Cabeza
|
ef1300abbc
|
removes unused scss
|
2017-01-04 19:17:51 +01:00 |
|
kikito
|
635de83f86
|
prints the right value in budgets table
|
2017-01-04 18:48:01 +01:00 |
|