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 |
|
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 |
|
Alberto Garcia Cabeza
|
e0d3752f72
|
improves styles of budgets investments views
|
2017-01-05 17:23:30 +01:00 |
|
Fernando Blat
|
a5421597a4
|
Safe call to flash text
|
2017-01-05 17:12:42 +01:00 |
|
Fernando Blat
|
1fbb10ff34
|
Include link to resource in the flash message
|
2017-01-05 17:03:08 +01:00 |
|
Fernando Blat
|
13c49c1f75
|
Format text with markdown
|
2017-01-05 16:49:18 +01:00 |
|
Fernando Blat
|
dc3a917877
|
Add missing translation
|
2017-01-05 16:46:53 +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 |
|
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 |
|
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 |
|
Fernando Blat
|
ed714f7c7d
|
Add flash messages. Redirect to edit action after update
|
2017-01-05 12:56:55 +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 |
|
Fernando Blat
|
6c8060af38
|
Check the field is present before validating it
|
2017-01-05 12:45:27 +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 |
|
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 |
|
Fernando Blat
|
450fcc3e04
|
Use SQL to sum the comments
|
2017-01-05 11:14:12 +01:00 |
|
Fernando Blat
|
ba0089ac44
|
Truncate social networks text
|
2017-01-05 11:05:45 +01:00 |
|
Fernando Blat
|
7100156b28
|
Show full header when click on expand button
|
2017-01-05 10:55:53 +01:00 |
|
Fernando Blat
|
48764d757c
|
Fix label markup
|
2017-01-05 10:29:21 +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
|
fba4c79d2a
|
Show the first paragraph of the description
|
2017-01-05 09:43:40 +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 |
|
Fernando Blat
|
ab445b6bff
|
Merge pull request #52 from medialab-prado/refactor-process-phase-pages
Refactor process phases pages
|
2017-01-05 09:24:11 +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 |
|
Juanjo Bazán
|
186be1e7cc
|
adds booth_assignments controller to admin menu
|
2017-01-04 21:00:55 +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
|
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 |
|