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 |
|
rgarcia
|
864c703ac4
|
Merge branch 'budgets' into budgets-tags
|
2017-01-06 18:28:52 +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
|
5f108944a8
|
final attempt at fixing travis
|
2017-01-05 12:49:53 +01:00 |
|
kikito
|
5eec8c7da2
|
attempts to fix travis again
|
2017-01-05 12:32:36 +01:00 |
|
kikito
|
2a792a5499
|
attempts to fix failing spec in travis
|
2017-01-05 12:05:40 +01:00 |
|
kikito
|
9e2afeb503
|
removes deprecated spec (valuators are not shown in valuation table)
|
2017-01-05 11:26:46 +01:00 |
|
rgarcia
|
dde1d34172
|
fixes conflicts with master
|
2017-01-05 01:56:35 +01:00 |
|
rgarcia
|
517483f244
|
fixes typo
|
2017-01-05 01:24:25 +01:00 |
|
Juanjo Bazán
|
91da171f54
|
Merge pull request #1326 from consul/budgets-views
budgets views
|
2017-01-04 21:03:33 +01:00 |
|
Alberto Garcia Cabeza
|
a42c1387cf
|
fixes specs
|
2017-01-04 19:38:49 +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 |
|
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
|
32c11c0981
|
removes unused i18n keys
|
2017-01-04 17:36:03 +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
|
e9acf295b8
|
removes filter specs after removing filtering from valuation
|
2017-01-04 17:00:56 +01:00 |
|
kikito
|
9c66fa0dc8
|
removes filter from valuation index page
|
2017-01-04 16:31:16 +01:00 |
|
kikito
|
4ceeb68a90
|
changes abilities extending valuation period
|
2017-01-04 15:59:36 +01:00 |
|
Juanjo Bazán
|
6e5492de22
|
Merge pull request #1323 from ferblape/1322-fix-initializer
Don't fetch setting in dev mode
|
2017-01-04 14:50:01 +01:00 |
|
kikito
|
b289e21992
|
Refactors valid_heading
|
2017-01-04 13:56:54 +01:00 |
|
kikito
|
f5dcb51d37
|
Adds valid_heading validation to budget line. Renames validation methods.
|
2017-01-04 13:56:42 +01:00 |
|
kikito
|
08586d521b
|
Refactors heading.budget . adds heading.budget_id
|
2017-01-04 13:54:07 +01:00 |
|
Alberto Garcia Cabeza
|
e1367d4463
|
improves table of admin budgets index
|
2017-01-04 13:52:04 +01:00 |
|
Fernando Blat
|
8350143496
|
Don't fetch setting if table doesn't exist
|
2017-01-04 13:37:55 +01:00 |
|
kikito
|
0f174df5fe
|
Removes geozones from budget heading views and specs
|
2017-01-04 12:46:11 +01:00 |
|
kikito
|
52d182f099
|
Removes geozone from budget heading
|
2017-01-03 18:51:21 +01:00 |
|
kikito
|
2c343788d5
|
Fixes typo
|
2017-01-03 18:11:59 +01:00 |
|
kikito
|
18bd44d91f
|
do not use html in generation of unfeasibility reason
|
2017-01-03 18:00:35 +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 |
|
Enrique García
|
465a93f49c
|
Merge pull request #1318 from ferblape/1315-manage-offices_url-as-setting
Manage offices url as a setting
|
2017-01-03 13:27:52 +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 |
|
Juanjo Bazán
|
1bdfacd683
|
Merge pull request #1321 from consul/budgets-melchor
Budgets melchor
|
2017-01-02 11:50:49 +01:00 |
|
Enrique García
|
30d89be2d8
|
Merge pull request #1320 from consul/meta-tags
Meta description and keywords tags
|
2017-01-02 11:45:58 +01:00 |
|
kikito
|
51f7239d07
|
i18n
|
2017-01-02 10:52:59 +01:00 |
|
kikito
|
98e9e8de0f
|
Fixes errors in specs related to changes in budget phases
|
2017-01-02 10:37:37 +01:00 |
|