consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
844 Commits 1 Branch 0 Tags
3ee68fd5d7019d06cc00cc4dcafe092a1c324ae1
Commit Graph

234 Commits

Author SHA1 Message Date
rgarcia
3ee68fd5d7 adds translations 2015-08-28 00:03:08 +02:00
rgarcia
01a5a0387d adds routes 2015-08-28 00:00:03 +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
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
kikito
599ea9a19f force ssl in production 2015-08-27 14:23:34 +02:00
Raimond Garcia
c806547c1a Merge pull request #257 from AyuntamientoMadrid/social_networks 
Social networks
 2015-08-27 10:52:10 +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
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
Alberto Garcia Cabeza
4e8b281a23 Adds styles to comment and reply emails 2015-08-26 18:51:29 +02:00
kikito
048f7c9b73 Adds bullet to dev & test, but makes it visible only on-demmand 
The logs are always stored in log/bullet.log

If you run the specs with `BULLET=true bin/rspec`:
* Any feature test which makes bullet angry will fail

If you run rails with `BULLET=true bin/rails s`:
* It will print the bullet logs in both the rails log and the bullet log
* It will show a footer on each page with the N+1 queries etc.
 2015-08-26 17:24:08 +02:00
kikito
25c3c4d1f1 merges master and fix conflicts 2015-08-26 14:48:16 +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
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
kikito
c183cf2cc6 merges master and fix conflicts 2015-08-25 19:31:25 +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
cfe583fbe6 adds cache to votes on Comments 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
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
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
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
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