Commit Graph

180 Commits

Author SHA1 Message Date
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
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
Alberto Garcia Cabeza
b096cfee50 Updates texts 2015-09-07 16:37:02 +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
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
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
Alberto Garcia Cabeza
da86c5d6e0 Adds styles for verification account process 2015-09-02 12:34:08 +02:00
Juanjo Bazán
8915ce7ffd adds interface to disallow organizations votes
on debates
2015-09-02 12:16:55 +02:00
Juanjo Bazán
4cfde3242a changes text 2015-09-01 17:49:03 +02:00
Juanjo Bazán
9f4a98d3a0 moves translation keys 2015-09-01 17:49:02 +02:00
Alberto Garcia Cabeza
57e373a7cf Adds styles for too much anonymous comments 2015-09-01 17:49:02 +02:00
Alberto Garcia Cabeza
b0f7d74c47 Changes site language test, comment unused keys 2015-08-31 21:55:23 +02:00
Alberto Garcia Cabeza
a74f4ea030 Adds first styles for static pages 2015-08-31 21:48:50 +02:00
rgarcia
092dbb56c9 adds translations 2015-08-29 16:06:30 +02:00
Raimond Garcia
b1117dd1af Merge pull request #275 from mlovic/filter-topic
Allow debates to be filtered by topic
2015-08-28 17:41:38 +02:00
Marko Lovic
a52d79cebd Remove unused I18n keys 2015-08-28 17:31:53 +02:00
Marko Lovic
d7c2dd3aac Add translations for debate filters 2015-08-28 16:55:19 +02:00
kikito
538501d1b1 replaces hard-coded strings by i18n calls 2015-08-28 13:42:22 +02:00
kikito
cb99996317 merges master and fix conflicts 2015-08-28 13:23:30 +02:00
kikito
a0dafc68e8 Merge branch 'master' into flag-renaming 2015-08-28 12:00:32 +02:00
Raimond Garcia
b8fe857ab1 Merge pull request #263 from AyuntamientoMadrid/include_texts
Include texts
2015-08-28 10:07:33 +02:00
rgarcia
3ee68fd5d7 adds translations 2015-08-28 00:03:08 +02:00
kikito
76c2f2f021 Merge branch 'master' into flag-renaming 2015-08-27 19:06:29 +02:00
Juanjo Bazán
1d997d4929 fixes build, changes i18n ignored keys and specs
ref: #254
2015-08-27 18:08:56 +02:00
Juanjo Bazán
caf3e5ee74 Merge pull request #254 from mlovic/filter-debates
Add filters to specify order of debates on /debates page
2015-08-27 17:41:31 +02:00
Alberto Garcia Cabeza
900f00b443 Adds new texts on header, debates and footer 2015-08-27 16:46:47 +02:00
Marko Lovic
6f32801a88 Change names of debate order filters
* 'news' to 'created_at'
* 'votes' to 'total_votes'
* 'rated' to 'likes'
2015-08-27 15:24:59 +02:00
Marko Lovic
2d48966de3 Change variable name and references from "filter" to "order" 2015-08-27 15:24:59 +02:00