kikito
4e86586e7d
fixes error in db/schema.rb
2015-08-26 14:51:54 +02:00
kikito
25c3c4d1f1
merges master and fix conflicts
2015-08-26 14:48:16 +02:00
kikito
c9ca3877e8
adds only the needed cahced fields to comments and debates;
2015-08-26 14:46:51 +02:00
Enrique García
a2b240c360
Merge pull request #251 from AyuntamientoMadrid/flag_inappropriate
...
Flag as inappropriate styles
2015-08-26 14:12:28 +02:00
kikito
6110284356
removes all references to "review" (replaced by "archive")
2015-08-26 13:48:57 +02:00
kikito
3b3f25f14e
merges with master
2015-08-26 13:22:07 +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
5eeb89584b
Fixes a couple specs which fail with the new words (ArchiveD vs Archive)
2015-08-26 13:14:07 +02:00
Juanjo Bazán
46bd0f2c7f
adds basic style/content to moderation dashboard
2015-08-26 12:24:37 +02:00
rgarcia
e219e5be4d
adds force ssl to staging
2015-08-26 12:22:58 +02:00
rgarcia
c13aea5f1d
removes force ssl from staging
2015-08-26 12:03:28 +02:00
rgarcia
30d996da84
force ssl in staging
2015-08-26 12:00:34 +02:00
rgarcia
1a806db80d
removes ssl from production env
2015-08-26 11:46:09 +02:00
rgarcia
98c6f6561c
removes force ssl in staging env
2015-08-26 11:37:41 +02:00
David Rodríguez
d9b067e9b2
updates ruby version to 2.2.3
2015-08-26 05:37:26 -03:00
Juanjo Bazán
616566a05d
Merge pull request #248 from deivid-rodriguez/simplify_readme_commands
...
simplifies commands in readme
2015-08-26 10:32:21 +02:00
David Rodríguez
70b40b6ce8
simplifies redundant commands in README
...
Use either `bundle exec` or bundler generated binstubs, but not both.
Since you are committing binstubs to source control, I assume you want
the latter.
2015-08-26 05:17:55 -03:00
kikito
c183cf2cc6
merges master and fix conflicts
2015-08-25 19:31:25 +02:00
Enrique García
44ec0cb76d
Merge pull request #244 from AyuntamientoMadrid/organization-login-226
...
Organization login 226
2015-08-25 19:25:34 +02:00
kikito
f47fbe82d5
Uses *_html tags instead of calling raw in the view
2015-08-25 19:22:57 +02:00
Alberto Garcia Cabeza
82c404092a
fixes conflicts [ #226 ]
2015-08-25 16:53:11 +02:00
Alberto Garcia Cabeza
7d17209be6
Adds styles for organization success registration [ #226 ]
2015-08-25 16:47:53 +02:00
Juanjo Bazán
6ead1a2c1d
adds cache to votes on Debates
2015-08-25 16:26:36 +02:00
Juanjo Bazán
cfe583fbe6
adds cache to votes on Comments
2015-08-25 16:26:36 +02:00
Juanjo Bazán
96dc85d1a5
adds cache columns to acs_as_votable models
2015-08-25 16:26:36 +02:00
Raimond Garcia
6bfe369e7d
Merge pull request #242 from AyuntamientoMadrid/ssl
...
configures ssl for staging and production environments
2015-08-25 16:09:27 +02:00
Raimond Garcia
320e41e0f3
Merge pull request #238 from dgilperez/issue-19
...
Adding Omniauth for sign up and sign in
2015-08-25 16:03:26 +02:00
Alberto Garcia Cabeza
8bdf03c50d
Changes some test for moderation
2015-08-25 16:02:36 +02:00
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
8d0ba2fe33
cleans up unused variable
2015-08-25 15:07:36 +02:00
David Gil
ff636f7e2a
adds instructions for local configuration to README
2015-08-25 14:15:43 +02:00
David Gil
59aede5b00
adds Google OAuth2 support
2015-08-25 14:15:24 +02:00
David Gil
de15bbe911
adds feature tests for sign up and sign using OAuth
2015-08-25 14:15:04 +02:00
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
