Commit Graph

2929 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
Juanjo Bazán
c3635f4182 adds taggables/s path helper 2017-01-18 18:17:02 +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
f6989bbb55 Merge pull request #1358 from consul/budget-unfeasibles
Budget unfeasibles
2017-01-17 13:43:48 +01:00
Juanjo Bazán
68fc922fda autolinks budget description 2017-01-17 13:07:07 +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
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
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
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
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
Juanjo Bazán
d17a07b096 Merge pull request #1347 from consul/budgets-vote-button
only displays vote button in selecting phase
2017-01-13 11:58:28 +01:00
Juanma
e418937d42 Add custom setting for foundation variables. 2017-01-13 11:49:23 +01:00
rgarcia
470fe41585 only displays vote button in selecting phase 2017-01-13 11:13:01 +01:00
Juanjo Bazán
a771408f4b Merge pull request #1336 from aspgems/bug_filter_advance_search
Fixes values of official_level options for selects in search filters.
2017-01-13 11:00:00 +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
dd268c18d7 adds back_link_to helper 2017-01-11 13:01:49 +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
7ff27997a7 adds url for Budget::Investment to mailer_helper 2017-01-10 22:24:00 +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
053a3e7b41 makes user page to show only active feature comments 2017-01-10 21:28:04 +01:00
Juanjo Bazán
7a448b6890 adds BudgetInvestment case to users_helpers 2017-01-10 20:58:01 +01:00
Juanjo Bazán
b71bcdd4b5 adds permissions to comment Investments as admin/moderator 2017-01-10 14:31:02 +01:00
Juanjo Bazán
ad435040bd adds helper to fix links to commentable 2017-01-10 13:54:50 +01:00
Juanjo Bazán
f102f9f753 adds Budget::Investment to valid commentable types 2017-01-10 13:30:30 +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
Juanjo Bazán
a5338a4455 removes problematic html_safe link from flash notice
No need for it now that investments are public
2017-01-09 18:16:59 +01:00