Commit Graph

5383 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
86360a8719 shows fixed bar only in correct heading on voting phase 2017-01-17 18:59:12 +01:00
Alberto Garcia Cabeza
2aaf917510 adds different back link if headings count equal to 1 2017-01-17 18:16:50 +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
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
68fc922fda autolinks budget description 2017-01-17 13:07:07 +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
00b488fe84 Merge branch 'master' into legislation-module-stable 2017-01-17 10:46:33 +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
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
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
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
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
rgarcia
68bf119c18 sends unfeasible budget investment 2017-01-14 17:02:33 +01:00
Fernando Blat
046c021c0c Complete create comment details 2017-01-14 16:43:40 +01:00
Fernando Blat
f47cef5a93 Highlight text when creating a comment 2017-01-14 16:43:26 +01:00
Fernando Blat
755ddab2cb Amend translations 2017-01-14 16:42:59 +01:00
Fernando Blat
4431d95d31 Basic annotation creation 2017-01-14 16:42:12 +01:00
rgarcia
82322ee233 sends budget investment created email 2017-01-14 16:10:43 +01:00
Raimond Garcia
7f88100599 Merge pull request #1352 from consul/feasibility_link
Feasibility index
2017-01-14 12:36:26 +01:00
Juanjo Bazán
36140e0ce3 adds link to unfeasible investments to index page 2017-01-14 11:33:49 +01:00
rgarcia
6d71cd985c displays appropriate vote info depending on phase 2017-01-13 21:15:08 +01:00
Martín González
eadf933c22 Change debate questions class to avoid colliding with other CSS 2017-01-13 16:42:59 +01:00
Martín González
5a5fed975a Push changes 2017-01-13 16:19:57 +01:00
Martín González
1cf074a297 Fix identation and markup issue on the legislation question page 2017-01-13 15:41:23 +01:00
rgarcia
b2b9954e6d allows user to support only in one heading per group 2017-01-13 15:24:57 +01:00
Martín González
046bcbfb0f Fix small header toggle 2017-01-12 12:48:14 +01:00
Martín González
a0011b7c5c More css fixes 2017-01-12 11:55:12 +01:00
Martín González
203bc740ac Adjust home and process index styles 2017-01-12 10:54:39 +01:00
Amaia Castro
306e3fa59f Don’t show comments panel if seeing final version 2017-01-11 23:11:11 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
Amaia Castro
f974883556 Refactor legislation comments partials 2017-01-11 16:27:22 +01:00
Amaia Castro
4a5276f089 Revert change in admin namespace helper and redefine it in the controller 2017-01-11 15:43:46 +01:00
Juanjo Bazán
bdb55805a1 uses back_link_helper all around 2017-01-11 13:03:12 +01:00
Juanjo Bazán
b4b8e4f787 fixes investment back link to avoid pointing to /new action 2017-01-11 13:02:46 +01:00
Juanjo Bazán
7ef481ef0c Merge pull request #1337 from consul/devise-views
Devise views
2017-01-11 12:38:41 +01:00
Juanjo Bazán
9f55b7bc84 removes link from 'My activity' page if feature is disabled 2017-01-10 21:28:39 +01:00
Amaia Castro
4f539b374f View comments for draft text 2017-01-10 17:25:02 +01:00