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 |
|
Alberto Garcia Cabeza
|
ad9e2cc637
|
Adds styles for social share and auth
|
2015-08-26 20:32:48 +02:00 |
|
kikito
|
25c3c4d1f1
|
merges master and fix conflicts
|
2015-08-26 14:48:16 +02:00 |
|
kikito
|
c183cf2cc6
|
merges master and fix conflicts
|
2015-08-25 19:31:25 +02:00 |
|
Juanjo Bazán
|
cfe583fbe6
|
adds cache to votes on Comments
|
2015-08-25 16:26:36 +02:00 |
|
Alberto Garcia Cabeza
|
8bdf03c50d
|
Changes some test for moderation
|
2015-08-25 16:02: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 |
|
David Gil
|
86dccac9c6
|
adds support for Facebook OAuth
|
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 |
|
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 |
|
kikito
|
c88f7c1f30
|
merges master and fixes conflicts
|
2015-08-23 20:27: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 |
|
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
|
e5f893c8d1
|
Adds i18n texts for flagging content
|
2015-08-20 18:45:56 +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 |
|
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
|
b28f63b016
|
merges master and fixes conflicts
|
2015-08-18 09:35:13 +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 |
|
kikito
|
9e1581656a
|
merges master and fixes conflicts
|
2015-08-17 17:38:34 +02:00 |
|
Juanjo Bazán
|
4a8825cf11
|
Merge pull request #184 from AyuntamientoMadrid/add_subnavigation
Adds sub navigation menu
|
2015-08-17 15:21:53 +02:00 |
|
Alberto Garcia Cabeza
|
f485225250
|
Merge branch 'master' into titles_and_filters
|
2015-08-17 14:53:48 +02:00 |
|
Alberto Garcia Cabeza
|
43f8db8e3a
|
Adds styles for titles and filters
|
2015-08-17 14:53:00 +02:00 |
|
Juanjo Bazán
|
74742d5f76
|
adds i18n to deleted comments
|
2015-08-17 14:08:59 +02:00 |
|
Alberto Garcia Cabeza
|
9f1f64cc3a
|
Adds sub navigation menu
|
2015-08-17 12:31:05 +02:00 |
|
kikito
|
8ca546a431
|
merges master and fixes conflicts
|
2015-08-17 02:40:11 +02:00 |
|
kikito
|
543f718891
|
Adds phone_number to the regular user registration / account views
|
2015-08-17 01:16:08 +02:00 |
|
rgarcia
|
a81612b226
|
improves consistency of error messages [#110]
|
2015-08-16 15:57:09 +02:00 |
|
Juanjo Bazán
|
c3974de2ff
|
fixes locales
|
2015-08-15 22:16:47 +02:00 |
|
David Gil
|
664f656fe3
|
tests featured tags administration and adding featured tags to debates
|
2015-08-15 19:38:42 +02:00 |
|
David Gil
|
1de941d1fa
|
adding featured tags list to debate form
|
2015-08-15 18:36:10 +02:00 |
|
David Gil
|
0a4aafd8de
|
scaffolds a tag list to mark tags as featured on the admin section
|
2015-08-15 18:22:29 +02:00 |
|
Alberto Garcia Cabeza
|
feb85c2aea
|
Adds blog link on header
|
2015-08-15 00:58:45 +02:00 |
|
rgarcia
|
88defaa455
|
adds admin layout and access links [#163]
|
2015-08-14 12:37:44 +02:00 |
|
Raimond Garcia
|
e49567c953
|
Merge pull request #154 from AyuntamientoMadrid/debates
Debates
|
2015-08-12 15:59:20 +02:00 |
|
Alberto Garcia Cabeza
|
d6c7528df3
|
Improves styles of debates show page
|
2015-08-12 15:26:46 +02:00 |
|
David Gil
|
1ee3378768
|
adding a few tests
|
2015-08-12 14:59:54 +02:00 |
|
David Gil
|
0291f574a2
|
add vote counters to comments
|
2015-08-12 14:59:21 +02:00 |
|
David Gil
|
19ef481917
|
adding counter_cache to comments children and WIPing on the issue
|
2015-08-12 14:58:36 +02:00 |
|