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 |
|
Juanjo Bazán
|
238c01cecd
|
Merge pull request #1345 from aspgems/bug_compile_ckeditor_locales
Fixes bug. Compiles all locales for ckeditor.
|
2017-01-13 11:49:58 +01:00 |
|
Juanma
|
e418937d42
|
Add custom setting for foundation variables.
|
2017-01-13 11:49:23 +01:00 |
|
rgarcia
|
dbf8b86518
|
fixes specs
|
2017-01-13 11:37:06 +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 |
|
Juanma
|
119061bd4c
|
Fixes bug. Compiles all locales for ckeditor.
|
2017-01-13 09:40:33 +01:00 |
|
Juanma
|
68b2f6d9c4
|
Fixes specs.
|
2017-01-13 07:44:57 +01:00 |
|
Raimond Garcia
|
6952e7eac6
|
Merge pull request #1343 from consul/budgets-back-links
Budgets back links
|
2017-01-11 13:17:38 +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 |
|
Raimond Garcia
|
f2dc822bfa
|
Merge pull request #1334 from consul/budgets
WIP Budgets
|
2017-01-10 22:43:27 +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
|
05ca715dee
|
Merge pull request #1341 from consul/budgets-settings
Sets spending proposal's settings to nil
|
2017-01-10 21:47:20 +01:00 |
|
Raimond Garcia
|
398093884c
|
Merge pull request #1342 from consul/fix_commentables
Fix commentables
|
2017-01-10 21:40:11 +01:00 |
|
rgarcia
|
53c5ea7e90
|
fixes specs
|
2017-01-10 21:30:38 +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 |
|
rgarcia
|
4d5b885b7e
|
sets spending proposal's settings to nil
|
2017-01-10 20:13:48 +01:00 |
|
Juanjo Bazán
|
dc4d965414
|
Merge pull request #1340 from consul/devise-mailer
Updates Devise sender email
|
2017-01-10 20:07:42 +01:00 |
|
rgarcia
|
0049b6154c
|
testing devise mailer
|
2017-01-10 20:04:01 +01:00 |
|
Raimond Garcia
|
ccdaca8d93
|
Merge pull request #1339 from consul/comments_on_investments
Comments on investments
|
2017-01-10 14:58:54 +01:00 |
|
Juanjo Bazán
|
76d818dd1b
|
adds Budget::Investment comments specs
|
2017-01-10 14:31:28 +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 |
|
Juanjo Bazán
|
205b988f49
|
changes copy
|
2017-01-10 13:10:39 +01:00 |
|
Juanma
|
fcebfe4440
|
Fixes specs.
|
2017-01-10 12:34:02 +01:00 |
|
Alberto Garcia Cabeza
|
508de35320
|
polishes forms styles on devise views
|
2017-01-09 19:10:15 +01:00 |
|
Alberto Garcia Cabeza
|
ea70e0a5db
|
removes duplicated i18n keys
|
2017-01-09 18:49:45 +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 |
|
Alberto Garcia Cabeza
|
42d147a462
|
changes general styles for devise layout
|
2017-01-09 18:07:04 +01:00 |
|
Raimond Garcia
|
e60a56ea8f
|
Merge pull request #1335 from consul/under_age_setting
Minimum age setting
|
2017-01-09 17:46:44 +01:00 |
|
Alberto Garcia Cabeza
|
428c539684
|
fixes lineheight on official labels
|
2017-01-09 17:16:17 +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 |
|
Juanma
|
5fe38f9720
|
Removes translation texts.
|
2017-01-09 16:27:30 +01:00 |
|
Juanma
|
ff8cc2d7bd
|
Fixes values of official_level options for selects in search filters.
|
2017-01-09 16:07:59 +01:00 |
|
Juanjo Bazán
|
5a0d28f9f0
|
updates verification spec
|
2017-01-09 16:05:44 +01:00 |
|
Juanjo Bazán
|
be0cbb9ea1
|
adds setting to dev_seeds values
|
2017-01-09 16:05:33 +01:00 |
|
Juanjo Bazán
|
e2118f701b
|
removes hardcoded age, favours setting
|
2017-01-09 16:05:27 +01:00 |
|
Juanjo Bazán
|
220e7397e1
|
adds Setting: minimum age to participate
|
2017-01-09 16:04:49 +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 |
|