Commit Graph

6907 Commits

Author SHA1 Message Date
Juanjo Bazán
2bd6e121c7 Merge branch 'master' into polls 2017-01-04 18:08:03 +01:00
kikito
cc00af31b9 Merge branch 'budgets-admin-views' into budgets-gaspar 2017-01-04 17:57:46 +01:00
Alberto Garcia Cabeza
32c11c0981 removes unused i18n keys 2017-01-04 17:36:03 +01:00
Alberto Garcia Cabeza
fa7d6c18fd fixes back links on valuation budgets 2017-01-04 17:33:59 +01:00
Alberto Garcia Cabeza
74a361690d improves styles for valuation budgets 2017-01-04 17:33:09 +01:00
kikito
8aa982725e Renames "Vote" to "Give support" during the support phase 2017-01-04 17:10:56 +01:00
Alberto Garcia Cabeza
02359c8e2a improves styles for admin budgets edit 2017-01-04 17:04:37 +01:00
Alberto Garcia Cabeza
46d96e5a18 improves styles for admin budgets show 2017-01-04 17:02:27 +01:00
kikito
e9acf295b8 removes filter specs after removing filtering from valuation 2017-01-04 17:00:56 +01:00
kikito
9c66fa0dc8 removes filter from valuation index page 2017-01-04 16:31:16 +01:00
Alberto Miedes Garcés
6445fffc0d Merge branch 'master' into api-dev-0.18.11 2017-01-04 16:21:32 +01:00
kikito
4ceeb68a90 changes abilities extending valuation period 2017-01-04 15:59:36 +01:00
Juanjo Bazán
6e5492de22 Merge pull request #1323 from ferblape/1322-fix-initializer
Don't fetch setting in dev mode
2017-01-04 14:50:01 +01:00
Alberto Miedes Garcés
b36deb0382 Read API types and fields from config/api.yml 2017-01-04 14:26:30 +01:00
Amaia Castro
2b6df62dd7 Refactor process phases pages 2017-01-04 14:02:25 +01:00
kikito
b289e21992 Refactors valid_heading 2017-01-04 13:56:54 +01:00
kikito
f5dcb51d37 Adds valid_heading validation to budget line. Renames validation methods. 2017-01-04 13:56:42 +01:00
kikito
08586d521b Refactors heading.budget . adds heading.budget_id 2017-01-04 13:54:07 +01:00
Juanjo Bazán
909dce00e0 adds recounting spec 2017-01-04 13:52:11 +01:00
Alberto Garcia Cabeza
e1367d4463 improves table of admin budgets index 2017-01-04 13:52:04 +01:00
Fernando Blat
b6b33ff85b Merge pull request #51 from medialab-prado/14-base-legislation-annotations
Base Legislation Annotations
2017-01-04 13:50:37 +01:00
Fernando Blat
ad20302052 Merge pull request #48 from medialab-prado/13-draft-version-page
Draft Version page
2017-01-04 13:43:54 +01:00
Fernando Blat
8350143496 Don't fetch setting if table doesn't exist 2017-01-04 13:37:55 +01:00
Amaia Castro
ee9fa3db15 Base Legislation Annotations 2017-01-04 12:56:58 +01:00
kikito
0f174df5fe Removes geozones from budget heading views and specs 2017-01-04 12:46:11 +01:00
Amaia Castro
39633dce67 Fix back links in admin 2017-01-04 12:39:09 +01:00
Amaia Castro
375602d297 Display title with an * when status is draft in version chooser 2017-01-04 12:15:12 +01:00
Amaia Castro
c935373c07 Remove draft version preview buttons from edit form and add link to index 2017-01-04 10:14:58 +01:00
Amaia Castro
6d99a24740 Fix draft versions list 2017-01-04 10:13:55 +01:00
Juanjo Bazán
b2c9d5e6b0 Merge branch 'master' into polls 2017-01-03 23:04:21 +01:00
Juanjo Bazán
c2a61096aa adds required date to recount factory
fixes recount spec
2017-01-03 23:02:58 +01:00
Juanjo Bazán
0953a536af adds recounting to officing 2017-01-03 22:23:54 +01:00
Juanjo Bazán
09dac72471 adds officing's polls index 2017-01-03 22:22:52 +01:00
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