Commit Graph

6458 Commits

Author SHA1 Message Date
Alberto Miedes Garcés
2c5925f947 Refactor GraphqlController 2017-01-03 13:24:00 +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
Fernando Blat
dcfb39d38d Merge pull request #44 from medialab-prado/42-integrate-admin-html-css
Integrate admin html and css from sandbox
2017-01-03 09:03:06 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
Fernando Blat
76bc1a7934 Use settings helper 2017-01-03 08:55:17 +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
55fea6c037 adds polls-related seed data 2017-01-02 19:29:43 +01:00
Amaia Castro
1736b68044 Update subnavigation menu and accessibility page for new shortcut 2017-01-02 18:42:22 +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
Amaia Castro
d29a9fe761 Match js calendar date format in admin process form text fields 2017-01-02 13:22:33 +01:00
Martín González
bc72e72e8f Refactor legislation processes filter styles 2017-01-02 12:43:00 +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
Juanjo Bazán
1bdfacd683 Merge pull request #1321 from consul/budgets-melchor
Budgets melchor
2017-01-02 11:50:49 +01:00
Enrique García
30d89be2d8 Merge pull request #1320 from consul/meta-tags
Meta description and keywords tags
2017-01-02 11:45:58 +01:00
Alberto Miedes Garcés
508360cfa5 Remove unused User scope 2017-01-02 11:35:19 +01:00
Alberto Miedes Garcés
a2befe6bc1 Remove unused gem 2017-01-02 11:30:10 +01:00
Alberto Miedes Garcés
eadceb106c Only mount graphiql in development environment 2017-01-02 11:27:56 +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
51f7239d07 i18n 2017-01-02 10:52:59 +01:00
Alberto Miedes Garcés
8fe38f889b Fix typo 2017-01-02 10:52:27 +01:00
kikito
98e9e8de0f Fixes errors in specs related to changes in budget phases 2017-01-02 10:37:37 +01:00
kikito
f14f7b9a70 Adds new descriptions to budget in dev_seeds 2017-01-02 10:02:57 +01:00
kikito
4adf32d582 Changes initializer to avoid crash when migrating database from scratch 2017-01-02 10:02:34 +01:00
kikito
07a99b8e3f Modifies the phase field in Budget 2017-01-02 10:02:05 +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
Alberto Miedes Garcés
7dc4d80e7b Read GraphQL field types from file instead of from database 2017-01-01 19:36:07 +01:00
kikito
9effcc4041 i18n 2017-01-01 15:04:06 +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
kikito
181749b4f6 Removes valuating boolean from budgets 2016-12-30 18:41:35 +01:00
Alberto Garcia Cabeza
00581fcacc adds setting key deleted by mistake 2016-12-30 17:21:50 +01:00
Alberto Garcia Cabeza
d8b4af5add adds meta description and keywords 2016-12-30 17:17:46 +01:00
Juanjo Bazán
c5c1bef7cc Merge pull request #1319 from consul/signature-sheets-cleanup
Signature sheets cleanup
2016-12-30 12:58:41 +01:00