Commit Graph

4758 Commits

Author SHA1 Message Date
Amaia Castro
b8e0a5e7a5 Merge pull request #84 from medialab-prado/alert-when-leaving-form
Ask for confirmation when changing the page and the forms watched do have changes
2017-01-18 16:48:27 +01:00
Amaia Castro
d80d1f7afa Merge pull request #83 from medialab-prado/75-unify-font-size-header
Unify processes header type
2017-01-18 16:46:48 +01:00
Martín González
bf91f0731d Fix list alignment and markdown renderer quirk 2017-01-18 15:26:23 +01:00
Martín González
bf1a23bd53 Add styles for uls 2017-01-18 15:02:32 +01:00
Martín González
90e071c218 Unify processes header type 2017-01-18 14:56:09 +01:00
Amaia Castro
67a3162aa5 Merge pull request #82 from medialab-prado/76-key-dates-svg-margin
Full width key dates, fix SVG margin
2017-01-18 14:55:25 +01:00
Fernando Blat
6560e77554 Ask for confirmation when changing the page and
the forms watched do have changes
2017-01-18 13:37:11 +01:00
Martín González
076c5d2784 Use the full width key dates html where is possible, fix svg margin 2017-01-18 13:05:16 +01:00
Amaia Castro
4afb472054 Merge pull request #81 from medialab-prado/80-fix-small-header
Refactor header toggle and show additional info on the small header
2017-01-18 12:50:15 +01:00
Martín González
146db24d58 Refactor header toggle and show additional info on the small header 2017-01-18 12:26:45 +01:00
Fernando Blat
f4719f1086 Merge pull request #74 from medialab-prado/71-only-show-root-comments
Show only first level comments in comments box for annotations
2017-01-18 11:18:35 +01:00
Amaia Castro
4b04b93f50 Show only first level comments in comments box for annotations 2017-01-17 17:40:04 +01:00
Fernando Blat
5c3f87c4a2 Merge pull request #70 from medialab-prado/reorganize-locale-files
Change comments texts in legislation questions
2017-01-17 16:39:08 +01:00
Amaia Castro
6c36fde6cc Merge branch 'master' into legislation-module-stable 2017-01-17 15:45:33 +01:00
Amaia Castro
53e9837db3 Change texts for legislation questions comments 2017-01-17 15:42:42 +01:00
Fernando Blat
ac810dbbcc Merge pull request #67 from medialab-prado/65-remove-hightligthing
Remove highligthing and fix links
2017-01-17 15:41:27 +01:00
Juanjo Bazán
6c227547e2 updates travis script and matrix 2017-01-17 14:25:21 +01:00
Juanjo Bazán
9809ac6129 adds new knapsack spec report 2017-01-17 14:25:03 +01:00
Juanjo Bazán
6194b74a91 regenerates knapsack report in Travis 2017-01-17 14:00:36 +01:00
Juanjo Bazán
f6989bbb55 Merge pull request #1358 from consul/budget-unfeasibles
Budget unfeasibles
2017-01-17 13:43:48 +01:00
Juanjo Bazán
555cc4529b removes focus 2017-01-17 13:33:45 +01:00
Juanjo Bazán
68fc922fda autolinks budget description 2017-01-17 13:07:07 +01:00
Amaia Castro
108d788985 Extract legislation translations to another yml file 2017-01-17 10:58:33 +01:00
Amaia Castro
327fa6bce5 Remove link to non existing comments 2017-01-17 10:47:33 +01:00
Amaia Castro
30cb7fe7b4 Fix link 2017-01-17 10:47:33 +01:00
Amaia Castro
7be2901535 Only highlight text and send request if phase is open 2017-01-17 10:47:33 +01:00
Amaia Castro
00b488fe84 Merge branch 'master' into legislation-module-stable 2017-01-17 10:46:33 +01:00
rgarcia
dc2bfbdc97 fixes specs 2017-01-16 19:49:04 +01:00
Amaia Castro
e651ef5b9c Merge pull request #59 from medialab-prado/18-create-comment
Create annotations and comments
2017-01-16 19:30:45 +01:00
Amaia Castro
65fcd83ee5 Don’t show new annotation/comment form if allegations phase is not open 2017-01-16 19:06:06 +01:00
Alberto Garcia Cabeza
56694debfd removes duplicated social buttons on investment show 2017-01-16 18:49:19 +01:00
Alberto Garcia Cabeza
45450d74ff improves styles for unfeasible investments 2017-01-16 18:45:42 +01:00
Alberto
868ed78488 Merge pull request #1348 from aspgems/custom_settings_scss
Add custom setting for foundation variables.
2017-01-16 17:58:05 +01:00
Amaia Castro
ce6b278f55 Merge pull request #60 from medialab-prado/frontend-improvements
Frontend improvements
2017-01-16 11:58:45 +01:00
rgarcia
5f7269a070 displays unfeasible budgets link from home 2017-01-16 03:09:08 +01:00
Alberto
0ef7afa82f Merge pull request #1357 from consul/budget-permissions
displays appropriate permission messages in accepting phase
2017-01-15 21:11:15 +01:00
rgarcia
fa9cb00c65 displays appropriate permission messages in accepting phase 2017-01-15 20:37:44 +01:00
Raimond Garcia
69c043a886 Merge pull request #1356 from consul/budget-emails
Budget emails
2017-01-15 19:15:39 +01:00
rgarcia
0f1a98da7d fixes conflicts with master 2017-01-15 19:04:12 +01:00
rgarcia
537de8c46c Merge branch 'master' into budget-emails 2017-01-15 18:58:20 +01:00
Raimond Garcia
13985dfa45 Merge pull request #1355 from consul/budget-tags
Displays tag cloud in all phases
2017-01-15 18:49:20 +01:00
Alberto Garcia Cabeza
9741ee859a updates i18n and specs 2017-01-15 14:02:08 +01:00
Alberto Garcia Cabeza
1de39edf92 adds styles and i18n for mailer budget investment created 2017-01-15 13:52:09 +01:00
Alberto Garcia Cabeza
61450cb48f adds social share buttons on investments show 2017-01-15 13:51:45 +01:00
rgarcia
289666bb4d loads tag cloud in balloting phase 2017-01-15 12:08:41 +01:00
rgarcia
938ba40306 loads categories in sidebar for balloting phase 2017-01-15 12:06:38 +01:00
rgarcia
42604e27b9 Displays tag cloud in all phases 2017-01-15 09:55:01 +01:00
Raimond Garcia
3038e841e0 Merge pull request #1353 from consul/verified-admin
verifies admin in dev seeds
2017-01-14 21:57:51 +01:00
Alberto Garcia Cabeza
e18751ce5c verifies admin in dev seeds 2017-01-14 18:14:32 +01:00
Fernando Blat
819c9efcc3 Fix and complete feature specs 2017-01-14 17:19:27 +01:00