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
|
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 |
|
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
|
101477c7da
|
refactors admin layout
|
2015-08-14 13:33:30 +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 |
|
Alberto Garcia Cabeza
|
502920c7f2
|
Improves styles for account page, adds user image
|
2015-08-12 11:53:28 +02:00 |
|
Enrique García
|
d243d81fea
|
Merge pull request #150 from AyuntamientoMadrid/votes
Avoid voting by not logged users
|
2015-08-12 10:15:06 +02:00 |
|
Alberto Garcia Cabeza
|
3cddc1070a
|
Adds styles for not logged votes
|
2015-08-11 17:40:27 +02:00 |
|
rgarcia
|
4dd7e14ac4
|
moves featured debates to home page
|
2015-08-11 17:26:25 +02:00 |
|
rgarcia
|
4839081ad2
|
uses simple_captcha instead of recaptcha [#51]
|
2015-08-10 20:24:56 +02:00 |
|
Juanjo Bazán
|
8b50b60814
|
adds i18n files for new namespaces
|
2015-08-10 16:58:35 +02:00 |
|
rgarcia
|
66e4581a84
|
fixes conflicts with master
|
2015-08-10 16:46:27 +02:00 |
|
Raimond Garcia
|
16183d9909
|
Merge pull request #116 from AyuntamientoMadrid/admin-77
Administrator and Moderator basic interface
|
2015-08-10 16:41:47 +02:00 |
|
kikito
|
7f5f5d6b19
|
Adds i18n for unauthorized messages
|
2015-08-10 16:24:01 +02:00 |
|
Alberto Garcia Cabeza
|
91cdfbc8a1
|
Adds content on footer
|
2015-08-10 15:39:38 +02:00 |
|
Alberto Garcia Cabeza
|
c048f25941
|
Fixes conflicts
|
2015-08-08 13:28:29 +02:00 |
|
Juanjo Bazán
|
f8becd1b23
|
Merge branch 'master' into admin-77
|
2015-08-08 13:00:41 +02:00 |
|
Juanjo Bazán
|
90a3dcdc16
|
Merge pull request #119 from AyuntamientoMadrid/header
Changes styles for header
|
2015-08-08 01:51:59 +02:00 |
|
Alberto Garcia Cabeza
|
d45a22781a
|
Changes styles for header
|
2015-08-07 23:23:16 +02:00 |
|
rgarcia
|
beb1a796f5
|
adds email sending preferences [#23]
|
2015-08-07 20:56:27 +02:00 |
|
rgarcia
|
3752054aab
|
sends emails [#23]
|
2015-08-07 20:52:53 +02:00 |
|
rgarcia
|
076448ec80
|
fixes credentials page
|
2015-08-07 17:47:12 +02:00 |
|
kikito
|
8d83607331
|
Implements dashboard controllers & views for admin & moderation
|
2015-08-07 17:20:28 +02:00 |
|
kikito
|
a194d9584b
|
merges master and fixes conflicts
|
2015-08-06 19:25:51 +02:00 |
|
kikito
|
c4c764df38
|
Adds nickname and use_nickname to "my profile"
|
2015-08-06 19:19:45 +02:00 |
|