consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,828 Commits 1 Branch 0 Tags
d901b09560b9e73eaf35d4dd90fef6c79b66d9a1
Commit Graph

6270 Commits

Author SHA1 Message Date
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
rgarcia
587749782d hot fix for anonymous votes 2015-09-01 22:56:27 +02:00
Juanjo Bazán
e604ca656a Merge pull request #316 from AyuntamientoMadrid/secrets 
Secrets
 2015-09-01 21:25:45 +02:00
Raimond Garcia
085c2920c0 Merge pull request #314 from AyuntamientoMadrid/setting 
Settings improvements
 2015-09-01 21:15:57 +02:00
Raimond Garcia
3974ee1870 Merge pull request #315 from AyuntamientoMadrid/dev-seed 
rake db:dev_seed
 2015-09-01 21:12:19 +02:00
kikito
62415991c0 Fixes an issue found on comments using the dev_seed 2015-09-01 20:11:45 +02:00
rgarcia
c1e85d7894 updates http_basic keys 2015-09-01 20:05:47 +02:00
Juanjo Bazán
c6c32a0795 adds translation for admin settings' keys names 2015-09-01 20:00:41 +02:00
Juanjo Bazán
174bd73b89 removes official_level_0_name setting 2015-09-01 20:00:41 +02:00
Juanjo Bazán
2ed0486423 toggles layer on votes via js 2015-09-01 17:49:03 +02:00
Juanjo Bazán
ac7ad1d863 hides 'too many anonymous votes' layer 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
bcc58ab0c4 Adds styles for too much anonymous votes 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
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