consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,828 Commits 1 Branch 0 Tags
d901b09560b9e73eaf35d4dd90fef6c79b66d9a1
Commit Graph

6270 Commits

Author SHA1 Message Date
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
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
1770dfd3f6 adds ability to confirm the hiding of comments, debates or users 2015-08-27 13:20:12 +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
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
Jose Manuel
3baef4ae79 Merge branch 'master' of github.com:AyuntamientoMadrid/participacion 2015-08-26 21:40:44 +01: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
Alberto Garcia Cabeza
33b501d98e Improves texts for instructions emails 2015-08-26 19:43: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
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
kikito
015fe704e4 Fixes flagging specs by making them id-based instead of text-based 2015-08-26 13:14:42 +02:00
Juanjo Bazán
46bd0f2c7f adds basic style/content to moderation dashboard 2015-08-26 12:24:37 +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
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
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
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
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
Alberto Garcia Cabeza
6643f97195 Updates custom icons font 2015-08-25 13:51:25 +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
Jose Manuel
d84e80c379 Merge branch '134_create_moderator' 2015-08-25 00:07:42 +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
Juanjo Bazán
6d93f975e3 Merge branch 'master' into moderator_comments 2015-08-24 19:01:49 +02:00