Juanjo Bazán
|
aa6eee6df0
|
Merge pull request #1385 from consul/polls-design
polls design
|
2017-02-01 18:33:19 +01:00 |
|
rgarcia
|
2d0756ef1d
|
updates translations for year birth
|
2017-02-01 11:20:22 +01:00 |
|
Alberto Garcia Cabeza
|
8c4541d50f
|
shows always questions lists and button to participate on poll index
|
2017-01-31 21:08:03 +01:00 |
|
Juanjo Bazán
|
a05297ea1a
|
adds Recounting tab to Poll's admin show view
|
2017-01-31 13:40:53 +01:00 |
|
Juanjo Bazán
|
547168be3f
|
adds recounts to poll_officer view in admin zone
Admin can see recounts and final recounts made by poll_officer next to
their officing shifts
|
2017-01-31 12:38:53 +01:00 |
|
Juanjo Bazán
|
0c34c030e9
|
adds missing i18n text
|
2017-01-31 11:41:18 +01:00 |
|
Juanjo Bazán
|
abf40812b1
|
changes copy for officers menu items
|
2017-01-31 11:31:23 +01:00 |
|
Raimond Garcia
|
b0bc97eb37
|
Merge pull request #1378 from consul/recounting
Final recounts info to Admin
|
2017-01-30 21:54:35 +01:00 |
|
Juanjo Bazán
|
4ee50c86c0
|
adds final recounts info to admins
|
2017-01-30 20:42:30 +01:00 |
|
Juanjo Bazán
|
70d00a9768
|
adds all recounts to offering final recounts list
so poll officers can compare
|
2017-01-30 20:16:02 +01:00 |
|
kikito
|
7fa413b6df
|
i18n
|
2017-01-30 19:05:16 +01:00 |
|
Juanjo Bazán
|
72ac75abeb
|
adds final recounting to poll officers' zone
|
2017-01-30 17:44:39 +01:00 |
|
Juanjo Bazán
|
05f054ece4
|
adds final recount/results shift for officers from Admin
|
2017-01-30 17:44:39 +01:00 |
|
Raimond Garcia
|
886c179a71
|
Merge pull request #1375 from consul/officer-document-check
updates styles and i18n for officing views
|
2017-01-30 14:03:04 +01:00 |
|
Raimond Garcia
|
bc0a4d65b4
|
Merge pull request #1374 from consul/polls-index
Polls index
|
2017-01-30 13:52:48 +01:00 |
|
Alberto Garcia Cabeza
|
1977b23803
|
updates styles and i18n for officing views
|
2017-01-30 13:33:38 +01:00 |
|
kikito
|
c1345a1f7d
|
Includes reason for not being able to participate in poll index
|
2017-01-30 11:30:39 +01:00 |
|
rgarcia
|
c74587d921
|
fixes specs
|
2017-01-29 14:13:24 +01:00 |
|
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 |
|
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 |
|