Commit Graph

1626 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
56694debfd removes duplicated social buttons on investment show 2017-01-16 18:49:19 +01:00
Alberto Garcia Cabeza
45450d74ff improves styles for unfeasible investments 2017-01-16 18:45:42 +01:00
rgarcia
5f7269a070 displays unfeasible budgets link from home 2017-01-16 03:09:08 +01:00
rgarcia
fa9cb00c65 displays appropriate permission messages in accepting phase 2017-01-15 20:37:44 +01:00
Raimond Garcia
69c043a886 Merge pull request #1356 from consul/budget-emails
Budget emails
2017-01-15 19:15:39 +01:00
rgarcia
0f1a98da7d fixes conflicts with master 2017-01-15 19:04:12 +01:00
rgarcia
537de8c46c Merge branch 'master' into budget-emails 2017-01-15 18:58:20 +01:00
Alberto Garcia Cabeza
1de39edf92 adds styles and i18n for mailer budget investment created 2017-01-15 13:52:09 +01:00
Alberto Garcia Cabeza
61450cb48f adds social share buttons on investments show 2017-01-15 13:51:45 +01:00
rgarcia
938ba40306 loads categories in sidebar for balloting phase 2017-01-15 12:06:38 +01:00
rgarcia
42604e27b9 Displays tag cloud in all phases 2017-01-15 09:55:01 +01:00
rgarcia
68bf119c18 sends unfeasible budget investment 2017-01-14 17:02:33 +01:00
rgarcia
82322ee233 sends budget investment created email 2017-01-14 16:10:43 +01:00
Raimond Garcia
7f88100599 Merge pull request #1352 from consul/feasibility_link
Feasibility index
2017-01-14 12:36:26 +01:00
Juanjo Bazán
36140e0ce3 adds link to unfeasible investments to index page 2017-01-14 11:33:49 +01:00
rgarcia
6d71cd985c displays appropriate vote info depending on phase 2017-01-13 21:15:08 +01:00
rgarcia
b2b9954e6d allows user to support only in one heading per group 2017-01-13 15:24:57 +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
7ef481ef0c Merge pull request #1337 from consul/devise-views
Devise views
2017-01-11 12:38:41 +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
ad435040bd adds helper to fix links to commentable 2017-01-10 13:54:50 +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
Alberto Garcia Cabeza
42d147a462 changes general styles for devise layout 2017-01-09 18:07:04 +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
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