Alberto Garcia Cabeza
9202a4f8e4
Adds styles for flag as inappropriate
2015-08-25 14:09:04 +02:00
Alberto Garcia Cabeza
6643f97195
Updates custom icons font
2015-08-25 13:51:25 +02:00
Raimond Garcia
9b9865dc18
Merge pull request #241 from AyuntamientoMadrid/initialjs-with-seed
...
Adds different avatar for users with names with the same initial
2015-08-25 13:23:22 +02:00
David Gil
026db24b2a
split long method into shorter, SRPer ones
2015-08-25 13:10:39 +02:00
Juanjo Bazán
8233aa6a3e
adds different avatar for same initial name users
2015-08-25 13:03:30 +02:00
Raimond Garcia
c55de785c9
Merge pull request #240 from AyuntamientoMadrid/update-rails
...
updates Rails version
2015-08-25 11:40:47 +02:00
Juanjo Bazán
fe78837dfc
updates Rails version
2015-08-25 09:28:43 +02:00
Jose Manuel
4c71577da6
Fixes moderators tests after merge
2015-08-25 01:14:55 +01:00
Jose Manuel
d84e80c379
Merge branch '134_create_moderator'
2015-08-25 00:07:42 +01:00
Jose Manuel
84e0e8f990
Adds testing for moderator´s admin consol
2015-08-24 23:04:10 +01:00
David Gil
86dccac9c6
adds support for Facebook OAuth
2015-08-24 20:24:54 +02:00
David Gil
af7396757f
removes omniauth link from organizations
2015-08-24 20:24:54 +02:00
David Gil
ddcef1a0f2
remove unused and locales
2015-08-24 20:24:54 +02:00
David Gil
158e203936
adds omniauth basic authentication process with Twitter, including an intermediate step to ask the user for her email if not provided by the OAuth provider - Twitter, for instance
2015-08-24 20:24:54 +02:00
David Gil
f0e47ee787
adds Identity model and migration
2015-08-24 20:24:10 +02:00
David Gil
88eb8a6cc4
adds omniauth and omniauth-twitter gems and initializer with references to secrets
2015-08-24 20:22:21 +02:00
Raimond Garcia
ee01fdaf64
Merge pull request #234 from AyuntamientoMadrid/moderator_comments
...
Moderator/Administrator comments
2015-08-24 19:05:51 +02:00
Juanjo Bazán
6d93f975e3
Merge branch 'master' into moderator_comments
2015-08-24 19:01:49 +02:00
Juanjo Bazán
82fb56e4c0
refactors comments controller ugly method
2015-08-24 18:59:53 +02:00
Raimond Garcia
26433b6a9a
Merge pull request #237 from AyuntamientoMadrid/cache
...
configures the null cache store in all environments
2015-08-24 18:56:43 +02:00
Raimond Garcia
6a2fce6c16
Merge pull request #236 from AyuntamientoMadrid/moderate-own-content
...
Do not show links to moderate own content
2015-08-24 18:55:49 +02:00
Juanjo Bazán
7edb45b0d7
configures the null cache store in all environments
...
This commit allows us to use caching and Rails.cache.
Temporarily we configure the null store in all environments,
but those will probably be memcached in the future.
References #235
2015-08-24 18:51:28 +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
c6976b0905
Adds test for not using moderation links in my own comments
2015-08-24 18:36:56 +02:00
kikito
36fb9b60b2
Use a js-class instead of an id for moderator-comment-actions
2015-08-24 18:35:59 +02:00
Juanjo Bazán
030fd49120
allows comment as moderator/administrator
...
Ref: #170
2015-08-24 18:17:04 +02:00
Juanjo Bazán
57228636c4
adds as_moderator/administrator methods to comment
2015-08-24 17:47:09 +02:00
kikito
0279c08792
fixes typo
2015-08-24 17:23:50 +02:00
Juanjo Bazán
46643185f8
adds administrator_id to comments
2015-08-24 17:22:38 +02:00
Juanjo Bazán
42348511e1
adds moderator_id to comments
2015-08-24 17:22:21 +02:00
kikito
5e31a9f338
adds a new "organization sigup success" view. Related with #226
2015-08-24 14:34:58 +02:00
Juanjo Bazán
3085f265d8
adds abilities for commenting as moderator/admin
2015-08-24 13:17:58 +02:00
Alberto Garcia Cabeza
dffb8e8a5e
Adds styles for comment as administrator
2015-08-24 12:29:35 +02:00
Alberto Garcia Cabeza
cfd25042b6
Adds styles for comment as moderator
2015-08-24 12:22:31 +02:00
Raimond Garcia
f1b625aadd
Merge pull request #230 from jjballano/196-phantomjs-dependency
...
#196 phantomjs dependency
2015-08-24 10:32:12 +02:00
jjballano
3af058bec1
PhantomJS 2.0 as a prerequisite
2015-08-24 06:30:30 +01:00
jjballano
4b0f7b54ca
PhantomJS 2.0 as a prerequisite
2015-08-24 06:25:45 +01:00
Jose Manuel
982dc180cc
Adds moderators config to admin console
2015-08-24 01:50:01 +01:00
Raimond Garcia
86ebe64dba
Merge pull request #229 from AyuntamientoMadrid/flag-as-inappropiate-171
...
Flag as inappropiate
2015-08-23 22:06:28 +02:00
kikito
c88f7c1f30
merges master and fixes conflicts
2015-08-23 20:27:11 +02:00
kikito
720630e0ab
Fixes failing spec which expected a menu id
2015-08-23 18:32:00 +02:00
Raimond Garcia
8f2cec60bf
Merge pull request #223 from AyuntamientoMadrid/improve_admin
...
Improve admin
2015-08-23 12:11:14 +02:00
Alberto Garcia Cabeza
908d19e2e7
Improves styles for admin
2015-08-23 11:45:43 +02:00
kikito
5db63228ad
Adds moderation sidebar
2015-08-23 00:02:40 +02:00
kikito
5eeaa7d189
implements /moderation/debates
2015-08-22 23:20:55 +02:00
kikito
47842cb1cc
Refactors spec/features/moderation/comments_spec
2015-08-22 20:56:05 +02:00
kikito
169809496e
Adds filters & refactors to comment moderation
2015-08-22 20:28:48 +02:00
kikito
8bc92811b6
Adds traits to debate & comment factories
2015-08-22 20:20:47 +02:00
kikito
9785749057
Refactors organization factories & admin controller
2015-08-22 19:46:28 +02:00
