Commit Graph

1228 Commits

Author SHA1 Message Date
Enrique García
548e67fbca Merge pull request #1482 from consul/signatures
Signature sheets for budget investments
2017-04-05 14:07:36 +02:00
Juanjo Bazán
ee07dd5784 adds missing i18n files and keys 2017-04-05 13:32:28 +02:00
Juanjo Bazán
83e2df7410 adds signature sheets for budget investments 2017-04-05 12:59:42 +02:00
Juanjo Bazán
f9a09c3d02 Merge pull request #1480 from consul/i18n-pages
Adds i18n to more info pages
2017-04-04 18:40:00 +02:00
Alberto Garcia Cabeza
d401633c26 adds i18n to more info pages 2017-04-04 18:02:37 +02:00
Alberto Garcia Cabeza
533a7492a1 changes more information to more info 2017-04-04 18:01:30 +02:00
kikito
1d456b0459 updates capistrano to match the Gemfile 2017-04-04 13:20:45 +02:00
Juanjo Bazán
d6cb76e491 removes not needed code
Kaminari has been updated
2017-04-03 12:30:57 +02:00
Alberto Garcia Cabeza
8d92c936cc removes unused i18n keys 2017-03-30 12:10:45 +02:00
Alberto Garcia Cabeza
672e6d1db7 removes old opendata page 2017-03-29 18:03:27 +02:00
Alberto Garcia Cabeza
37f4d0daa5 adds friendly urls 2017-03-29 18:02:55 +02:00
Alberto Garcia Cabeza
978b891011 adds i18n 2017-03-29 18:00:14 +02:00
Alberto
cfac1ebcc7 Merge pull request #1460 from consul/phases-renaming
renames budget phases
2017-03-23 13:15:08 +01:00
Juanjo Bazán
53290b3d0d renames budget phases 2017-03-23 12:48:00 +01:00
Juanjo Bazán
3cd33ec3d5 Merge pull request #1456 from consul/accessibility-embed-videos
improves accessibility on proposals embed videos
2017-03-23 12:33:54 +01:00
Alberto Garcia Cabeza
60ea12de76 improves accessibility on proposals embed videos 2017-03-21 18:44:51 +01:00
Alberto
be02a77c65 Merge pull request #1455 from consul/scm-config
updates capistrano scm config
2017-03-21 18:39:52 +01:00
Alberto Garcia Cabeza
dadfdba1b1 adds date of birth form when manager creates new user 2017-03-20 11:59:22 +01:00
Alberto Garcia Cabeza
8f13c0e2ec adds setting to add per page code on <head> and <body> 2017-03-16 17:04:36 +01:00
Juanjo Bazán
2d3e3586d1 updates capistrano scm config 2017-03-14 13:30:31 +01:00
kikito
dcb0e03cf4 small i18n change 2017-03-08 13:32:25 +01:00
Juanjo Bazán
a3b4b6b30d Merge pull request #1433 from consul/budget-investments-delete
Budget investments delete
2017-03-07 11:22:01 +01:00
kikito
3dbdc8f455 Adds delete link to budget investment list in user activities 2017-03-06 19:24:10 +01:00
Alberto Garcia Cabeza
b5fd8cc8b2 fixes missing i18n 2017-03-06 14:04:17 +01:00
Alberto Garcia Cabeza
737d347c4a changes alt text of header logo 2017-03-06 13:45:11 +01:00
Alberto Garcia Cabeza
580ed6e4c6 adds alternative text for share on WhatsApp links 2017-03-06 13:15:12 +01:00
rgarcia
0cd72894ff fixes date order symbols and syntax of portuguese locale 2017-02-18 11:21:59 +01:00
Juanjo Bazán
b1a5a324c7 adds missing checkbox label for unfeasible investments 2017-01-26 13:15:43 +01:00
Alberto Garcia Cabeza
45450d74ff improves styles for unfeasible investments 2017-01-16 18:45:42 +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
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
rgarcia
abd8cd2faf fixes translations 2017-01-14 17:13:59 +01:00
rgarcia
79767b5f1d adds translations 2017-01-14 17:02:41 +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
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
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
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