kikito
|
d39f19abb8
|
Defines Poll::Question#answerable_by?(user) and uses it in abilities
|
2016-11-07 16:28:39 +01:00 |
|
kikito
|
f821d7beb7
|
Implements abilities for poll & poll_question
|
2016-11-07 10:37:22 +01:00 |
|
kikito
|
35a5136d9f
|
Implements filtering in polls/index
|
2016-11-03 17:52:15 +01:00 |
|
kikito
|
0305d2bd65
|
Adds time scopes and methods to poll
|
2016-11-02 17:49:34 +01:00 |
|
kikito
|
575aa62960
|
Starts introducing valid answers to poll questions
|
2016-10-31 16:31:48 +01:00 |
|
kikito
|
1aab780592
|
Starts adding questions to polls
|
2016-10-31 14:27:25 +01:00 |
|
kikito
|
3eca3faacd
|
First version of Polls Controller
|
2016-10-31 14:13:56 +01:00 |
|
kikito
|
85aba10798
|
Initial work in Poll::Question
|
2016-10-28 18:02:28 +02:00 |
|
Juanjo Bazán
|
db7b2ef8af
|
Merge branch 'master' into polling-views-plus
|
2016-10-19 13:50:08 +02:00 |
|
Marcia
|
680c0636ed
|
expired password last
|
2016-10-06 14:19:48 +02:00 |
|
Marcia
|
1e87810593
|
improves expired password view
|
2016-09-29 14:34:37 +02:00 |
|
rgarcia
|
527b734e0e
|
assigns officers to booths
|
2016-09-28 18:39:01 +02:00 |
|
rgarcia
|
2c3127b6bd
|
adds booth backend for index, show, create and edit actions
|
2016-09-28 11:56:19 +02:00 |
|
Marcia
|
4269f3810b
|
Merge remote-tracking branch 'upstream/master' into admin_password_expired
|
2016-09-27 13:26:08 +02:00 |
|
Marcia
|
78c6a30424
|
optimize code
|
2016-09-27 13:07:06 +02:00 |
|
rgarcia
|
0795da02d8
|
adds poll CRU actions
|
2016-09-25 10:21:16 +02:00 |
|
rgarcia
|
c965e2dda1
|
tmp commit poll index, show and new
|
2016-09-23 09:13:02 +02:00 |
|
rgarcia
|
5bcd8f1e9d
|
fixes conflicts with poll branch
|
2016-09-20 11:53:40 +02:00 |
|
rgarcia
|
a6384af527
|
updates query to be more efficient
|
2016-09-20 11:48:35 +02:00 |
|
rgarcia
|
88e7af70d0
|
displays voter name if already voted
|
2016-09-19 18:48:19 +02:00 |
|
rgarcia
|
48d2aaa845
|
validates user has not already voted
|
2016-09-19 18:48:18 +02:00 |
|
rgarcia
|
0ec3a8e8bf
|
validates voter in census
|
2016-09-19 18:47:17 +02:00 |
|
rgarcia
|
7d4d9b0ead
|
sorts archived proposals by votes
|
2016-09-16 19:42:18 +02:00 |
|
Alberto Garcia Cabeza
|
910b24936d
|
Merge branch 'master' into voting-proposals
Conflicts:
app/models/proposal.rb
app/views/proposals/_proposal.html.erb
app/views/proposals/index.html.erb
app/views/proposals/show.html.erb
spec/support/common_actions.rb
|
2016-09-15 13:58:53 +02:00 |
|
Marcia
|
8d883b1e17
|
mejoras de codigo
|
2016-09-15 11:45:03 +02:00 |
|
rgarcia
|
c9b8a58e3f
|
creates polling officers from admin
|
2016-09-14 13:53:35 +02:00 |
|
Juanjo Bazán
|
8d48eccfed
|
adds not_archived scope to proposal
|
2016-09-13 12:10:31 +02:00 |
|
Juanjo Bazán
|
da03311f99
|
archived proposals can not accept votes
|
2016-09-12 18:47:56 +02:00 |
|
rgarcia
|
24740578ff
|
displays money remaining in each group
|
2016-09-10 16:22:42 +02:00 |
|
rgarcia
|
22373c3ddd
|
Review my votes page
|
2016-09-10 16:22:41 +02:00 |
|
rgarcia
|
9d4f2d1aff
|
Displays budget groups
|
2016-09-10 16:22:41 +02:00 |
|
rgarcia
|
1c8f4d5ff0
|
can remove investment projects
|
2016-09-10 16:22:41 +02:00 |
|
rgarcia
|
9839d7afd0
|
can add investments to ballot
|
2016-09-10 16:22:40 +02:00 |
|
Alberto Garcia Cabeza
|
3bbc2862d2
|
Adds admin setting 'months to archive proposals'
|
2016-09-09 18:02:02 +02:00 |
|
Alberto Garcia Cabeza
|
41312ca2a5
|
Creates archived proposals method
|
2016-09-09 17:31:05 +02:00 |
|
Juanjo Bazán
|
8aa62f8ce7
|
Merge branch 'budget' into admin-budgets
|
2016-09-09 15:13:05 +02:00 |
|
Juanjo Bazán
|
0fc31b1259
|
adds budget/budget_investment indexes to valuators
|
2016-09-09 13:39:08 +02:00 |
|
kikito
|
50f82211a9
|
Add User has_many budget_investments
|
2016-09-09 12:20:58 +02:00 |
|
kikito
|
f456400218
|
Removes duplicated relationship between budget and investment
|
2016-09-09 12:17:05 +02:00 |
|
Juanjo Bazán
|
e330b704c0
|
removes half-baked feature
archived proposals is a separate issue now
|
2016-09-08 17:06:16 +02:00 |
|
Alberto Garcia Cabeza
|
22487592cf
|
Adds scope for archived proposals
|
2016-09-07 12:57:53 +02:00 |
|
Alberto Garcia Cabeza
|
b107790039
|
Adds links, texts and i18n
|
2016-09-07 12:46:29 +02:00 |
|
Juanjo Bazán
|
31ef3f4c98
|
adds heading filter to index
|
2016-09-06 17:03:35 +02:00 |
|
Juanjo Bazán
|
6d06a59403
|
uses direct associations when managing investments
|
2016-09-05 13:02:08 +02:00 |
|
rgarcia
|
c2c7cdb18d
|
Merge branch 'budget' into budget-public-controllers
|
2016-09-02 13:15:40 +02:00 |
|
rgarcia
|
3e0786b555
|
Merge branch 'budget' of github.com:AyuntamientoMadrid/participacion into budget
|
2016-09-02 13:15:30 +02:00 |
|
Juanjo Bazán
|
b8b71d0ab0
|
Merge branch 'master' into budget
|
2016-09-02 12:47:54 +02:00 |
|
Juanjo Bazán
|
46563f8222
|
Merge pull request #1194 from consul/notifications-polish
Notifications polish
|
2016-08-04 11:29:21 +02:00 |
|
Juanjo Bazán
|
0f7e23bec4
|
adds budget's groups & headings to admin
|
2016-08-03 20:23:41 +02:00 |
|
rgarcia
|
b087fe8fb7
|
refactors email digest
|
2016-08-03 19:33:37 +02:00 |
|