consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,118 Commits 1 Branch 0 Tags
b6af10a91fa70e3d901b2bf8c03279b2623a894f
Commit Graph

766 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
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
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
48ef4df0c3 Adds Comment#for_render 2015-08-26 19:41:42 +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
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
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
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
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
Juanjo Bazán
6d93f975e3 Merge branch 'master' into moderator_comments 2015-08-24 19:01:49 +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
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
kikito
720630e0ab Fixes failing spec which expected a menu id 2015-08-23 18:32:00 +02:00
Alberto Garcia Cabeza
908d19e2e7 Improves styles for admin 2015-08-23 11:45:43 +02:00