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
|
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
|
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 |
|
Alberto Garcia Cabeza
|
f503c492f3
|
improves styles for budgets investments ballot and votes
|
2017-01-05 17:43:57 +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
|
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 |
|
kikito
|
635de83f86
|
prints the right value in budgets table
|
2017-01-04 18:48:01 +01:00 |
|
kikito
|
0835a7aba6
|
fixes valuation subtitle in budget investments index
|
2017-01-04 18:24:15 +01:00 |
|
kikito
|
cc00af31b9
|
Merge branch 'budgets-admin-views' into budgets-gaspar
|
2017-01-04 17:57:46 +01:00 |
|
Alberto Garcia Cabeza
|
fa7d6c18fd
|
fixes back links on valuation budgets
|
2017-01-04 17:33:59 +01:00 |
|
Alberto Garcia Cabeza
|
74a361690d
|
improves styles for valuation budgets
|
2017-01-04 17:33:09 +01:00 |
|
kikito
|
8aa982725e
|
Renames "Vote" to "Give support" during the support phase
|
2017-01-04 17:10:56 +01:00 |
|
Alberto Garcia Cabeza
|
02359c8e2a
|
improves styles for admin budgets edit
|
2017-01-04 17:04:37 +01:00 |
|
Alberto Garcia Cabeza
|
46d96e5a18
|
improves styles for admin budgets show
|
2017-01-04 17:02:27 +01:00 |
|
kikito
|
9c66fa0dc8
|
removes filter from valuation index page
|
2017-01-04 16:31:16 +01:00 |
|
Alberto Garcia Cabeza
|
e1367d4463
|
improves table of admin budgets index
|
2017-01-04 13:52:04 +01:00 |
|
kikito
|
0f174df5fe
|
Removes geozones from budget heading views and specs
|
2017-01-04 12:46:11 +01:00 |
|
kikito
|
2c343788d5
|
Fixes typo
|
2017-01-03 18:11:59 +01:00 |
|
kikito
|
5ac2d9ccc9
|
started working on tags for budget investments. Error in investments/show because paths are hard
|
2017-01-03 17:13:28 +01:00 |
|
Fernando Blat
|
04a3a4177d
|
Merge branch 'master' into 1315-manage-offices_url-as-setting
|
2017-01-03 08:57:02 +01:00 |
|
Fernando Blat
|
76bc1a7934
|
Use settings helper
|
2017-01-03 08:55:17 +01:00 |
|
kikito
|
68d598a43d
|
Merge branch 'master' into budgets
|
2017-01-02 12:10:23 +01:00 |
|
kikito
|
9effcc4041
|
i18n
|
2017-01-01 15:04:06 +01:00 |
|
kikito
|
9e4b2fda89
|
Adds phases to form
|
2017-01-01 15:03:58 +01:00 |
|
Alberto Garcia Cabeza
|
d8b4af5add
|
adds meta description and keywords
|
2016-12-30 17:17:46 +01:00 |
|
Alberto Garcia Cabeza
|
73e3ea3560
|
fixes specs
|
2016-12-29 19:16:20 +01:00 |
|