Commit Graph

892 Commits

Author SHA1 Message Date
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
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
7ef481ef0c Merge pull request #1337 from consul/devise-views
Devise views
2017-01-11 12:38:41 +01:00
Juanjo Bazán
7a448b6890 adds BudgetInvestment case to users_helpers 2017-01-10 20:58: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
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
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
rgarcia
b4cd1ea9d7 merges with budgets 2017-01-08 19:58:53 +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
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
Alberto Garcia Cabeza
0171538a2d updates i18n 2017-01-05 17:23:50 +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
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
kikito
5eec8c7da2 attempts to fix travis again 2017-01-05 12:32:36 +01:00
rgarcia
dde1d34172 fixes conflicts with master 2017-01-05 01:56:35 +01:00
rgarcia
517483f244 fixes typo 2017-01-05 01:24:25 +01:00
Alberto Garcia Cabeza
8b1e8fed5b improves styles for budgets views 2017-01-04 19:18:41 +01:00
kikito
635de83f86 prints the right value in budgets table 2017-01-04 18:48:01 +01:00
kikito
0835a7aba6 fixes valuation subtitle in budget investments index 2017-01-04 18:24:15 +01:00
kikito
cc00af31b9 Merge branch 'budgets-admin-views' into budgets-gaspar 2017-01-04 17:57:46 +01:00
Alberto Garcia Cabeza
32c11c0981 removes unused i18n keys 2017-01-04 17:36:03 +01:00
Alberto Garcia Cabeza
74a361690d improves styles for valuation budgets 2017-01-04 17:33:09 +01:00
kikito
8aa982725e Renames "Vote" to "Give support" during the support phase 2017-01-04 17:10:56 +01:00
Alberto Garcia Cabeza
e1367d4463 improves table of admin budgets index 2017-01-04 13:52:04 +01:00
kikito
0f174df5fe Removes geozones from budget heading views and specs 2017-01-04 12:46:11 +01:00
kikito
5ac2d9ccc9 started working on tags for budget investments. Error in investments/show because paths are hard 2017-01-03 17:13:28 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
kikito
51f7239d07 i18n 2017-01-02 10:52:59 +01:00
kikito
9effcc4041 i18n 2017-01-01 15:04:06 +01:00
Alberto Garcia Cabeza
d8b4af5add adds meta description and keywords 2016-12-30 17:17:46 +01:00
Alberto Garcia Cabeza
f32a77bae9 removes unused i18n keys 2016-12-30 01:13:04 +01:00