rgarcia
|
6c34599e1e
|
adds officer residence check and user voting
|
2017-01-29 00:36:20 +01:00 |
|
Juanjo Bazán
|
ce7bac4a59
|
Merge branch 'master' into polls
|
2017-01-26 13:16:03 +01:00 |
|
Juanjo Bazán
|
b1a5a324c7
|
adds missing checkbox label for unfeasible investments
|
2017-01-26 13:15:43 +01:00 |
|
kikito
|
183f8432eb
|
Merge branch 'polls' into polls-question-show
|
2017-01-26 11:36:34 +01:00 |
|
kikito
|
d9351b123d
|
prints a button to redirect to the poll when a question is answerable
|
2017-01-25 17:58:09 +01:00 |
|
Juanjo Bazán
|
754095f4d0
|
fixes modified i18n key
|
2017-01-25 17:15:38 +01:00 |
|
Juanjo Bazán
|
b13a76963a
|
records participation of user via web
answering a poll question creates a voter with the user data to record
participation in question’s poll
|
2017-01-25 14:21:03 +01:00 |
|
kikito
|
25930563e9
|
adds missing i18n
|
2017-01-25 10:15:38 +01:00 |
|
kikito
|
e935629fdb
|
i18n
|
2017-01-24 19:01:28 +01:00 |
|
kikito
|
6ed73f34b6
|
Adds activerecord translations
|
2017-01-24 18:10:30 +01:00 |
|
Juanjo Bazán
|
113f9b32d7
|
Merge branch 'master' into polls
|
2017-01-19 16:51:19 +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 |
|
rgarcia
|
b2b9954e6d
|
allows user to support only in one heading per group
|
2017-01-13 15:24:57 +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 |
|