Commit Graph

7792 Commits

Author SHA1 Message Date
kikito
5e32fd2fa4 Adds new abilities for moderators
extends hiding (i.e. you can not hide your own content or yourself) and
adds marking as reviewed
2015-08-21 20:39:40 +02:00
kikito
0fe7740a41 Refactors ability making flagging more efficient 2015-08-21 20:36:04 +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
kikito
246145e4cb adds abilities for regular users 2015-08-20 18:45:32 +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
kikito
8944327405 adds InappropiateFlag model with relations and specs 2015-08-20 16:03:00 +02:00
Juanjo Bazán
b340d7741a adds hiding users by moderators 2015-08-20 13:16:37 +02:00
Juanjo Bazán
259aa29de7 adds new abilities 2015-08-20 13:16:37 +02:00
Juanjo Bazán
bd16e9345a adds paranoia to User 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
710e83fb22 Adds locale switcher js code + feature tests 2015-08-19 21:40:17 +02:00
kikito
5205ac99e3 Moves the locale switcher to its own shared view 2015-08-19 21:39:57 +02:00
kikito
961a317c9b Adds (a modified version of) queryParameters.js 2015-08-19 21:26:29 +02:00
kikito
480ecd39c4 Replaces locales helper which returns an array by another which returns select options 2015-08-19 21:25:56 +02:00
kikito
c9c4f95fdc Rename language style to locale 2015-08-19 21:07:17 +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
Juanjo Bazán
10d7e9effe changes to unambiguous order declaration.
Specified as a string referred table of 'created_at' was ambiguous, index failed when filtering by tag
2015-08-19 16:32:39 +02:00
Juanjo Bazán
0066cb0514 compares ids 2015-08-19 16:32:39 +02:00
Juanjo Bazán
947514fbfc adds pagination to debates#index
Ref: #80
2015-08-19 16:30:25 +02:00
Juanjo Bazán
d2ac8b7f43 applies hidden users styles commented 2015-08-19 16:22:24 +02:00
Alberto Garcia Cabeza
2eccd30eff Adds styles for deleted users, improves previous 2015-08-19 15:01:10 +02:00
Alberto Garcia Cabeza
85ef4eb08d Updates custom icons font 2015-08-19 15:00:00 +02:00
kikito
b4c66133da Replaces comments by calls to user.methods 2015-08-19 12:10:08 +02:00
kikito
21c2fa2e3d Adds user.verified_organization? 2015-08-19 12:08:03 +02:00
Alberto Garcia Cabeza
04db8112b4 Adds styles for associations comments 2015-08-19 11:53:35 +02:00
Alberto Garcia Cabeza
87d921b3c7 Adds styles for comments 2015-08-19 11:53:18 +02:00
kikito
8bd4d02502 disable turbolinks in locale switcher. fixes #166 2015-08-18 20:37:05 +02:00
Juanjo Bazán
ced2a05063 adds eager loading to avoid N+1 queries 2015-08-18 16:54:49 +02:00
Juanjo Bazán
b84fb65b93 Merge pull request #197 from AyuntamientoMadrid/styling_admin
Styling admin
2015-08-18 15:30:44 +02:00
Alberto Garcia Cabeza
fc9689c2da Changes to pass all test 2015-08-18 14:04:11 +02:00
Alberto Garcia Cabeza
33875daef6 Adds styles for new admin's sections 2015-08-18 13:48:37 +02:00
Alberto Garcia Cabeza
ad1833b918 Updates custom icons font 2015-08-18 13:47:24 +02:00