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

9884 Commits

Author SHA1 Message Date
David Fernández
a0ffd4f718 Smaller, better, no reason for the image being so big? 2015-09-03 23:42:26 +02:00
rgarcia
71aaef3805 sends devise emails with delayed_jobs 2015-09-03 22:59:25 +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
Enrique García
858adf891f Merge pull request #346 from AyuntamientoMadrid/ancestry 
Ancestry
 2015-09-03 17:19:08 +02:00
Juanjo Bazán
dfc1ccb108 renames helper method 2015-09-03 17:13:19 +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
f20192d9d7 Improves styles for debates 2015-09-03 14:15:45 +02:00
Alberto Garcia Cabeza
3255995ea1 Adds new styles for pages 2015-09-03 14:15:01 +02:00
Alberto Garcia Cabeza
8559833cc0 Changes texts for emails 2015-09-03 14:11:25 +02:00
Alberto Garcia Cabeza
4631b39d25 Updates custom icons fonts 2015-09-03 14:10:01 +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
kikito
002d86884b Removes the tag selector from debate#index view & refactors i18n 2015-09-03 11:15:05 +02:00
Enrique García
1c9cfb5a48 Merge pull request #333 from AyuntamientoMadrid/favicon 
adds favicon to other layouts
 2015-09-03 10:18:19 +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
29ae0c68f8 removes unnecessary comments 2015-09-03 01:29:13 +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
3172223930 Updates header and footer 2015-09-02 23:43:32 +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
137ca75055 adds favicon to other layouts 2015-09-02 22:34:16 +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
eb689d7c7e refactors comment form 2015-09-02 17:22:21 +02:00
Juanjo Bazán
df5ef2dc29 makes helper independent of commentable class 2015-09-02 17:06:11 +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
79febe7bb8 Adds shared/filter_subnav partial to DRY filters 2015-09-02 13:39:27 +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
Juanjo Bazán
31a8c15344 removes redundant condition 2015-09-02 12:57:09 +02:00
Juanjo Bazán
0c7ce4b6cf includes organizations in the cache key helper 2015-09-02 12:39:31 +02:00
Alberto Garcia Cabeza
da86c5d6e0 Adds styles for verification account process 2015-09-02 12:34:08 +02:00
Juanjo Bazán
5c10435064 disables voting on comments for not allowed users 2015-09-02 12:23:56 +02:00
Juanjo Bazán
8915ce7ffd adds interface to disallow organizations votes 
on debates
 2015-09-02 12:16:55 +02:00
rgarcia
abfc93ea78 hot fix to take into account preproduction 2015-09-02 11:36:30 +02:00