Commit Graph

237 Commits

Author SHA1 Message Date
Juanjo Bazán
811c329199 changes how comment.created_at is shown
time_ago_in_words is not cache friendly
2015-09-09 14:57:27 +02:00
Juanjo Bazán
55b2f96062 changes sentence 2015-09-09 11:05:48 +02:00
Juanjo Bazán
a51198dab6 Merge pull request #430 from AyuntamientoMadrid/desing_improves
Desing improves
2015-09-09 11:04:35 +02:00
Raimond Garcia
b54e4e8649 Merge pull request #437 from AyuntamientoMadrid/debate-moderation-2
Bulk moderation
2015-09-08 20:55:51 +02:00
kikito
48ba9a436d adds select all/none to bulk moderation 2015-09-08 20:46:18 +02:00
kikito
b9ebe8c2c4 Implements basic bulk debates functionality 2015-09-08 19:44:50 +02:00
Enrique García
5e13fe60f7 Merge pull request #436 from AyuntamientoMadrid/organizations-with-hidden-users
show info of hidden users in admin/organizations
2015-09-08 18:40:52 +02:00
Juanjo Bazán
6bf8af3526 show info of hidden users in admin/organizations 2015-09-08 18:06:23 +02:00
rgarcia
339e978237 default order confidence_score for home and debate index 2015-09-08 14:47:58 +02:00
Alberto Garcia Cabeza
5b7cda2233 Adds message info on debate new form 2015-09-08 14:47:32 +02:00
Enrique García
3652de4a8f Merge pull request #412 from AyuntamientoMadrid/moderation-user-block
Moderation user block
2015-09-07 18:27:57 +02:00
Juanjo Bazán
f2426e09fa adds users to moderator's menu 2015-09-07 17:57:08 +02:00
Juanjo Bazán
af6cb16e9b adds banned users section to moderation zone 2015-09-07 17:56:53 +02:00
Juanjo Bazán
64a0046e45 Merge pull request #408 from AyuntamientoMadrid/registration-success-390
Adds registration "success" intermediate page
2015-09-07 17:32:30 +02:00
kikito
980728279f Adds registration "success" intermediate page 2015-09-07 17:23:59 +02:00
Alberto Garcia Cabeza
b096cfee50 Updates texts 2015-09-07 16:37:02 +02:00
Raimond Garcia
5b671ce623 Merge pull request #387 from AyuntamientoMadrid/improve_design
Improve design
2015-09-07 01:08:58 +02:00
Alberto Garcia Cabeza
6825409744 Comments unused keys 2015-09-07 00:23:10 +02:00
Alberto Garcia Cabeza
eedd919424 Improves styles and texts for devise pages 2015-09-07 00:16:54 +02:00
Alberto Garcia Cabeza
a7e593c039 Updates texts 2015-09-07 00:15:39 +02:00
Juanjo Bazán
9104242eed adds pending filter to admin/users 2015-09-06 21:58:34 +02:00
Juanjo Bazán
bc90812d37 adds pending filter to admin/comments 2015-09-06 21:45:41 +02:00
Juanjo Bazán
1a7806150a adds pending filter to admin/debates 2015-09-06 21:42:22 +02:00
Raimond Garcia
17ebb07daf Merge pull request #367 from AyuntamientoMadrid/blog
adds nicer blog url
2015-09-05 20:26:22 +02:00
Juanjo Bazán
ae872b88ac updates blog link 2015-09-05 20:15:31 +02:00
Juanjo Bazán
b020795d3d adds search to debates index 2015-09-05 15:20:46 +02:00
Alberto Garcia Cabeza
54eeff41b7 Adds search form to sidebar 2015-09-05 14:01:59 +02:00
Juanjo Bazán
1b51738be6 updates blog link 2015-09-05 12:29:05 +02:00
Alberto Garcia Cabeza
83b44fd53a Improves layout, adds link to checkbox's label 2015-09-05 00:34:18 +02:00
Alberto Garcia Cabeza
128a2bc956 Updates some texts 2015-09-04 20:42:02 +02:00
Raimond Garcia
d62b30c487 Merge pull request #353 from AyuntamientoMadrid/hot-score-347
Hot score 347
2015-09-04 17:24:42 +02:00
Alberto Garcia Cabeza
2e8669c4c9 Changes some texts 2015-09-04 15:06:05 +02:00
kikito
7c3ca55de1 Adds the default score selector/controller. Refactors debates specs 2015-09-04 11:50:07 +02:00
Juanjo Bazán
559b60e63f adds random order to debates' index 2015-09-03 18:50:19 +02:00
Juanjo Bazán
dbfa35c444 adds 'most commented' order to debates 2015-09-03 18:31:16 +02:00
Juanjo Bazán
cd3806476f removes 'most voted' order from debates 2015-09-03 18:20:12 +02:00
Juanjo Bazán
bcb1f2ba72 adds order by score to debates 2015-09-03 18:13:48 +02:00
Juanjo Bazán
05a647f9e7 Merge pull request #345 from AyuntamientoMadrid/improve_styles
Improve styles
2015-09-03 16:43:10 +02:00
Alberto Garcia Cabeza
efeb5a7457 Updates texts and changes test 2015-09-03 14:19:45 +02:00
Alberto Garcia Cabeza
8559833cc0 Changes texts for emails 2015-09-03 14:11:25 +02:00
Enrique García
aa22c82a5c Merge pull request #331 from AyuntamientoMadrid/letter_verification
Letter verification
2015-09-03 12:38:08 +02:00
Juanjo Bazán
572432f2cf Merge pull request #339 from AyuntamientoMadrid/remove-tag-filter-337
Remove tag filter
2015-09-03 11:50:53 +02:00
kikito
002d86884b Removes the tag selector from debate#index view & refactors i18n 2015-09-03 11:15:05 +02:00
Alberto Garcia Cabeza
3f53f61b1d Fixes conflicts 2015-09-03 00:12:59 +02:00
Alberto Garcia Cabeza
7fefcb692e Changes and updates texts 2015-09-02 23:43:08 +02:00
Alberto Garcia Cabeza
a8cbc60b02 Adds new pages, includes new texts 2015-09-02 23:42:06 +02:00
rgarcia
b8e35ac95f cleans up 2015-09-02 22:06:50 +02:00
rgarcia
99d779bcec adds letter code verification 2015-09-02 21:57:03 +02:00
rgarcia
280028cfa4 adds missing translation for incorrect phone 2015-09-02 21:45:53 +02:00
Raimond Garcia
faf1b32cf5 Merge pull request #329 from AyuntamientoMadrid/verification
Verification
2015-09-02 18:58:25 +02:00