Alberto Garcia Cabeza
|
c0eb46288c
|
Improves header, footer and debates mobile styles
|
2015-08-29 00:34:49 +02:00 |
|
Alberto Garcia Cabeza
|
13fe1dcb9f
|
Changes bg images, adds favicon and alerts styles
|
2015-08-29 00:33:40 +02:00 |
|
Juanjo Bazán
|
b04f257498
|
Merge pull request #267 from AyuntamientoMadrid/flag-renaming
Admin users/comments/debates
|
2015-08-28 12:20:56 +02:00 |
|
kikito
|
a0dafc68e8
|
Merge branch 'master' into flag-renaming
|
2015-08-28 12:00:32 +02:00 |
|
kikito
|
9328e1401f
|
Adds user admin capabilities and missing i18n entries
|
2015-08-28 12:00:18 +02:00 |
|
kikito
|
697d629aab
|
Adds comfirmed_hide_at to users
|
2015-08-28 10:59:30 +02:00 |
|
kikito
|
a5e48693fe
|
Implements admin interface for Comments incl. filters
|
2015-08-28 10:56:43 +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 |
|
kikito
|
e07ae71fff
|
Refactors query-parameter-related tests
|
2015-08-27 19:05:50 +02:00 |
|
kikito
|
fb9d3097cc
|
Finishes admin interface for debates
|
2015-08-27 19:05:27 +02:00 |
|
Juanjo Bazán
|
1d997d4929
|
fixes build, changes i18n ignored keys and specs
ref: #254
|
2015-08-27 18:08:56 +02:00 |
|
Juanjo Bazán
|
caf3e5ee74
|
Merge pull request #254 from mlovic/filter-debates
Add filters to specify order of debates on /debates page
|
2015-08-27 17:41:31 +02:00 |
|
Marko Lovic
|
e8004ca1d3
|
Add to javascript to handle debates order change
|
2015-08-27 17:18:07 +02:00 |
|
Alberto Garcia Cabeza
|
42a0cffefc
|
Adds new texts on header, debates and footer
|
2015-08-27 17:11:01 +02:00 |
|
Alberto Garcia Cabeza
|
900f00b443
|
Adds new texts on header, debates and footer
|
2015-08-27 16:46:47 +02:00 |
|
kikito
|
ad3b689a22
|
remove duplicated migration
|
2015-08-27 16:32:16 +02:00 |
|
Juanjo Bazán
|
ec7da85949
|
updates uglier version (security bug release)
|
2015-08-27 16:13:40 +02:00 |
|
Marko Lovic
|
bfeff8d241
|
Implement custom rspec matcher appear_before
|
2015-08-27 15:24:59 +02:00 |
|
Marko Lovic
|
f5622b3425
|
Assign each test debate to one variable
|
2015-08-27 15:24:59 +02:00 |
|
Marko Lovic
|
b6df3be8c0
|
Change Debate.sort_by method for individual scopes
|
2015-08-27 15:24:59 +02:00 |
|
Marko Lovic
|
6f32801a88
|
Change names of debate order filters
* 'news' to 'created_at'
* 'votes' to 'total_votes'
* 'rated' to 'likes'
|
2015-08-27 15:24:59 +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
|
599ea9a19f
|
force ssl in production
|
2015-08-27 14:23:34 +02:00 |
|
kikito
|
1770dfd3f6
|
adds ability to confirm the hiding of comments, debates or users
|
2015-08-27 13:20:12 +02:00 |
|
kikito
|
4ab5ab722e
|
hide_reviewed_at -> confirmed_hide_at
|
2015-08-27 12:23:10 +02:00 |
|
kikito
|
cd982768f2
|
Renames the "archive" action to "ignore_flag" (+)
* archived_at -> ignored_flag_at
* archived? -> ignored_flag?
* archive -> ignore_flag
* pending -> pending_flag_review
* archived (scope) -> with_ignored_flag
* I18n changes
|
2015-08-27 11:43:58 +02:00 |
|
kikito
|
17b33f1030
|
rename flag_ignored_at to ignored_flag_at in migrations
|
2015-08-27 11:08:10 +02:00 |
|
Raimond Garcia
|
c806547c1a
|
Merge pull request #257 from AyuntamientoMadrid/social_networks
Social networks
|
2015-08-27 10:52:10 +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 |
|
kikito
|
a3e983f154
|
remove unused flagged_as_inappropiate_at column from debates and comments
|
2015-08-27 10:35:13 +02:00 |
|
kikito
|
b640fcb398
|
Rename inappropiate_flags_count field to flags_count
|
2015-08-27 10:18:31 +02:00 |
|
kikito
|
b9dce31a4d
|
Adds migrations for renaming and new flagging field
* inappropiate_flags table becomes flags
* [comments|debates].archived_at becomes flag_ignored_at
* Add new [comments|debates].hide_reviewed_at
|
2015-08-27 10:11:45 +02:00 |
|
Alberto Garcia Cabeza
|
9cd2297b67
|
Updates tests for social sign up
|
2015-08-26 20:36:52 +02:00 |
|
Alberto Garcia Cabeza
|
ad9e2cc637
|
Adds styles for social share and auth
|
2015-08-26 20:32:48 +02:00 |
|
Raimond Garcia
|
9ab13abf20
|
Merge pull request #256 from AyuntamientoMadrid/improve_emails
Improve emails
|
2015-08-26 20:06:28 +02:00 |
|
Raimond Garcia
|
4bd5ff0116
|
Merge pull request #253 from AyuntamientoMadrid/counter-cache-comments
Counter cache column for Debate's comments
|
2015-08-26 20:05:57 +02:00 |
|
Raimond Garcia
|
59dadb96e2
|
Merge pull request #255 from AyuntamientoMadrid/bullet
Bullet
|
2015-08-26 20:01:59 +02:00 |
|
Alberto Garcia Cabeza
|
33b501d98e
|
Improves texts for instructions emails
|
2015-08-26 19:43:51 +02:00 |
|
Alberto Garcia Cabeza
|
4382a83c30
|
Fixes asset host for development
|
2015-08-26 19:43:12 +02:00 |
|
Alberto Garcia Cabeza
|
86369200ba
|
Adds mailer layout to instructions emails
|
2015-08-26 19:42:51 +02:00 |
|
kikito
|
b9634cffab
|
Adds User#for_render
|
2015-08-26 19:41:55 +02:00 |
|
kikito
|
48ef4df0c3
|
Adds Comment#for_render
|
2015-08-26 19:41:42 +02:00 |
|
kikito
|
9112cacde4
|
Adds Debate#for_render
|
2015-08-26 19:40:37 +02:00 |
|
Alberto Garcia Cabeza
|
8ac5abb7bc
|
Updates custom icons font
|
2015-08-26 19:06:12 +02:00 |
|
Alberto Garcia Cabeza
|
522e40b9ce
|
Adds styles to instructions emails
|
2015-08-26 18:51:53 +02:00 |
|
Alberto Garcia Cabeza
|
4e8b281a23
|
Adds styles to comment and reply emails
|
2015-08-26 18:51:29 +02:00 |
|
Juanjo Bazán
|
dacbe27fda
|
uses cache counter for debate's comments
|
2015-08-26 17:26:17 +02:00 |
|
Juanjo Bazán
|
5d112ac2bf
|
adds after_hide hook to paranoid aliases
|
2015-08-26 17:24:11 +02:00 |
|