consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,107 Commits 1 Branch 0 Tags
dbfa35c444917e46a27056181becbdba6bbfc0a5
Commit Graph

60 Commits

Author SHA1 Message Date
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
Raimond Garcia
f640a74e0a Merge pull request #327 from AyuntamientoMadrid/exact-capybara 
Exact capybara
 2015-09-03 12:39:23 +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
fca3a4de37 Changes tests for new texts 2015-09-03 00:10:07 +02:00
kikito
e3cbae4f02 Makes capybara exact. Should fix some randomly-failing specs 2015-09-02 18:05:43 +02:00
kikito
27ece220f6 Transform Flag.flag! & unflag! into non-raising methods 
They now return false and do nothing instead
 2015-08-31 19:02:50 +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
c11b611b1a Combine debates topic and order filters 2015-08-28 17:23:36 +02:00
Marko Lovic
4285ba4bb3 Add tag filter to debates page 2015-08-28 12:41:10 +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
Marko Lovic
e8004ca1d3 Add to javascript to handle debates order change 2015-08-27 17:18:07 +02:00
Marko Lovic
bfeff8d241 Implement custom rspec matcher appear_before 2015-08-27 15:24:59 +02:00
Marko Lovic
f5622b3425 Assign each test debate to one variable 2015-08-27 15:24:59 +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
Marko Lovic
ccaca54816 Add filters to specify order of debates#index 2015-08-27 15:24:59 +02:00
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
kikito
015fe704e4 Fixes flagging specs by making them id-based instead of text-based 2015-08-26 13:14:42 +02:00
kikito
12e8cf2056 Allows flagging debates as inappropriate 2015-08-20 19:26:36 +02:00
Alberto Garcia Cabeza
0d54cca910 Changes test for pagination 2015-08-20 12:55:31 +02:00
Juanjo Bazán
947514fbfc adds pagination to debates#index 
Ref: #80
 2015-08-19 16:30:25 +02:00
rgarcia
bea38226fe fixes spacing 2015-08-16 22:45:43 +02:00
rgarcia
a81612b226 improves consistency of error messages [#110] 2015-08-16 15:57:09 +02:00
Juanjo Bazán
7cc7efb2c7 uses timezone aware method instead of Date 2015-08-16 00:22:17 +02:00
Juanjo Bazán
e2e1783418 adds spec 
checks failed debate create/update and inclusion of featured tags
 2015-08-16 00:01:30 +02:00
Juanjo Bazán
aeceaf9ea8 fixes bug: edit Debate was not validating captcha 2015-08-15 23:51:30 +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
f835154233 adds a helper for avatars in specs 2015-08-14 21:18:35 +02:00
David Gil
c6154fe48d testing avatar presence 2015-08-14 21:16:53 +02:00
David Gil
9a1bdb7aca move tags helper to view, fix case when less than 5 tags were present, tag list was showing a + link 2015-08-12 16:26:41 +02:00
David Gil
41e5496d2b add a couple of tests for the tag limit feature 2015-08-12 16:26:41 +02:00
Juanjo Bazán
e880cb4f1a removes unused line from spec 2015-08-12 12:00:06 +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
Fernando Seror
6d20972f34 Share in social networks 
* Add the social buttons gem to the Gemfile

* Initializer and translations for the social buttons

* Add the social buttons assets to the sprockets require

* Add the social buttons in the show debate view

* Spec to lock down the amount of social share buttons to three
 2015-08-10 11:00:39 -05:00
kikito
c1c1362780 Adapts debates controller to new permissions system 2015-08-10 15:00:14 +02:00
rgarcia
ae34be1ddd adds link to debate description 2015-08-06 15:50:36 +02:00
rgarcia
ec6d34a49f fixes conflicts 2015-08-06 13:42:57 +02:00
kikito
fc4e67824b Merge branch 'master' into debates_description_html 
I removed the truncation from debates.description because
debates.description returns html

Conflicts:
	app/views/debates/_debate.html.erb
	app/views/debates/show.html.erb
 2015-08-04 19:07:20 +02:00
Juanjo Bazán
a2ea42d13d adds first 3 debates as featured_debates 2015-08-04 18:41:09 +02:00
kikito
90e577c811 Adds feature for debate description 2015-08-04 18:40:58 +02:00
Juanjo Bazán
c3046ccc2b fixes build 
adds empty featured_debates
 2015-08-04 17:56:38 +02:00
kikito
b53bc42dcd Uses the TagSanitizer in Debate 2015-08-03 19:32:00 +02:00
Juanjo Bazán
8fa6bab454 Merge pull request #76 from AyuntamientoMadrid/sanitize-debate-desc-71 
Sanitizes debate desc
 2015-08-02 22:32:42 +02:00