Juanjo Bazán
|
9f4a98d3a0
|
moves translation keys
|
2015-09-01 17:49:02 +02:00 |
|
Alberto Garcia Cabeza
|
bcc58ab0c4
|
Adds styles for too much anonymous votes
|
2015-09-01 17:49:02 +02:00 |
|
Alberto Garcia Cabeza
|
57e373a7cf
|
Adds styles for too much anonymous comments
|
2015-09-01 17:49:02 +02:00 |
|
Raimond Garcia
|
3c665153d4
|
Merge pull request #300 from AyuntamientoMadrid/flag-helper
Flag helper
|
2015-09-01 15:19:16 +02:00 |
|
kikito
|
9a071d2ed7
|
Renames @voted_values to @debate_votes in controllers
|
2015-09-01 13:07:03 +02:00 |
|
kikito
|
005fd4c09a
|
Replaces can? :flag/:unflag by a helper function
|
2015-09-01 10:34:46 +02:00 |
|
Juanjo Bazán
|
7246c181d5
|
adds cache to _debate view
|
2015-08-31 20:40:48 +02:00 |
|
kikito
|
a7929c607d
|
adds a helper to simplify the way selects and filters are rendered
|
2015-08-28 20:07:45 +02:00 |
|
kikito
|
ae98ba3572
|
merges master and fixes conflicts
|
2015-08-28 19:57:28 +02:00 |
|
Raimond Garcia
|
b1117dd1af
|
Merge pull request #275 from mlovic/filter-topic
Allow debates to be filtered by topic
|
2015-08-28 17:41:38 +02:00 |
|
Marko Lovic
|
c11b611b1a
|
Combine debates topic and order filters
|
2015-08-28 17:23:36 +02:00 |
|
kikito
|
088144dcd1
|
Refactor debates order select using js-location-changer
|
2015-08-28 17:17:21 +02:00 |
|
Marko Lovic
|
e35550dafa
|
Remove order_selector partial
Most of the logic was pulled out into DebatesHelper so having
the partial no longer makes sense.
|
2015-08-28 15:43:09 +02:00 |
|
Marko Lovic
|
4285ba4bb3
|
Add tag filter to debates page
|
2015-08-28 12:41:10 +02:00 |
|
kikito
|
a0dafc68e8
|
Merge branch 'master' into flag-renaming
|
2015-08-28 12:00:32 +02:00 |
|
Raimond Garcia
|
b8fe857ab1
|
Merge pull request #263 from AyuntamientoMadrid/include_texts
Include texts
|
2015-08-28 10:07:33 +02:00 |
|
kikito
|
76c2f2f021
|
Merge branch 'master' into flag-renaming
|
2015-08-27 19:06:29 +02:00 |
|
Marko Lovic
|
e8004ca1d3
|
Add to javascript to handle debates order change
|
2015-08-27 17:18:07 +02:00 |
|
Alberto Garcia Cabeza
|
900f00b443
|
Adds new texts on header, debates and footer
|
2015-08-27 16:46:47 +02:00 |
|
Marko Lovic
|
2d48966de3
|
Change variable name and references from "filter" to "order"
|
2015-08-27 15:24:59 +02:00 |
|
Marko Lovic
|
ccaca54816
|
Add filters to specify order of debates#index
|
2015-08-27 15:24:59 +02:00 |
|
kikito
|
909dfb4ce3
|
Several renamings
InappropiateFlag -> Flag
x.flag_as_inappropiate -> x.flag
x.undo_flag_as_inappropiate -> x.unflag
X.flagged_as_inappropiate -> x.flagged
flag-as-inappropiate-actions views & css -> flag-actions views & css
|
2015-08-27 10:48:49 +02:00 |
|
Juanjo Bazán
|
dacbe27fda
|
uses cache counter for debate's comments
|
2015-08-26 17:26:17 +02:00 |
|
kikito
|
015fe704e4
|
Fixes flagging specs by making them id-based instead of text-based
|
2015-08-26 13:14:42 +02:00 |
|
kikito
|
c183cf2cc6
|
merges master and fix conflicts
|
2015-08-25 19:31:25 +02:00 |
|
Alberto Garcia Cabeza
|
9202a4f8e4
|
Adds styles for flag as inappropriate
|
2015-08-25 14:09:04 +02:00 |
|
Juanjo Bazán
|
8233aa6a3e
|
adds different avatar for same initial name users
|
2015-08-25 13:03:30 +02:00 |
|
kikito
|
be6a5f4f1d
|
Adds test for not showing moderator actions in own debate
|
2015-08-24 18:45:47 +02:00 |
|
kikito
|
e68ee3ffae
|
Replaces id by js-class in moderator-debate-actions
|
2015-08-24 18:45:22 +02:00 |
|
kikito
|
c88f7c1f30
|
merges master and fixes conflicts
|
2015-08-23 20:27:11 +02:00 |
|
Alberto Garcia Cabeza
|
570169af57
|
Changes icons classes names
|
2015-08-22 14:46:26 +02:00 |
|
Alberto Garcia Cabeza
|
ff6285d114
|
Improves general styles
|
2015-08-21 18:57:09 +02:00 |
|
kikito
|
12e8cf2056
|
Allows flagging debates as inappropriate
|
2015-08-20 19:26:36 +02:00 |
|
Juanjo Bazán
|
b340d7741a
|
adds hiding users by moderators
|
2015-08-20 13:16:37 +02:00 |
|
Juanjo Bazán
|
3732b7f420
|
adds pagination to 1st level comments in debate
Ref: #80
|
2015-08-19 16:32:39 +02:00 |
|
Juanjo Bazán
|
947514fbfc
|
adds pagination to debates#index
Ref: #80
|
2015-08-19 16:30:25 +02:00 |
|
Juanjo Bazán
|
d2ac8b7f43
|
applies hidden users styles commented
|
2015-08-19 16:22:24 +02:00 |
|
Alberto Garcia Cabeza
|
2eccd30eff
|
Adds styles for deleted users, improves previous
|
2015-08-19 15:01:10 +02:00 |
|
Alberto Garcia Cabeza
|
04db8112b4
|
Adds styles for associations comments
|
2015-08-19 11:53:35 +02:00 |
|
Alberto Garcia Cabeza
|
4b59105be5
|
Adds filters for topics
|
2015-08-17 15:00:59 +02:00 |
|
Alberto Garcia Cabeza
|
f485225250
|
Merge branch 'master' into titles_and_filters
|
2015-08-17 14:53:48 +02:00 |
|
Alberto Garcia Cabeza
|
43f8db8e3a
|
Adds styles for titles and filters
|
2015-08-17 14:53:00 +02:00 |
|
rgarcia
|
f31ed2940d
|
adds moderation to comments and debates [#136]
|
2015-08-17 13:39:31 +02:00 |
|
rgarcia
|
a81612b226
|
improves consistency of error messages [#110]
|
2015-08-16 15:57:09 +02:00 |
|
David Gil
|
8b89cc5117
|
adds some js to click-and-add tags to the debate's tag list input
|
2015-08-15 18:57:27 +02:00 |
|
David Gil
|
1de941d1fa
|
adding featured tags list to debate form
|
2015-08-15 18:36:10 +02:00 |
|
Alberto Garcia Cabeza
|
09d71ad84f
|
Merge branch 'master' into improving_debates
Conflicts:
app/assets/stylesheets/debates.scss
app/assets/stylesheets/participacion.scss
|
2015-08-15 01:45:56 +02:00 |
|
Alberto Garcia Cabeza
|
4d8b0a01ce
|
Includes count number of comments on debate show
|
2015-08-15 01:13:34 +02:00 |
|
Alberto Garcia Cabeza
|
f98510cea7
|
Improves styles for simple captcha
|
2015-08-15 01:05:00 +02:00 |
|
David Gil
|
2b16716ee1
|
add author-photo css class to author avatar
|
2015-08-14 21:16:53 +02:00 |
|