rgarcia
|
2c3127b6bd
|
adds booth backend for index, show, create and edit actions
|
2016-09-28 11:56:19 +02:00 |
|
rgarcia
|
042cb14dbd
|
moves poll spec to poll folder
|
2016-09-28 11:53:54 +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
|
a7279d2d67
|
removes poll unused attributes
|
2016-09-25 10:26:32 +02:00 |
|
rgarcia
|
04c58135ee
|
adds admin submit button helper
|
2016-09-25 10:21:34 +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 |
|
Ignacio Aliende García
|
e4e2706af6
|
Fixes custom locales inclusion.
|
2016-09-20 17:34:26 +01:00 |
|
rgarcia
|
fd220bdf22
|
fixes specs
|
2016-09-20 13:49:48 +02:00 |
|
rgarcia
|
5bcd8f1e9d
|
fixes conflicts with poll branch
|
2016-09-20 11:53:40 +02:00 |
|
rgarcia
|
e0951a2f2d
|
adds spacing to factories
|
2016-09-20 11:48:28 +02:00 |
|
rgarcia
|
55f4a6bbae
|
removes officer factory
|
2016-09-20 11:48:21 +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
|
fa833f5a4a
|
modificado otro mensaje en los test
|
2016-09-15 13:06:03 +02:00 |
|
Marcia
|
4832558948
|
modificado mensaje en el test
|
2016-09-15 12:21:25 +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 |
|
Alberto Garcia Cabeza
|
89340d4647
|
Deletes author_id on specs
|
2016-09-14 12:20:22 +02:00 |
|
Alberto Garcia Cabeza
|
30c11c9e22
|
Fixes specs
|
2016-09-14 11:41:29 +02:00 |
|
Raimond Garcia
|
9a2d45f25d
|
Merge pull request #1219 from consul/budget-management
Budget management
|
2016-09-13 18:45:30 +02:00 |
|
Raimond Garcia
|
c41699fdf0
|
Merge pull request #1207 from consul/spending_proposals_import
Spending proposals import
|
2016-09-13 18:35:50 +02:00 |
|
Juanjo Bazán
|
2142351743
|
archived proposals should not appear in 'featured'
|
2016-09-13 12:56:49 +02:00 |
|
Juanjo Bazán
|
11dbc05a80
|
removes archived proposals from index/search pages
|
2016-09-13 12:56:10 +02:00 |
|
kikito
|
13ffd73fee
|
UNFINISHED budget management
|
2016-09-13 12:33:34 +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 |
|
Juanjo Bazán
|
acae610995
|
adds model specs for archived proposal
|
2016-09-12 18:15:18 +02:00 |
|
Juanjo Bazán
|
aa05b0259e
|
fixes featured proposal creation in failing spec
|
2016-09-12 17:37:55 +02:00 |
|
kikito
|
2bc9e7be78
|
started working on budget manatement
|
2016-09-12 12:11:47 +02:00 |
|
rgarcia
|
e38e89aea0
|
fixes specs
|
2016-09-10 16:22:43 +02:00 |
|
rgarcia
|
fdb1d4aac9
|
refactors specs
|
2016-09-10 16:22:43 +02:00 |
|
rgarcia
|
16794c580c
|
groups and headings navigation
|
2016-09-10 16:22:43 +02:00 |
|
rgarcia
|
3730b0315c
|
runs all specs
|
2016-09-10 16:22:43 +02:00 |
|
rgarcia
|
263b729ede
|
removes delegation specs and voting via get
|
2016-09-10 16:22:43 +02:00 |
|
rgarcia
|
65f029f34c
|
Fixes permissions and feasibility specs
|
2016-09-10 16:22:42 +02:00 |
|
rgarcia
|
4ded0350a1
|
removes investments from sidebar
|
2016-09-10 16:22:42 +02:00 |
|
rgarcia
|
24740578ff
|
displays money remaining in each group
|
2016-09-10 16:22:42 +02:00 |
|
rgarcia
|
5aeec32704
|
simplifies spec
|
2016-09-10 16:22:42 +02:00 |
|
rgarcia
|
94d3cbb380
|
adds pending spec
|
2016-09-10 16:22:42 +02:00 |
|
rgarcia
|
22373c3ddd
|
Review my votes page
|
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 |
|
rgarcia
|
53d53ea9fb
|
moves vote specs to budget scoped folder
|
2016-09-10 16:22:40 +02:00 |
|
rgarcia
|
29cad341f5
|
Adds voting in selecting phase
|
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
|
fa3b503c47
|
Adds specs
|
2016-09-09 17:32:21 +02:00 |
|
Juanjo Bazán
|
8aa62f8ce7
|
Merge branch 'budget' into admin-budgets
|
2016-09-09 15:13:05 +02:00 |
|