Commit Graph

2781 Commits

Author SHA1 Message Date
kikito
5ac2d9ccc9 started working on tags for budget investments. Error in investments/show because paths are hard 2017-01-03 17:13:28 +01:00
Amaia Castro
99e3afd6ca Merge branch 'legislation-module-stable' into 13-draft-version-page 2017-01-03 09:28:26 +01:00
Fernando Blat
c47993ec91 Merge pull request #49 from medialab-prado/47-fix-bug-deleting-questions
Fix stack level too deep bug when deleting questions with answers
2017-01-03 09:23:56 +01:00
Amaia Castro
98b6dd75ea Fix stack level too deep bug when deleting questions with answers 2017-01-02 20:45:20 +01:00
Juanjo Bazán
b3fd7ffafa adds assigned_polls method to poll_officer 2017-01-02 20:28:16 +01:00
Juanjo Bazán
1aa845a9c6 adds published to polls 2017-01-02 18:23:24 +01:00
Amaia Castro
5627b18be2 Draft Version page 2017-01-02 18:05:15 +01:00
Amaia Castro
1ff6a7b69b Merge branch 'legislation-module-stable' into 42-integrate-admin-html-css 2017-01-02 18:03:55 +01:00
Alberto Miedes Garcés
0b4004042f Expose age_range instead of date_of_birth for Voter/User class 2017-01-02 14:12:37 +01:00
Juanjo Bazán
fe1c12c661 updates count_log if recount count value changes 2017-01-02 13:36:30 +01:00
Juanjo Bazán
85b8f54570 adds Poll::Recount 2017-01-02 13:34:53 +01:00
Juanjo Bazán
08ea4b35eb Merge branch 'master' into polls 2017-01-02 12:14:40 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
Alberto Miedes Garcés
f4e0ef7eea Truncate votes api timestamp to hour 2017-01-02 12:00:58 +01:00
Amaia Castro
3de48353da Merge branch 'master' into legislation-module-stable 2017-01-02 11:56:17 +01:00
Alberto Miedes Garcés
508360cfa5 Remove unused User scope 2017-01-02 11:35:19 +01:00
Alberto Miedes Garcés
ac6802572f Fix collision problems related to User and Voter classes 2017-01-02 11:06:24 +01:00
kikito
451179fa59 fixes issues with valuating in specs 2017-01-02 08:22:11 +01:00
Alberto Miedes Garcés
4783f14eb4 Show voter info in api 2017-01-02 00:13:16 +01:00
Alberto Miedes Garcés
9c6001e987 Move public_author into module 2017-01-01 20:46:08 +01:00
kikito
9e4b2fda89 Adds phases to form 2017-01-01 15:03:58 +01:00
kikito
ecb3461a97 Renames Budget::VALID_PHASES to just PHASES 2017-01-01 13:16:22 +01:00
kikito
d80dedaad8 Adds sanitized descriptions for all phases to budget model 2017-01-01 12:51:17 +01:00
kikito
c17dcf1bab replaces array of strings with %w 2017-01-01 12:50:40 +01:00
kikito
f6e4443437 Removes sanitizable from budget, replacing it by custom impl 2017-01-01 12:34:15 +01:00
kikito
cb4803f2f9 Replaces %w by %W 2017-01-01 12:33:43 +01:00
kikito
fa50e3f215 Adds new phases to budget and fixes specs 2016-12-30 18:43:15 +01:00
Amaia Castro
0cd2b62e2c Integrate admin html and css from sandbox 2016-12-30 11:00:34 +01:00
kikito
34ee8c1c48 Makes Budgets editable, and makes their description editable with html 2016-12-29 16:21:42 +01:00
rgarcia
43c18d58ac fixes specs 2016-12-29 12:47:57 +01:00
rgarcia
365faeff31 removes physical votes from proposals 2016-12-29 12:05:29 +01:00
Alberto Miedes Garcés
90130f20e7 Add Votes info to api 2016-12-29 12:03:00 +01:00
Amaia Castro
f804fd8312 Merge branch 'master' into legislation-module-stable 2016-12-29 11:40:32 +01:00
Alberto Miedes Garcés
80c3108a18 Add Tag to api 2016-12-29 11:13:57 +01:00
Alberto Miedes Garcés
074a8182f6 Add ProposalNotification to api 2016-12-29 10:58:40 +01:00
Amaia Castro
5b3dcd7886 Force processes order 2016-12-29 09:59:29 +01:00
Juanjo Bazán
098a271d7c Merge branch 'master' into polls 2016-12-28 20:55:58 +01:00
Juanjo Bazán
7ec6c76298 Merge pull request #1316 from consul/signature-sheets-polish
Only stores alphanumeric characters of a signature's document number
2016-12-28 20:50:28 +01:00
rgarcia
25f34cdab9 Only stores alphanumeric characters of a signature's document number 2016-12-28 20:01:17 +01:00
Amaia Castro
28689a5a7d Merge branch 'legislation-module-stable' into 27-answer-questions 2016-12-28 17:54:21 +01:00
Amaia Castro
525ad3ebd1 Merge branch 'master' into legislation-module-stable 2016-12-28 17:51:15 +01:00
kikito
f7c505392a Adds new route and matching ability for administrators 2016-12-28 17:42:47 +01:00
kikito
3dcd7b444a adds valuation_finished_feasible scope 2016-12-28 17:29:49 +01:00
Juanjo Bazán
f5b032cfbe Merge branch 'master' into polls 2016-12-28 12:16:55 +01:00
rgarcia
122446ef62 find or create signatures in case of a timeout 2016-12-28 11:41:52 +01:00
rgarcia
113c4551aa makes signatures aware of spaces between numbers and letter 2016-12-28 11:40:36 +01:00
Amaia Castro
a6ceab6d73 Answer legislation questions 2016-12-27 19:49:03 +01:00
Juanjo Bazán
402d709930 adds menu item to main bar for poll officers 2016-12-27 18:48:36 +01:00
Juanjo Bazán
ab61d94d2d changes Time.now to Time.current 2016-12-27 18:26:03 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00