Commit Graph

4848 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
d30c97c0c2 fixes } scss 2017-01-19 18:04:04 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
rgarcia
c918c9e081 adds specs for many tags in a budget investment 2017-01-19 10:03:38 +01:00
Raimond Garcia
fce5eb9803 Merge pull request #1361 from consul/taggable_path
adds taggables/s path helper
2017-01-18 18:50:30 +01:00
Juanjo Bazán
c3635f4182 adds taggables/s path helper 2017-01-18 18:17:02 +01:00
Juanjo Bazán
6cb028a11e Merge pull request #1360 from consul/budgets-styles
budgets styles
2017-01-17 19:24:54 +01:00
Alberto Garcia Cabeza
750909916b improves layout on sign in and sign up views 2017-01-17 19:13:31 +01:00
Alberto Garcia Cabeza
72ab4f5923 fixes styles on callout warning 2017-01-17 19:09:46 +01:00
Alberto Garcia Cabeza
86360a8719 shows fixed bar only in correct heading on voting phase 2017-01-17 18:59:12 +01:00
Alberto Garcia Cabeza
c5c686ec74 adds progress bar styles 2017-01-17 18:58:32 +01:00
Alberto Garcia Cabeza
d890b0a98b adds fixed bar js 2017-01-17 18:58:13 +01:00
Alberto Garcia Cabeza
2aaf917510 adds different back link if headings count equal to 1 2017-01-17 18:16:50 +01:00
Juanjo Bazán
6c227547e2 updates travis script and matrix 2017-01-17 14:25:21 +01:00
Juanjo Bazán
9809ac6129 adds new knapsack spec report 2017-01-17 14:25:03 +01:00
Juanjo Bazán
6194b74a91 regenerates knapsack report in Travis 2017-01-17 14:00:36 +01:00
Juanjo Bazán
f6989bbb55 Merge pull request #1358 from consul/budget-unfeasibles
Budget unfeasibles
2017-01-17 13:43:48 +01:00
Juanjo Bazán
555cc4529b removes focus 2017-01-17 13:33:45 +01:00
Juanjo Bazán
68fc922fda autolinks budget description 2017-01-17 13:07:07 +01:00
rgarcia
dc2bfbdc97 fixes specs 2017-01-16 19:49:04 +01:00
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
Alberto
868ed78488 Merge pull request #1348 from aspgems/custom_settings_scss
Add custom setting for foundation variables.
2017-01-16 17:58:05 +01:00
rgarcia
5f7269a070 displays unfeasible budgets link from home 2017-01-16 03:09:08 +01:00
Alberto
0ef7afa82f Merge pull request #1357 from consul/budget-permissions
displays appropriate permission messages in accepting phase
2017-01-15 21:11:15 +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
Raimond Garcia
13985dfa45 Merge pull request #1355 from consul/budget-tags
Displays tag cloud in all phases
2017-01-15 18:49:20 +01:00
Alberto Garcia Cabeza
9741ee859a updates i18n and specs 2017-01-15 14:02:08 +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
289666bb4d loads tag cloud in balloting phase 2017-01-15 12:08:41 +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
Raimond Garcia
3038e841e0 Merge pull request #1353 from consul/verified-admin
verifies admin in dev seeds
2017-01-14 21:57:51 +01:00
Alberto Garcia Cabeza
e18751ce5c verifies admin in dev seeds 2017-01-14 18:14:32 +01:00
rgarcia
abd8cd2faf fixes translations 2017-01-14 17:13:59 +01:00
rgarcia
7aba8ef299 adds specs 2017-01-14 17:02:45 +01:00
rgarcia
79767b5f1d adds translations 2017-01-14 17:02:41 +01:00
rgarcia
68bf119c18 sends unfeasible budget investment 2017-01-14 17:02:33 +01:00
rgarcia
11a8086599 adds specs 2017-01-14 16:12:45 +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
Raimond Garcia
a67bf44f9e Merge pull request #1351 from consul/budget-vote-text
displays appropriate vote info depending on phase
2017-01-13 21:27:00 +01:00
rgarcia
6d71cd985c displays appropriate vote info depending on phase 2017-01-13 21:15:08 +01:00
Raimond Garcia
4c818bfcc4 Merge pull request #1349 from consul/budgets-vote-permissions
User permissions for selecting phase
2017-01-13 18:34:31 +01:00
rgarcia
17946b292b fixes specs 2017-01-13 16:37:39 +01:00
rgarcia
b2b9954e6d allows user to support only in one heading per group 2017-01-13 15:24:57 +01:00