Commit Graph

4856 Commits

Author SHA1 Message Date
Juanma
ff8cc2d7bd Fixes values of official_level options for selects in search filters. 2017-01-09 16:07:59 +01:00
Juanjo Bazán
5a0d28f9f0 updates verification spec 2017-01-09 16:05:44 +01:00
Juanjo Bazán
be0cbb9ea1 adds setting to dev_seeds values 2017-01-09 16:05:33 +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
Juanjo Bazán
c5278bfb3b Merge pull request #1331 from consul/budgets-tags
Adds tags to investments
2017-01-09 14:35:43 +01:00
rgarcia
cc891b4f30 fixes specs 2017-01-09 14:10:07 +01:00
rgarcia
19a79801d3 fixes i18n specs 2017-01-09 13:54:29 +01:00
Alberto Garcia Cabeza
5fa6131e28 fixes management layout 2017-01-09 13:37:47 +01:00
rgarcia
f2d23b56e0 fixes conflicts with budgets 2017-01-09 13:33:01 +01:00
Raimond Garcia
b7788e0a1a Merge pull request #1333 from consul/budgets-baltasar
Budgets baltasar
2017-01-09 11:17:42 +01:00
rgarcia
b84ec0857c fixes specs 2017-01-09 11:02:15 +01:00
Alberto Garcia Cabeza
d5ffabac55 fixes specs for management budget investments 2017-01-08 22:17:37 +01:00
Alberto Garcia Cabeza
8722699cd8 fixes typos and spec for budgets investments 2017-01-08 22:17:14 +01:00
rgarcia
64366ba1f6 tmp fix for heading geozones 2017-01-08 20:03:30 +01:00
rgarcia
b4cd1ea9d7 merges with budgets 2017-01-08 19:58:53 +01:00
rgarcia
be10972406 fixes management specs 2017-01-08 13:39:01 +01:00
rgarcia
3ba57bbab2 adds valuator tags 2017-01-08 13:24:05 +01:00
rgarcia
fd28f6c2b3 adds tags to investment 2017-01-08 11:37:02 +01:00
Juanjo Bazán
ef7988649d Merge pull request #1330 from amiedes/master
Fix typo
2017-01-07 17:12:43 +01:00
Alberto Miedes Garcés
4e019c79d6 Fix typo 2017-01-07 16:55:24 +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
9669767c8a Removes unnecessary helper (all investments have a header now) 2017-01-06 18:47:16 +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
54691fe7f4 improves styles for budgets ballot 2017-01-05 20:37:34 +01:00
kikito
b36bb7bb97 fixes permission error when entering my ballot 2017-01-05 18:25:00 +01:00
Alberto Garcia Cabeza
f4f0980fe9 Merge branch 'budgets-baltasar' of github.com:consul/consul into budgets-baltasar 2017-01-05 17:50:28 +01:00
Alberto Garcia Cabeza
f503c492f3 improves styles for budgets investments ballot and votes 2017-01-05 17:43:57 +01:00
kikito
248755a801 Modifies the investment orders shown by phase 2017-01-05 17:38:36 +01:00
Alberto Garcia Cabeza
0171538a2d updates i18n 2017-01-05 17:23:50 +01:00
Alberto Garcia Cabeza
e0d3752f72 improves styles of budgets investments views 2017-01-05 17:23:30 +01:00
kikito
7eba0fee50 Deactivates /ballot view when not in the balloting phase 2017-01-05 15:18:16 +01:00
kikito
28e6a10382 Hides balloting controls when not in the balloting phase 2017-01-05 15:17:49 +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
Juanjo Bazán
a5b4a79f62 Merge pull request #1325 from consul/budgets-gaspar
Budgets - several fixes
2017-01-05 13:06:48 +01:00
Juanjo Bazán
0de74a05a8 Merge pull request #1327 from consul/dependencies
updates minor dependencies
2017-01-05 13:04:26 +01:00
Alberto Garcia Cabeza
e8dafde39f adds message for not logged users 2017-01-05 13:03:11 +01:00
Juanjo Bazán
0e9cec2ca6 adds spec for recount/officers lists in booth_assignment show 2017-01-05 13:00:48 +01:00
Alberto Garcia Cabeza
01ba8f7ea9 improves styles on budgets groups show 2017-01-05 12:56:46 +01:00
kikito
5f108944a8 final attempt at fixing travis 2017-01-05 12:49:53 +01:00
kikito
5eec8c7da2 attempts to fix travis again 2017-01-05 12:32:36 +01:00
kikito
2a792a5499 attempts to fix failing spec in travis 2017-01-05 12:05:40 +01:00
kikito
9e2afeb503 removes deprecated spec (valuators are not shown in valuation table) 2017-01-05 11:26:46 +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
rgarcia
6688832f8c updates dependencies 2017-01-05 01:02:07 +01:00