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 |
|
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
|
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 |
|
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 |
|
rgarcia
|
abd8cd2faf
|
fixes translations
|
2017-01-14 17:13:59 +01:00 |
|
rgarcia
|
7aba8ef299
|
adds specs
|
2017-01-14 17:02:45 +01:00 |
|
rgarcia
|
79767b5f1d
|
adds translations
|
2017-01-14 17:02:41 +01:00 |
|
rgarcia
|
68bf119c18
|
sends unfeasible budget investment
|
2017-01-14 17:02:33 +01:00 |
|
Fernando Blat
|
f1be212eeb
|
Fix and complete controller specs
|
2017-01-14 16:56:55 +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
|
d253c4c09f
|
Restore custom position
|
2017-01-14 16:42:59 +01:00 |
|
Fernando Blat
|
755ddab2cb
|
Amend translations
|
2017-01-14 16:42:59 +01:00 |
|
Fernando Blat
|
72ff1de2ab
|
CSS fix
|
2017-01-14 16:42:59 +01:00 |
|
Fernando Blat
|
17a68f5c14
|
Load annotations on click event
|
2017-01-14 16:42:57 +01:00 |
|
Fernando Blat
|
4431d95d31
|
Basic annotation creation
|
2017-01-14 16:42:12 +01:00 |
|
Fernando Blat
|
4fe656bdd4
|
Merge pull request #61 from medialab-prado/50-draft-final-version
Drafts final version
|
2017-01-14 16:35:15 +01:00 |
|
rgarcia
|
11a8086599
|
adds specs
|
2017-01-14 16:12:45 +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 |
|
Raimond Garcia
|
a67bf44f9e
|
Merge pull request #1351 from consul/budget-vote-text
displays appropriate vote info depending on phase
|
2017-01-13 21:27:00 +01:00 |
|
rgarcia
|
6d71cd985c
|
displays appropriate vote info depending on phase
|
2017-01-13 21:15:08 +01:00 |
|
Amaia Castro
|
49f4bf5bc5
|
Destroy object when their parent object is destroyed
|
2017-01-13 19:34:17 +01:00 |
|
Amaia Castro
|
49e66a431c
|
Check phase dates and that draft version is not final before creating annotations
|
2017-01-13 19:11:05 +01:00 |
|
Raimond Garcia
|
4c818bfcc4
|
Merge pull request #1349 from consul/budgets-vote-permissions
User permissions for selecting phase
|
2017-01-13 18:34:31 +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 |
|
rgarcia
|
17946b292b
|
fixes specs
|
2017-01-13 16:37:39 +01:00 |
|
Martín González
|
db8084ddb8
|
Fix merge
|
2017-01-13 16:21:38 +01:00 |
|
Martín González
|
5a5fed975a
|
Push changes
|
2017-01-13 16:19:57 +01:00 |
|
Martín González
|
02d49266e0
|
Increase margin on questions to fix a cosmetic issue
|
2017-01-13 16:14:44 +01:00 |
|