Commit Graph

5383 Commits

Author SHA1 Message Date
Juanjo Bazán
ad435040bd adds helper to fix links to commentable 2017-01-10 13:54:50 +01:00
Alberto Garcia Cabeza
508de35320 polishes forms styles on devise views 2017-01-09 19:10:15 +01:00
Alberto Garcia Cabeza
201a222cd3 improves styles for omniauth buttons 2017-01-09 18:49:29 +01:00
Alberto Garcia Cabeza
42d147a462 changes general styles for devise layout 2017-01-09 18:07:04 +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
Alberto Garcia Cabeza
f9c4649fd1 adds active class on subnavigation for budgets investments 2017-01-09 17:09:40 +01:00
Amaia Castro
f43f13e826 Create first comment automatically from the annotation 2017-01-09 17:03:00 +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
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
Alberto Garcia Cabeza
8722699cd8 fixes typos and spec for budgets investments 2017-01-08 22:17:14 +01:00
rgarcia
b4cd1ea9d7 merges with budgets 2017-01-08 19:58:53 +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
kikito
b7a0aa3b57 Fixes i18n errors now that they are detected by i18n-tasks 2017-01-06 19:55:23 +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
Alberto Garcia Cabeza
f503c492f3 improves styles for budgets investments ballot and votes 2017-01-05 17:43:57 +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
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
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
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
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
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
rgarcia
dde1d34172 fixes conflicts with master 2017-01-05 01:56:35 +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