consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

5383 Commits

Author SHA1 Message Date
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
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
Alberto Garcia Cabeza
30d685ec32 Adds styles for organizations 2015-08-22 18:06:27 +02:00
Alberto Garcia Cabeza
6b4b0553b9 Adds new icons for admin menu 2015-08-22 18:06:03 +02:00
Alberto Garcia Cabeza
570169af57 Changes icons classes names 2015-08-22 14:46:26 +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
00b51bbc23 Adds first version of comment moderation 
Missing:
* Ensure removing a flag updates the flagged_at attribute correctly
* Showing the debate when the comment is not a “root”
* Filter (pending / reviewed / all)
* Order
* Same for debates
 2015-08-21 22:01:47 +02:00
Raimond Garcia
a9a8359bc7 Merge pull request #216 from AyuntamientoMadrid/design_improvements 
Design improvements
 2015-08-21 20:17:34 +02:00
kikito
5328355c3e Add tests for visible admin links and fix bug 2015-08-21 19:09:26 +02:00
Alberto Garcia Cabeza
ff6285d114 Improves general styles 2015-08-21 18:57:09 +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
Alberto Garcia Cabeza
efd7b688cb Renames language to locale 2015-08-21 08:50:09 +02:00
kikito
01eb89f5f4 DRYes comment views related with flagging as inappropiate 2015-08-20 22:54:05 +02:00
Alberto Garcia Cabeza
2415a0fae2 Adds styles for language select 2015-08-20 21:28:10 +02:00
kikito
12e8cf2056 Allows flagging debates as inappropriate 2015-08-20 19:26:36 +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
Juanjo Bazán
896fe41db0 favors with_hidden 2015-08-20 17:52:59 +02:00
Juanjo Bazán
f0a6926710 adds restore user action for administrators 2015-08-20 16:06:23 +02:00
Juanjo Bazán
b340d7741a adds hiding users by moderators 2015-08-20 13:16:37 +02:00
Alberto Garcia Cabeza
51d08d9798 Adds styles for pagination 2015-08-20 12:35:00 +02:00
Juanjo Bazán
9e15652d58 adds kaminari views 2015-08-20 11:35:46 +02:00
Enrique García
307fb05e09 Merge pull request #201 from AyuntamientoMadrid/pagination 
Adds Pagination
 2015-08-20 00:54:06 +02:00
kikito
5c3f664da4 Fixes links in Admin::Organizations to handle filters + pages 2015-08-20 00:50:50 +02:00
kikito
5205ac99e3 Moves the locale switcher to its own shared view 2015-08-19 21:39:57 +02:00
Juanjo Bazán
ec6b702d00 Merge pull request #200 from AyuntamientoMadrid/locale-switch-turbolinks-166 
disable turbolinks in locale switcher. fixes #166
 2015-08-19 18:00:35 +02:00
Juanjo Bazán
fda8412ed3 adds pagination to admin lists 
Ref: #80
 2015-08-19 16:32:40 +02:00
Juanjo Bazán
a43c753ebb updates style of admin/organizations 2015-08-19 16:32:39 +02:00
Juanjo Bazán
3732b7f420 adds pagination to 1st level comments in debate 
Ref: #80
 2015-08-19 16:32:39 +02:00