Commit Graph

9874 Commits

Author SHA1 Message Date
Juanjo Bazán
2886d6d954 adds relations to officer/booth assignments 2017-01-03 22:20:22 +01:00
Juanjo Bazán
8d52224121 removes unused routes/files 2017-01-03 22:17:27 +01:00
Amaia Castro
f040759693 Show only published draft versions to users (and also drafts to admins) 2017-01-03 22:08:54 +01:00
Amaia Castro
3ba6b409aa Make markdown helper safer to use
Avoid exception if text is nil
2017-01-03 21:41:00 +01:00
Juanjo Bazán
8b56403bb1 adds validations and info logging to Recount 2017-01-03 21:35:04 +01:00
Juanjo Bazán
0c1d7c15c1 adds date and officer log to recounts 2017-01-03 21:30:03 +01:00
Amaia Castro
a3b8d30567 Merge branch 'master' into legislation-module-stable 2017-01-03 19:38:01 +01:00
kikito
52d182f099 Removes geozone from budget heading 2017-01-03 18:51:21 +01:00
Alberto Miedes Garcés
9cfb3eb52e Write specs for GraphQL::AssociationResolver 2017-01-03 18:30:53 +01:00
kikito
2c343788d5 Fixes typo 2017-01-03 18:11:59 +01:00
kikito
18bd44d91f do not use html in generation of unfeasibility reason 2017-01-03 18:00:35 +01:00
Amaia Castro
d2b3a21182 Fix abilities and add specs 2017-01-03 17:48:21 +01:00
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
Alberto Miedes Garcés
cdc3b46370 Extract TypeCreator methods into AssociationResolver class 2017-01-03 16:52:13 +01:00
Alberto Miedes Garcés
4e12e9055c Refactor GraphQL::TypeCreator 2017-01-03 16:27:11 +01:00
Enrique García
465a93f49c Merge pull request #1318 from ferblape/1315-manage-offices_url-as-setting
Manage offices url as a setting
2017-01-03 13:27:52 +01:00
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