Commit Graph

1677 Commits

Author SHA1 Message Date
Raimond Garcia
e60a56ea8f Merge pull request #1335 from consul/under_age_setting
Minimum age setting
2017-01-09 17:46:44 +01:00
Alberto Garcia Cabeza
2a3cbee96a Merge branch 'budgets' of github.com:consul/consul into budgets 2017-01-09 17:10:46 +01:00
Alberto Garcia Cabeza
e6cc09a460 adds budget icon on investment show when no aside 2017-01-09 17:10:36 +01:00
Amaia Castro
f43f13e826 Create first comment automatically from the annotation 2017-01-09 17:03:00 +01:00
Juanma
5fe38f9720 Removes translation texts. 2017-01-09 16:27:30 +01:00
Juanjo Bazán
e2118f701b removes hardcoded age, favours setting 2017-01-09 16:05:27 +01:00
Juanjo Bazán
220e7397e1 adds Setting: minimum age to participate 2017-01-09 16:04:49 +01:00
Alberto Miedes Garcés
6940b90260 Add more fields to api.yml 2017-01-09 14:11:51 +01:00
rgarcia
19a79801d3 fixes i18n specs 2017-01-09 13:54:29 +01:00
Alberto Miedes Garcés
b0bd30e3d1 Move api config file parsing method into the ApiTypesCreator class 2017-01-09 13:36:53 +01:00
rgarcia
f2d23b56e0 fixes conflicts with budgets 2017-01-09 13:33:01 +01:00
rgarcia
b84ec0857c fixes specs 2017-01-09 11:02:15 +01:00
Amaia Castro
b8f034d896 Legislation annotations/comments page 2017-01-09 09:29:15 +01:00
rgarcia
b4cd1ea9d7 merges with budgets 2017-01-08 19:58:53 +01:00
Alberto Miedes Garcés
398bc8c211 Split api types creation and query type creation between two different classes 2017-01-08 13:39:50 +01:00
rgarcia
3ba57bbab2 adds valuator tags 2017-01-08 13:24:05 +01:00
Alberto Miedes Garcés
b9d2bc2801 Wrote specs for QueryType creation 2017-01-08 12:45:48 +01:00
Alberto Miedes Garcés
7027164867 Clean code 2017-01-08 11:37:56 +01:00
rgarcia
fd28f6c2b3 adds tags to investment 2017-01-08 11:37:02 +01:00
Alberto Miedes Garcés
0b302c2afc Move code from GraphQL initializer into GraphQL::TypeCreator 2017-01-07 23:04:30 +01:00
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