rgarcia
65a91ae821
configures ssl for staging and production environments
2015-08-25 16:01:43 +02:00
Alberto Garcia Cabeza
8037a82fef
Adds styles to moderation admin
2015-08-25 15:19:54 +02:00
David Gil
59aede5b00
adds Google OAuth2 support
2015-08-25 14:15:24 +02:00
Alberto Garcia Cabeza
9202a4f8e4
Adds styles for flag as inappropriate
2015-08-25 14:09:04 +02: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
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
88eb8a6cc4
adds omniauth and omniauth-twitter gems and initializer with references to secrets
2015-08-24 20:22:21 +02:00
Juanjo Bazán
6d93f975e3
Merge branch 'master' into moderator_comments
2015-08-24 19:01: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
0279c08792
fixes typo
2015-08-24 17:23:50 +02:00
kikito
5e31a9f338
adds a new "organization sigup success" view. Related with #226
2015-08-24 14:34: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
Jose Manuel
982dc180cc
Adds moderators config to admin console
2015-08-24 01:50:01 +01:00
kikito
c88f7c1f30
merges master and fixes conflicts
2015-08-23 20:27:11 +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
169809496e
Adds filters & refactors to comment moderation
2015-08-22 20:28:48 +02:00
kikito
4f0c49f921
Changes moderation/comments to allow for different commentable_types
2015-08-22 09:15:20 +02:00
Juanjo Bazán
c08d2cdf08
improves emails
...
Adds texts and i18n, ready to add design now.
Advances #221
2015-08-21 23:01:51 +02:00
kikito
b7718a2e5d
Adds i18n for comment moderation view
2015-08-21 21:59:11 +02:00
kikito
b4bd70436a
Adds routes for new methods in comment & debate moderation
2015-08-21 21:57:00 +02:00
Raimond Garcia
a9a8359bc7
Merge pull request #216 from AyuntamientoMadrid/design_improvements
...
Design improvements
2015-08-21 20:17:34 +02:00
rgarcia
0e6afa941d
removes ssl from staging and production envs
2015-08-21 19:27:50 +02:00
rgarcia
3126200c15
removes tests and revision check before deploy
2015-08-21 19:27:10 +02:00
rgarcia
24d3342af2
uses server_name from secrets
2015-08-21 19:18:30 +02:00
Alberto Garcia Cabeza
fbc1817f81
Modifies test for not logged users
2015-08-21 19:03:43 +02:00
rgarcia
a7dc306a40
Merge branch 'master' into deploy
2015-08-21 19:00:22 +02:00
Alberto Garcia Cabeza
ff6285d114
Improves general styles
2015-08-21 18:57:09 +02:00
rgarcia
8e0c2c27da
uses https for staging and production envs
2015-08-21 18:54:03 +02:00
rgarcia
6d14d07e5a
adds deploy secrets to staging and production envs
2015-08-21 18:52:52 +02:00
Juanjo Bazán
385da5185a
adds keys to deploy-secrets.yml
2015-08-21 17:14:00 +02:00
rgarcia
7da272898e
deploys to multiple preproduction servers
2015-08-21 17:07:31 +02:00
rgarcia
dbc3a6596e
adds mail host for staging and production
2015-08-21 17:06:51 +02:00
rgarcia
c39657cf5c
fixes capistrano unicorn restart task
2015-08-21 17:06:35 +02:00
Juanjo Bazán
b396a3b415
refactors user's registration
...
Simplifies process and fields:
* In: username
* Out: first_name, last_name, phone, nickname, use_nickname?
Closes #213
2015-08-21 16:41:08 +02:00
Alberto Garcia Cabeza
3c29ac90c9
Merge branch 'master' into reorganize_header
2015-08-21 13:05:21 +02:00
Alberto Garcia Cabeza
6bd060f536
Reorganizes header links, adds responsive styles
2015-08-21 13:04:41 +02:00
Raimond Garcia
a7cc888a70
Merge pull request #210 from AyuntamientoMadrid/select_language
...
Adds styles for language select
2015-08-21 10:16:41 +02:00
Alberto Garcia Cabeza
bf727699f3
Updates some texts
2015-08-21 09:02:43 +02:00
Alberto Garcia Cabeza
efd7b688cb
Renames language to locale
2015-08-21 08:50:09 +02:00
Alberto Garcia Cabeza
2415a0fae2
Adds styles for language select
2015-08-20 21:28:10 +02:00
kikito
ee881230ba
merges master and fixes conflicts
2015-08-20 18:50:10 +02:00
kikito
e7effbf77c
Allows flagging comments as inappropriate
2015-08-20 18:47:16 +02:00
kikito
e5f893c8d1
Adds i18n texts for flagging content
2015-08-20 18:45:56 +02:00
Juanjo Bazán
aff366827d
removes unused route
2015-08-20 16:14:22 +02:00
