Alberto Miedes Garcés
|
d76e4518e6
|
Extract QueryRoot resolve functions into its own classes
|
2017-01-07 22:43:42 +01:00 |
|
Alberto Miedes Garcés
|
3c73f35416
|
Removed useless code
|
2017-01-07 22:20:28 +01:00 |
|
kikito
|
e1926368cd
|
proyecto -> propuesta
|
2017-01-06 19:57:09 +01:00 |
|
kikito
|
b7a0aa3b57
|
Fixes i18n errors now that they are detected by i18n-tasks
|
2017-01-06 19:55:23 +01:00 |
|
kikito
|
9d80b56f84
|
changes i18n-tasks.yml so that budgets.* isn't ignored
|
2017-01-06 19:55:06 +01:00 |
|
kikito
|
3c9e08b06f
|
Adds organization_name attribute to budget investments
|
2017-01-06 18:43:55 +01:00 |
|
rgarcia
|
864c703ac4
|
Merge branch 'budgets' into budgets-tags
|
2017-01-06 18:28:52 +01:00 |
|
Alberto Garcia Cabeza
|
f503c492f3
|
improves styles for budgets investments ballot and votes
|
2017-01-05 17:43:57 +01:00 |
|
Fernando Blat
|
c50e8cbbdf
|
Merge pull request #54 from medialab-prado/fix-small-issues
Fix small issues
|
2017-01-05 17:34:40 +01:00 |
|
Alberto Garcia Cabeza
|
0171538a2d
|
updates i18n
|
2017-01-05 17:23:50 +01:00 |
|
Fernando Blat
|
1fbb10ff34
|
Include link to resource in the flash message
|
2017-01-05 17:03:08 +01:00 |
|
Fernando Blat
|
dc3a917877
|
Add missing translation
|
2017-01-05 16:46:53 +01:00 |
|
Raimond Garcia
|
e2cb390d43
|
Merge pull request #1328 from consul/budgets-polish-views
budgets views
|
2017-01-05 13:48:55 +01:00 |
|
rgarcia
|
c3380d18fa
|
fixes conflicts with budgets
|
2017-01-05 13:14:09 +01:00 |
|
Fernando Blat
|
8682e426ac
|
Show warning if phase is not open
|
2017-01-05 13:08:06 +01:00 |
|
Juanjo Bazán
|
a5b4a79f62
|
Merge pull request #1325 from consul/budgets-gaspar
Budgets - several fixes
|
2017-01-05 13:06:48 +01:00 |
|
Alberto Garcia Cabeza
|
e8dafde39f
|
adds message for not logged users
|
2017-01-05 13:03:11 +01:00 |
|
Fernando Blat
|
ed714f7c7d
|
Add flash messages. Redirect to edit action after update
|
2017-01-05 12:56:55 +01:00 |
|
Fernando Blat
|
0c83b87b7b
|
Ignore dynamic i18n keys
|
2017-01-05 12:36:28 +01:00 |
|
kikito
|
5eec8c7da2
|
attempts to fix travis again
|
2017-01-05 12:32:36 +01:00 |
|
Fernando Blat
|
de13574617
|
Show link to the first question
|
2017-01-05 12:31:20 +01:00 |
|
Fernando Blat
|
814cf9df56
|
Show creation date and status in admin list
|
2017-01-05 10:22:40 +01:00 |
|
Amaia Castro
|
2f173d2877
|
Merge branch 'master' into legislation-module-stable
|
2017-01-05 10:19:39 +01:00 |
|
Fernando Blat
|
0c5063add9
|
Show message when there aren't processes
|
2017-01-05 09:36:08 +01:00 |
|
Fernando Blat
|
71ed50928f
|
Merge pull request #53 from medialab-prado/46-validate-legislation-process-dates
Validate date ranges for legislation process
|
2017-01-05 09:25:10 +01:00 |
|
rgarcia
|
dde1d34172
|
fixes conflicts with master
|
2017-01-05 01:56:35 +01:00 |
|
rgarcia
|
517483f244
|
fixes typo
|
2017-01-05 01:24:25 +01:00 |
|
Juanjo Bazán
|
70b86170a2
|
adds booth_assignment show with officers and recounts info
|
2017-01-04 21:00:36 +01:00 |
|
Alberto Garcia Cabeza
|
8b1e8fed5b
|
improves styles for budgets views
|
2017-01-04 19:18:41 +01:00 |
|
kikito
|
635de83f86
|
prints the right value in budgets table
|
2017-01-04 18:48:01 +01:00 |
|
kikito
|
0835a7aba6
|
fixes valuation subtitle in budget investments index
|
2017-01-04 18:24:15 +01:00 |
|
Amaia Castro
|
bc1905e5d9
|
Validate date ranges for legislation process
Only validates start and end dates for the whole process or a phase, not overlap between phases, as they are permitted, at least for now.
|
2017-01-04 18:13:28 +01:00 |
|
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
|
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 Miedes Garcés
|
6445fffc0d
|
Merge branch 'master' into api-dev-0.18.11
|
2017-01-04 16:21:32 +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 |
|
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
|
c935373c07
|
Remove draft version preview buttons from edit form and add link to index
|
2017-01-04 10:14:58 +01:00 |
|
Juanjo Bazán
|
b2c9d5e6b0
|
Merge branch 'master' into polls
|
2017-01-03 23:04:21 +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 |
|