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
|
b2b9954e6d
|
allows user to support only in one heading per group
|
2017-01-13 15:24:57 +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 |
|
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 |
|
Amaia Castro
|
a2a61341fe
|
Merge branch 'master' into legislation-module-stable
|
2017-01-11 22:54:41 +01:00 |
|
Amaia Castro
|
f974883556
|
Refactor legislation comments partials
|
2017-01-11 16:27:22 +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
|
7a448b6890
|
adds BudgetInvestment case to users_helpers
|
2017-01-10 20:58:01 +01:00 |
|
rgarcia
|
0049b6154c
|
testing devise mailer
|
2017-01-10 20:04:01 +01:00 |
|
Amaia Castro
|
4f539b374f
|
View comments for draft text
|
2017-01-10 17:25:02 +01:00 |
|
Juanjo Bazán
|
205b988f49
|
changes copy
|
2017-01-10 13:10:39 +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 |
|
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
|
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 |
|
Amaia Castro
|
f43f13e826
|
Create first comment automatically from the annotation
|
2017-01-09 17:03:00 +01:00 |
|
Juanma
|
5fe38f9720
|
Removes translation texts.
|
2017-01-09 16:27:30 +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 |
|
rgarcia
|
19a79801d3
|
fixes i18n specs
|
2017-01-09 13:54:29 +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 |
|
Amaia Castro
|
b8f034d896
|
Legislation annotations/comments page
|
2017-01-09 09:29:15 +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
|
e1926368cd
|
proyecto -> propuesta
|
2017-01-06 19:57:09 +01:00 |
|
kikito
|
b7a0aa3b57
|
Fixes i18n errors now that they are detected by i18n-tasks
|
2017-01-06 19:55:23 +01:00 |
|
kikito
|
9d80b56f84
|
changes i18n-tasks.yml so that budgets.* isn't ignored
|
2017-01-06 19:55:06 +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
|
f503c492f3
|
improves styles for budgets investments ballot and votes
|
2017-01-05 17:43:57 +01:00 |
|
Fernando Blat
|
c50e8cbbdf
|
Merge pull request #54 from medialab-prado/fix-small-issues
Fix small issues
|
2017-01-05 17:34:40 +01:00 |
|
Alberto Garcia Cabeza
|
0171538a2d
|
updates i18n
|
2017-01-05 17:23:50 +01:00 |
|
Fernando Blat
|
1fbb10ff34
|
Include link to resource in the flash message
|
2017-01-05 17:03:08 +01:00 |
|
Fernando Blat
|
dc3a917877
|
Add missing translation
|
2017-01-05 16:46:53 +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 |
|
Fernando Blat
|
8682e426ac
|
Show warning if phase is not open
|
2017-01-05 13:08:06 +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 |
|
Alberto Garcia Cabeza
|
e8dafde39f
|
adds message for not logged users
|
2017-01-05 13:03:11 +01:00 |
|
Fernando Blat
|
ed714f7c7d
|
Add flash messages. Redirect to edit action after update
|
2017-01-05 12:56:55 +01:00 |
|
Fernando Blat
|
0c83b87b7b
|
Ignore dynamic i18n keys
|
2017-01-05 12:36:28 +01:00 |
|