kikito
e9dc0d54cd
uses secrets variable to decide when to use http_auth
2015-09-06 18:36:31 +02:00
Juanjo Bazán
3845e6bfd2
shows visible children of hidden comments
...
Fixes #368
2015-09-06 12:55:44 +02:00
rgarcia
afea21c2bc
fixes exception when not logged in
2015-09-06 11:26:15 +02:00
Enrique García
c28c39e052
Merge pull request #371 from AyuntamientoMadrid/residence_verification_tries
...
increases residence verification tries only after a Census call
2015-09-06 00:03:36 +02:00
rgarcia
34218d112b
increases residence verification tries after a Census call
2015-09-05 23:57:47 +02:00
rgarcia
e751c53a5d
converts necessary variables to instance variables
2015-09-05 22:02:51 +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
5d5de36ad1
adds spec for info pages
2015-09-05 20:16:20 +02:00
rgarcia
2bc1b5f1a5
adds nicer blog url
2015-09-05 19:57:33 +02:00
Juanjo Bazán
b020795d3d
adds search to debates index
2015-09-05 15:20:46 +02:00
Juanjo Bazán
63378ba24c
makes 'pending' filter the default in /admin/orgs
2015-09-04 22:39:07 +02:00
Juanjo Bazán
4ef2ed753d
makes 'pending' filter the default in /moderation
2015-09-04 22:39:07 +02:00
Juanjo Bazán
2a4c29c7ca
Merge branch 'master' into hot-score-347
2015-09-04 14:59:51 +02:00
kikito
08c31c5985
calls all the sorting scopes the same way
2015-09-04 14:17:59 +02:00
kikito
b6699932d1
uses the hot_score in the welcome screen
2015-09-04 14:16:05 +02:00
kikito
19e6740ee4
Refactors has_filters.rb
2015-09-04 11:50:29 +02:00
kikito
7c3ca55de1
Adds the default score selector/controller. Refactors debates specs
2015-09-04 11:50:07 +02:00
rgarcia
d0d33cc517
sends custom emails with delayed jobs
2015-09-03 22:48:29 +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
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
Enrique García
aa22c82a5c
Merge pull request #331 from AyuntamientoMadrid/letter_verification
...
Letter verification
2015-09-03 12:38:08 +02:00
kikito
e2b405083c
merges master and fixes conflicts
2015-09-03 12:02:16 +02:00
kikito
b23bd2c94d
Fixes tag cloud
...
* Makes order work
* Limits it to the first 20 in Debates#index
Fixes #338
2015-09-03 11:50:58 +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
3f98ab74b0
Makes tag checking more efficient in Debates#index
...
1) Only loads the tags if params[:tag] is present
2) Only checks for existence of the tag, instead of loading them all
and getting their names
2015-09-03 11:18:39 +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
rgarcia
10127f546e
upgrade before_filter to new syntax
2015-09-03 01:40:24 +02:00
rgarcia
4897d5df4e
makes spaces consistent
2015-09-03 01:29:46 +02:00
rgarcia
ae0ad77197
reorders before_actions
2015-09-03 01:28:46 +02:00
Alberto Garcia Cabeza
3f53f61b1d
Fixes conflicts
2015-09-03 00:12:59 +02:00
Alberto Garcia Cabeza
a8cbc60b02
Adds new pages, includes new texts
2015-09-02 23:42:06 +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
Juanjo Bazán
04127b23f9
Merge pull request #323 from AyuntamientoMadrid/filter-dry-282
...
Dries filters code
2015-09-02 14:24:06 +02:00
kikito
ebacc8c9c7
Uses has_filters in all controllers with filters & renames @filter to @current_filter
2015-09-02 13:21:46 +02:00
kikito
83d08b0017
Implements the HasFilters controller concern
2015-09-02 13:21:05 +02:00
Alberto Garcia Cabeza
da86c5d6e0
Adds styles for verification account process
2015-09-02 12:34:08 +02:00
rgarcia
abfc93ea78
hot fix to take into account preproduction
2015-09-02 11:36:30 +02:00
Juanjo Bazán
e604ca656a
Merge pull request #316 from AyuntamientoMadrid/secrets
...
Secrets
2015-09-01 21:25:45 +02:00
rgarcia
c1e85d7894
updates http_basic keys
2015-09-01 20:05:47 +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
bbf96259fc
adds controller check for anonymous votes
2015-09-01 17:49:02 +02:00
Raimond Garcia
3c665153d4
Merge pull request #300 from AyuntamientoMadrid/flag-helper
...
Flag helper
2015-09-01 15:19:16 +02:00
kikito
99fd0a917d
Uses @comment_flags in everything comment-related
2015-09-01 13:10:19 +02:00
