Jose Manuel
|
d84e80c379
|
Merge branch '134_create_moderator'
|
2015-08-25 00:07:42 +01:00 |
|
Jose Manuel
|
84e0e8f990
|
Adds testing for moderator´s admin consol
|
2015-08-24 23:04:10 +01:00 |
|
Juanjo Bazán
|
6d93f975e3
|
Merge branch 'master' into moderator_comments
|
2015-08-24 19:01:49 +02:00 |
|
kikito
|
0279c08792
|
fixes typo
|
2015-08-24 17:23:50 +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 |
|
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 |
|
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
|
b7718a2e5d
|
Adds i18n for comment moderation view
|
2015-08-21 21:59:11 +02:00 |
|
Raimond Garcia
|
a9a8359bc7
|
Merge pull request #216 from AyuntamientoMadrid/design_improvements
Design improvements
|
2015-08-21 20:17:34 +02:00 |
|
Alberto Garcia Cabeza
|
fbc1817f81
|
Modifies test for not logged users
|
2015-08-21 19:03:43 +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 |
|
Raimond Garcia
|
a7cc888a70
|
Merge pull request #210 from AyuntamientoMadrid/select_language
Adds styles for language select
|
2015-08-21 10:16:41 +02:00 |
|
Alberto Garcia Cabeza
|
bf727699f3
|
Updates some texts
|
2015-08-21 09:02:43 +02:00 |
|
Alberto Garcia Cabeza
|
efd7b688cb
|
Renames language to locale
|
2015-08-21 08:50:09 +02:00 |
|
Alberto Garcia Cabeza
|
2415a0fae2
|
Adds styles for language select
|
2015-08-20 21:28:10 +02:00 |
|
kikito
|
ee881230ba
|
merges master and fixes conflicts
|
2015-08-20 18:50:10 +02:00 |
|
kikito
|
e5f893c8d1
|
Adds i18n texts for flagging content
|
2015-08-20 18:45:56 +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 |
|
kikito
|
332df09491
|
Add locale entry to each locale
|
2015-08-19 21:07:35 +02:00 |
|
Alberto Garcia Cabeza
|
2eccd30eff
|
Adds styles for deleted users, improves previous
|
2015-08-19 15:01:10 +02:00 |
|
kikito
|
da7d10d21e
|
adds missing i18n to en.yml
|
2015-08-19 12:10:29 +02:00 |
|
kikito
|
b4c66133da
|
Replaces comments by calls to user.methods
|
2015-08-19 12:10:08 +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
|
30a63db392
|
Fixes Typo
|
2015-08-18 17:03:03 +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
|
33875daef6
|
Adds styles for new admin's sections
|
2015-08-18 13:48:37 +02:00 |
|
kikito
|
b28f63b016
|
merges master and fixes conflicts
|
2015-08-18 09:35:13 +02:00 |
|
rgarcia
|
c56742118c
|
adds stats to admin menu
|
2015-08-17 22:36:24 +02:00 |
|
Alberto Garcia Cabeza
|
9f8229465c
|
fixes conflicts
|
2015-08-17 21:36:06 +02:00 |
|
Alberto Garcia Cabeza
|
0c2901c3fb
|
Adds styles for admin
|
2015-08-17 21:30:22 +02:00 |
|
Raimond Garcia
|
b51354cffb
|
Merge pull request #187 from AyuntamientoMadrid/titles_and_filters
Titles and filters
|
2015-08-17 20:00:05 +02:00 |
|
Juanjo Bazán
|
5c630ac41d
|
adds settings area to admin
|
2015-08-17 18:38:57 +02:00 |
|
Juanjo Bazán
|
d9d5e24a8b
|
updates options for admin officials level
|
2015-08-17 18:27:18 +02:00 |
|
kikito
|
9e1581656a
|
merges master and fixes conflicts
|
2015-08-17 17:38:34 +02:00 |
|
kikito
|
1ffc342079
|
fixes typo in admin.es.yml
|
2015-08-17 17:19:55 +02:00 |
|
kikito
|
8311ab6c2b
|
fixes typo in admin.en.yml
|
2015-08-17 17:19:10 +02:00 |
|
Juanjo Bazán
|
fabcb42328
|
adds edition/management of officials to admin zone
|
2015-08-17 17:04:29 +02:00 |
|
Juanjo Bazán
|
2d85dd58b2
|
adds i18n for official user fields
|
2015-08-17 15:22:49 +02:00 |
|