Enrique García
|
72787b6284
|
Merge pull request #485 from juandefelix/keep-filter
Conservar orden de búsqueda al hacer click en "Volver"
|
2015-09-22 16:41:20 +02:00 |
|
Enrique García
|
f3253d02d6
|
Merge pull request #524 from dgilperez/ie_alert_cookie
Cookie for IE alert
|
2015-09-22 16:38:31 +02:00 |
|
Juanjo Bazán
|
7ca3f574d8
|
logs activity: hiding debates
|
2015-09-22 16:35:38 +02:00 |
|
Juanjo Bazán
|
5aa5fc5b7f
|
logs activity when bulk-hiding proposals
|
2015-09-22 16:30:44 +02:00 |
|
Juanjo Bazán
|
23eba622a2
|
fix bug when blocking users
|
2015-09-22 16:30:43 +02:00 |
|
Juanjo Bazán
|
1047df11a1
|
includes hidden relations by default
|
2015-09-22 16:30:43 +02:00 |
|
Juanjo Bazán
|
7741023e6a
|
adds activity page to administration
|
2015-09-22 16:30:43 +02:00 |
|
Juanjo Bazán
|
05237ca1e2
|
adds scopes for every actionable class to activity
|
2015-09-22 16:30:43 +02:00 |
|
Juanjo Bazán
|
9e922ad080
|
adds activity model
|
2015-09-22 16:30:43 +02:00 |
|
Juanjo Bazán
|
5d7e0c9dc1
|
adds activities
|
2015-09-22 16:30:43 +02:00 |
|
Alberto Garcia Cabeza
|
34c8dd0b8a
|
Adds social share for supported proposals
|
2015-09-22 16:04:54 +02:00 |
|
Juanjo Bazán
|
e097e800ea
|
Merge pull request #537 from AyuntamientoMadrid/debates-moderation-530
refactors Debates&Comments moderation
|
2015-09-22 14:42:26 +02:00 |
|
kikito
|
3b405f3e29
|
changes css style name to avoid conflicts
|
2015-09-22 14:23:11 +02:00 |
|
kikito
|
343025872b
|
changes comment moderation to be similar to proposals moderation
|
2015-09-22 14:20:37 +02:00 |
|
kikito
|
69e74c4207
|
Style in comment moderation
|
2015-09-21 16:12:55 +02:00 |
|
kikito
|
12f1796e7b
|
Merge branch 'master' into debates-moderation-530
|
2015-09-21 15:52:25 +02:00 |
|
kikito
|
757205a93e
|
Unifies bulk & debates moderation forms in a single one
|
2015-09-21 15:41:01 +02:00 |
|
Enrique García
|
efee531612
|
Merge pull request #536 from AyuntamientoMadrid/proposals-full-text
Adds animation on proposals full text
|
2015-09-21 14:19:41 +02:00 |
|
Alberto Garcia Cabeza
|
80d4d2ff7a
|
Adds animation on proposals full text
|
2015-09-21 13:14:14 +02:00 |
|
Juanjo Bazán
|
1aec1fcd01
|
Merge pull request #535 from AyuntamientoMadrid/proposals-full-text
displays the complete text of the proposal in the moderation interface
|
2015-09-21 13:05:35 +02:00 |
|
kikito
|
1d5904d478
|
displays the complete text of the proposal in the moderation interface
|
2015-09-21 12:47:13 +02:00 |
|
Enrique García
|
8fc2058bd9
|
Merge pull request #529 from AyuntamientoMadrid/moderation-changes
changes moderation/proposals: only show flagged except in 'All' filter
|
2015-09-21 11:57:01 +02:00 |
|
juandefelix
|
b519cb75fa
|
added warning text underneath omniauth sign up links
|
2015-09-19 20:36:16 -05:00 |
|
juandefelix
|
5e4f134c72
|
added javascript to the test
|
2015-09-19 20:06:56 -05:00 |
|
juandefelix
|
311827a83b
|
renamed test
|
2015-09-19 19:03:05 -05:00 |
|
juandefelix
|
09b751bda9
|
"Back" link directs to previous page
|
2015-09-19 19:00:11 -05:00 |
|
juandefelix
|
85abd92263
|
added test for "Back" link in debates/show page
|
2015-09-19 18:59:41 -05:00 |
|
juandefelix
|
8481557e93
|
rolling back changes
|
2015-09-19 18:40:45 -05:00 |
|
Juanjo Bazán
|
119e3c3f24
|
Merge pull request #527 from AyuntamientoMadrid/comments-count-452
Comments count
|
2015-09-18 14:39:52 +02:00 |
|
Juanjo Bazán
|
7168a4723d
|
updates dependencies
|
2015-09-18 14:24:57 +02:00 |
|
Juanjo Bazán
|
37c696bde8
|
changes moderation/proposals: only show flagged
To view all use the filter "All".
|
2015-09-18 14:00:29 +02:00 |
|
Juanjo Bazán
|
b7185bfdf1
|
moves social media icon to asset pipeline
|
2015-09-18 13:06:29 +02:00 |
|
Juanjo Bazán
|
1d2717a137
|
improves social cards info for proposals
|
2015-09-18 12:34:44 +02:00 |
|
Juanjo Bazán
|
a60fdc8ccd
|
sets debate's title as title page in debate/show
|
2015-09-18 12:34:14 +02:00 |
|
Enrique García
|
cd5847f263
|
Merge pull request #528 from AyuntamientoMadrid/social-media-tags
adds social media meta tags for proposals
|
2015-09-18 11:57:53 +02:00 |
|
Juanjo Bazán
|
d6c38b17ba
|
adds social media meta tags for proposals
|
2015-09-18 11:48:42 +02:00 |
|
kikito
|
af1b2fc217
|
adds rake task to recalculate all comment counts in proposals and comments
|
2015-09-18 11:00:18 +02:00 |
|
kikito
|
793bc52d00
|
recalculates comments_count when restoring in addition to when hiding a comment
|
2015-09-18 11:00:18 +02:00 |
|
kikito
|
1e8605fa28
|
Replaces it "should xx" by it "xxs" in comment_spec
|
2015-09-18 11:00:18 +02:00 |
|
Enrique García
|
fcdfe2341e
|
Merge pull request #525 from AyuntamientoMadrid/videos
Adds new playlist video on more info pages
|
2015-09-18 10:55:57 +02:00 |
|
Alberto Garcia Cabeza
|
e502884259
|
Adds new playlist video on more info pages
|
2015-09-18 10:27:26 +02:00 |
|
Enrique García
|
3bd30efc46
|
Merge pull request #522 from dgilperez/accessibility_improvements
Accesibilidad y initialjs
|
2015-09-18 10:03:26 +02:00 |
|
David Gil
|
35933dec9a
|
adds a test for ie alert, faking browser and button click
|
2015-09-18 01:29:44 +02:00 |
|
David Gil
|
e8f1d627b1
|
binds the ie alert close link to a cookie that will be checked before showing the alert the next time
|
2015-09-18 01:25:55 +02:00 |
|
David Gil
|
47f47c17b3
|
bumps initialjs-rails to get alt attributes in avatar img tags, for accessibility
|
2015-09-17 23:41:39 +02:00 |
|
kikito
|
61f1dfe2e8
|
makes the comment in application.scss shorter
|
2015-09-17 17:41:35 +02:00 |
|
Juanjo Bazán
|
2ffb22a249
|
Merge pull request #519 from AyuntamientoMadrid/fix-tagcloud-488
Fix tagcloud
|
2015-09-17 17:24:39 +02:00 |
|
Enrique García
|
9d774adfb5
|
Merge pull request #517 from AyuntamientoMadrid/minor_improves
Minor improves
|
2015-09-17 17:24:08 +02:00 |
|
Enrique García
|
40b539bdda
|
Merge pull request #504 from dgilperez/tags_in_search
Incluyendo etiquetas en el buscador de debates
|
2015-09-17 17:17:14 +02:00 |
|
Enrique García
|
2e473237c3
|
Merge pull request #518 from AyuntamientoMadrid/moderating-comments
Moderating comments
|
2015-09-17 17:14:07 +02:00 |
|