Commit Graph

3780 Commits

Author SHA1 Message Date
pablogfb
9e22feb83a fixes tags links through searches 2016-03-10 16:38:56 +01:00
Juanjo Bazán
ffc00671f1 Merge pull request #983 from andion/patch-5
Check if spending_proposals is enabled to show 'valuation' link
2016-03-10 13:04:04 +01:00
Lucas Andión Montáns
fa1bbd2ea2 Check if spending_proposals is enabled to show 'valuation' link
The link was broken when Spending Proposals is disabled from administration.

The /valuation link points to `Valuation::SpendingProposalsController` which has a `feature_flag :spending_proposals` flag.
2016-03-10 12:48:06 +01:00
Juanjo Bazán
70627148fe rails up to v4.2.6 🎉 2016-03-09 14:40:57 +01:00
Juanjo Bazán
beddbd6e87 updates dependencies 2016-03-09 13:44:14 +01:00
Juanjo Bazán
3b3031518a Revert "updates dependencies"
This reverts commit 90a9220927.

Some dependency causes an error on rake db:setup
2016-03-09 13:36:37 +01:00
Juanjo Bazán
90a9220927 updates dependencies 2016-03-09 13:23:54 +01:00
Raimond Garcia
108f092114 Merge pull request #980 from consul/undefined-feasibility
adds radio to mark feasibility as undefined (nil)
2016-03-09 12:47:10 +01:00
Juanjo Bazán
32c155999e adds radio to mark feasibility as undefined (nil) 2016-03-09 12:37:22 +01:00
Juanjo Bazán
e3b547f5d5 Merge pull request #979 from consul/featured-proposals
Improves styles for featured proposals
2016-03-09 12:19:07 +01:00
Alberto Garcia Cabeza
5fa592a734 Improves styles for featured proposals 2016-03-09 11:54:49 +01:00
Juanjo Bazán
65b01ae344 Merge pull request #978 from consul/info-style-fix
fixes css
2016-03-08 22:07:54 +01:00
kikito
e89885000a fixes css 2016-03-08 21:58:06 +01:00
Enrique García
f6aaec9c49 Merge pull request #976 from consul/valuation-changes
Valuation changes
2016-03-08 20:57:21 +01:00
Juanjo Bazán
7f97b9ef2c uses _html i18n keys for html_safe values 2016-03-08 20:50:36 +01:00
Juanjo Bazán
e732f88f46 adds info on public visibility for dossier fields 2016-03-08 20:32:23 +01:00
Juanjo Bazán
1e6dc18fbf adds link to edit dossier for admins 2016-03-08 20:31:49 +01:00
Juanjo Bazán
7f5e79da6b improves spending_proposal back link 2016-03-08 20:10:19 +01:00
Juanjo Bazán
c4532bf339 updates i18n for dossier form 2016-03-08 20:07:00 +01:00
Juanjo Bazán
7d31528239 moves feasibility fields to top 2016-03-08 20:07:00 +01:00
Juanjo Bazán
a37e6afa7d sets max limit for price form fields 2016-03-08 20:07:00 +01:00
Juanjo Bazán
0a0eb00f97 changes price fields type to bigint 2016-03-08 20:07:00 +01:00
Juanjo Bazán
f13b4cfc6c Merge pull request #974 from consul/valuator-tags
Valuator tags
2016-03-08 20:04:18 +01:00
kikito
8db6b3fa69 fixes specs 2016-03-08 17:38:52 +01:00
kikito
5151e868f5 Merge branch 'master' into valuator-tags 2016-03-08 17:19:15 +01:00
Enrique García
d56aba3695 Merge pull request #975 from consul/price-validations
adds validation for price fields
2016-03-08 17:18:41 +01:00
Alberto Garcia Cabeza
dee52c279f Improves styles 2016-03-08 17:13:08 +01:00
rgarcia
7cf66f2b5d displays one valuator per line 2016-03-08 16:30:29 +01:00
rgarcia
0eca4d5d48 fixes specs 2016-03-08 16:26:02 +01:00
Juanjo Bazán
dd65f89597 adds validation for price fields 2016-03-08 16:24:34 +01:00
kikito
3b0cec5587 displays tags as strings instead of links in admin/s_p/show 2016-03-08 16:21:11 +01:00
rgarcia
a646d5ae6b removes duplication between admin and valuators spending proposals 2016-03-08 16:07:24 +01:00
rgarcia
37c1c31bfe refactors Admin#name_and_email 2016-03-08 15:45:58 +01:00
rgarcia
13fea09613 adds indentation to spending proposals show 2016-03-08 15:43:13 +01:00
kikito
2ac12ef4a9 makes admin/spending_proposal/edit visually pleasant 2016-03-08 15:26:13 +01:00
kikito
35b296cf0e Refactor Valuator#name_and_email 2016-03-08 15:26:13 +01:00
rgarcia
ffd09bc490 fixes specs 2016-03-08 15:23:01 +01:00
Alberto García Cabeza
828ee2272a Merge pull request #973 from consul/die-ie
adds js for input type=number to IE<9
2016-03-08 15:08:57 +01:00
rgarcia
fb9d72a401 organizes scenarios into contexts for spending proposals 2016-03-08 14:46:29 +01:00
rgarcia
4e4f3ea922 refactors scopes for spending proposals 2016-03-08 14:40:25 +01:00
Juanjo Bazán
15fc911bfb adds js for input type=number to IE<9 2016-03-08 14:32:54 +01:00
rgarcia
e586a1df58 fixes conflicts with master 2016-03-08 14:31:18 +01:00
rgarcia
dc3cd01f92 makes spending proposal specs more robust 2016-03-08 14:29:11 +01:00
rgarcia
0d8c3796fe updates edit button text for spending proposals 2016-03-08 14:28:51 +01:00
rgarcia
e1917123eb fixes specs 2016-03-08 14:28:31 +01:00
Juanjo Bazán
cfef0c42ed Merge pull request #972 from consul/accessibility
Accessibility
2016-03-08 14:23:48 +01:00
Raimond Garcia
ae0e366098 Merge pull request #971 from consul/valuation
Valuation interface
2016-03-08 14:16:08 +01:00
rgarcia
fb2505d1b0 adds name and email for valuators 2016-03-08 14:08:41 +01:00
Juanjo Bazán
2f4621ab09 adds helper for explanation fields 2016-03-08 14:01:16 +01:00
Alberto Garcia Cabeza
1722645e6b Updates specs 2016-03-08 14:00:07 +01:00