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

6051 Commits

Author SHA1 Message Date
Juanjo Bazán
5af7bc1aee removes language switcher if only one locale 2015-09-03 23:47:55 +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
Enrique García
858adf891f Merge pull request #346 from AyuntamientoMadrid/ancestry 
Ancestry
 2015-09-03 17:19:08 +02:00
Juanjo Bazán
05a647f9e7 Merge pull request #345 from AyuntamientoMadrid/improve_styles 
Improve styles
 2015-09-03 16:43:10 +02:00
Juanjo Bazán
358028c3e6 Fixes conflicts. Merge branch 'master' into ancestry 2015-09-03 16:37:28 +02:00
Juanjo Bazán
136c1e73ed uses ancestry to retrieve debate comments 2015-09-03 16:32:54 +02:00
Alberto Garcia Cabeza
efeb5a7457 Updates texts and changes test 2015-09-03 14:19:45 +02:00
rgarcia
28fd82c06e fixes specs for exact link texts 2015-09-03 13:17:26 +02:00
Raimond Garcia
f640a74e0a Merge pull request #327 from AyuntamientoMadrid/exact-capybara 
Exact capybara
 2015-09-03 12:39:23 +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
e0f8f8d8de Removes Debate.search & uses Debate.tagged_by when appropriate 
Using `params` was wrong here because if given an inexistent tag,
@tag_filter was nil but the debates were still filtered by it (so the
listing and what the page title said were different)
 2015-09-03 11:17:21 +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
fca3a4de37 Changes tests for new texts 2015-09-03 00:10:07 +02:00
rgarcia
b8e35ac95f cleans up 2015-09-02 22:06:50 +02:00
rgarcia
4cb7a698fe fixes spec 2015-09-02 22:01:07 +02:00
rgarcia
4d97063887 removes unused spec 2015-09-02 21:59:51 +02:00
rgarcia
99d779bcec adds letter code verification 2015-09-02 21:57:03 +02:00
Juanjo Bazán
dee2d0196b ancestries 
moves to ancestry from acts_as_commentable_with_threading
 2015-09-02 19:23:09 +02:00
Raimond Garcia
faf1b32cf5 Merge pull request #329 from AyuntamientoMadrid/verification 
Verification
 2015-09-02 18:58:25 +02:00
kikito
e3cbae4f02 Makes capybara exact. Should fix some randomly-failing specs 2015-09-02 18:05:43 +02:00
Juanjo Bazán
04127b23f9 Merge pull request #323 from AyuntamientoMadrid/filter-dry-282 
Dries filters code
 2015-09-02 14:24:06 +02:00
Juanjo Bazán
274ddb2589 changes rules for allowing debate votes 
first 100 votes are allowed for unverified users
 2015-09-02 13:40:38 +02:00
kikito
83d08b0017 Implements the HasFilters controller concern 2015-09-02 13:21:05 +02:00
Alberto Garcia Cabeza
c06491db57 Changes test for verification process 2015-09-02 12:51:32 +02:00
Juanjo Bazán
c6c32a0795 adds translation for admin settings' keys names 2015-09-01 20:00:41 +02:00
Juanjo Bazán
f02f1a9888 adds extra expect in spec to avoid loadtime errors 2015-09-01 17:54:09 +02:00
Juanjo Bazán
872a23443b updates anonymous counter in debate when voted 
refactors to move all related code to Debate model
 2015-09-01 17:49:02 +02:00
Juanjo Bazán
9e7722e7ef adds verification specs for user 
includes #unverified? method
 2015-09-01 17:49:02 +02:00
Juanjo Bazán
bbf96259fc adds controller check for anonymous votes 2015-09-01 17:49:02 +02:00
Juanjo Bazán
3a15895617 loads seeds for testing 2015-09-01 17:49:01 +02:00
Juanjo Bazán
2e5b5bccb5 adds methods to decide if a user can vote a debate 2015-09-01 17:49:01 +02:00
Juanjo Bazán
916f0bf901 adds spec for Setting 2015-09-01 17:49:01 +02:00
Raimond Garcia
3c665153d4 Merge pull request #300 from AyuntamientoMadrid/flag-helper 
Flag helper
 2015-09-01 15:19:16 +02:00
kikito
d0c7c7fe79 Adds User.comment_flags 2015-09-01 13:09:35 +02:00
kikito
c2faf0ef92 Merge Vote.in with Vote.for_debates 2015-09-01 13:08:32 +02:00
Juanjo Bazán
8037248b73 marks social network login specs as pending 
temporary, for the beta testing phase
 2015-09-01 12:56:15 +02:00
kikito
6902d2851b Takes already-flagged-content out of Ability's concerns 2015-09-01 10:33:11 +02:00
Juanjo Bazán
5def8ba1e8 Merge pull request #296 from AyuntamientoMadrid/styling_pages 
Styling pages
 2015-08-31 22:01:36 +02:00
Alberto Garcia Cabeza
b0f7d74c47 Changes site language test, comment unused keys 2015-08-31 21:55:23 +02:00
Juanjo Bazán
a00abc0020 adds touch to debates on tag destroy 2015-08-31 20:26:30 +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
Juanjo Bazán
3217d262b4 Merge pull request #292 from AyuntamientoMadrid/mask_user_data 
Mask user data
 2015-08-30 15:22:25 +02:00
rgarcia
932612a207 adds specs for masked emails and phones 2015-08-30 15:15:13 +02:00
rgarcia
01aa0a5a40 refactors specs 2015-08-30 12:51:34 +02:00
rgarcia
0f145da18b adds specs 2015-08-30 12:51:26 +02:00