Commit Graph

4721 Commits

Author SHA1 Message Date
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
Alberto Miedes Garcés
a31f6be3bd Add proposal notifications to seeds 2017-01-07 22:16:17 +01:00
Alberto Miedes Garcés
1e95cdfce3 Fix dev_seeds 2017-01-07 21:58:29 +01:00
Alberto Miedes Garcés
f467bb64c7 Wrote specs for HasPublicAuthor module 2017-01-07 18:00:14 +01:00
Alberto Miedes Garcés
861a723724 Only show public_voter if votable.total_votes are above threshold 2017-01-07 17:22:18 +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
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
Juanjo Bazán
91da171f54 Merge pull request #1326 from consul/budgets-views
budgets views
2017-01-04 21:03:33 +01:00
Alberto Garcia Cabeza
a42c1387cf fixes specs 2017-01-04 19:38:49 +01:00
Alberto Garcia Cabeza
8b1e8fed5b improves styles for budgets views 2017-01-04 19:18:41 +01:00
Alberto Garcia Cabeza
9c2857e75b changes budget color 2017-01-04 19:17:58 +01:00
Alberto Garcia Cabeza
ef1300abbc removes unused scss 2017-01-04 19:17:51 +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
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