consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

5383 Commits

Author SHA1 Message Date
rgarcia
2c3127b6bd adds booth backend for index, show, create and edit actions 2016-09-28 11:56:19 +02:00
rgarcia
7db3683c27 adds consistency to syntax 2016-09-28 11:55:11 +02:00
Marcia
4269f3810b Merge remote-tracking branch 'upstream/master' into admin_password_expired 2016-09-27 13:26:08 +02:00
rgarcia
a7279d2d67 removes poll unused attributes 2016-09-25 10:26:32 +02:00
rgarcia
e2a0b051e9 allow officers to be created without a poll 2016-09-25 10:21:58 +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
Alberto Garcia Cabeza
7781edf879 Adds content to booths index and show views 2016-09-20 12:32:23 +02:00
Alberto Garcia Cabeza
5ce886bc6a Add views for admin booths 2016-09-19 18:32:21 +02:00
Alberto Garcia Cabeza
e2c6470df3 Merge branch 'polling-views' of github.com:consul/consul into polling-views 2016-09-19 17:26:59 +02:00
Alberto Garcia Cabeza
fcf7920a40 Adds booths index content 2016-09-19 17:26:48 +02:00
rgarcia
118d163979 hot fix to load last poll on officer's index 2016-09-19 17:25:51 +02:00
Alberto Garcia Cabeza
4872c7a4e8 Adds content to edit and show views 2016-09-19 13:36:42 +02:00
rgarcia
72e173b8ea closes missing div 2016-09-16 20:25:12 +02:00
Alberto Garcia Cabeza
5ff3e2c599 Adds i18n and styles to admin polls index and new 2016-09-16 19:07:12 +02:00
rgarcia
b5bebaa6c7 adds view placeholders for officing polls 2016-09-16 13:06:30 +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
Alberto Garcia Cabeza
7abd31e4bf Renames variable, updates text 2016-09-15 13:47:53 +02:00
Juanjo Bazán
e0c3f7c029 Merge pull request #1213 from consul/archived-proposals 
Archived proposals
 2016-09-15 13:22:05 +02:00
Marcia
8d883b1e17 mejoras de codigo 2016-09-15 11:45:03 +02:00
rgarcia
cd5266046b fixes translation key 2016-09-14 14:25:38 +02:00
rgarcia
c9b8a58e3f creates polling officers from admin 2016-09-14 13:53:35 +02:00
Alberto Garcia Cabeza
db6f82fa4c Moves banner to a partial and includes it on debates index 2016-09-14 11:09:36 +02:00
Alberto Garcia Cabeza
076e237320 Improves proposal ballot banner, deletes unused partial 2016-09-14 10:40:16 +02:00
Raimond Garcia
9a2d45f25d Merge pull request #1219 from consul/budget-management 
Budget management
 2016-09-13 18:45:30 +02:00
kikito
13ffd73fee UNFINISHED budget management 2016-09-13 12:33:34 +02:00
Alberto Garcia Cabeza
c42877efb1 Improves styles for select heading page 2016-09-12 18:45:47 +02:00
Alberto Garcia Cabeza
6fac3c67ff Merge branch 'voting-proposals' of github.com:consul/consul into voting-proposals 2016-09-12 18:07:22 +02:00
Alberto Garcia Cabeza
77077b28b8 Removes question and supports on successfull proposals 2016-09-12 18:06:43 +02:00
Alberto Garcia Cabeza
d5af06da5d Adds proposal's total votes in index/show views 2016-09-12 17:56:15 +02:00
Raimond Garcia
992425f4b3 Merge pull request #1212 from consul/budget-votes 
Budget votes
 2016-09-12 16:00:23 +02:00
Juanjo Bazán
5b1ff1584c Merge branch 'master' into budget 2016-09-12 12:29:47 +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
16794c580c groups and headings navigation 2016-09-10 16:22:43 +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
22373c3ddd Review my votes page 2016-09-10 16:22:41 +02:00
rgarcia
85d70a2cc2 updates group's title 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
rgarcia
29cad341f5 Adds voting in selecting phase 2016-09-10 16:22:40 +02:00
Alberto Garcia Cabeza
fa3b503c47 Adds specs 2016-09-09 17:32:21 +02:00
Alberto Garcia Cabeza
e8b70a48fa Adds tab in index & removes support button in index/show 2016-09-09 17:32:03 +02:00
Juanjo Bazán
8aa62f8ce7 Merge branch 'budget' into admin-budgets 2016-09-09 15:13:05 +02:00
Juanjo Bazán
42c705e1e3 adds dossier editing of investments to valuation 2016-09-09 15:09:06 +02:00
Juanjo Bazán
0fc31b1259 adds budget/budget_investment indexes to valuators 2016-09-09 13:39:08 +02:00
kikito
250e5de081 removes garbage line from view 2016-09-09 13:31:54 +02:00
kikito
cb7ea79aaf Replaces spending proposals by budget investments in user/show 2016-09-09 12:19:38 +02:00