1.1 --- a/.hgtags	Thu May 24 00:16:19 2012 +0200
     1.2 +++ b/.hgtags	Sun May 27 23:08:33 2012 +0200
     1.3 @@ -39,9 +39,11 @@
     1.4  bf735d8095aa237e0283305fc0c37527572248e7 beta32
     1.5  4905d7d79486cee780b715a90dcd643e936b6a7a beta33
     1.6  55939cbde1a5d318c3342fabee841748cc3d7886 beta34
     1.7 +f7bc22fbf660bd8ac57a1d715d6faabc3e34ba7f beta35
     1.8  74f768a162e1d941158bde5a3e42bb8a71af5090 v2.beta1
     1.9  371e690018ea59317682bce44e7b3c33c70d129a v2.beta2
    1.10  3e9457cfc6b195fc72760b5b22981e2e7b9c84d8 v2.beta3
    1.11  ab68f1d0f78e8a5363e30c191e58230ff83aa2ac v2.beta4
    1.12  62923420b7f86d7a1ca0dfe8853aa85f36abfec9 v2.beta5
    1.13 +9447ea55539854311a4229fbef12e51ee8be6bf1 v2.beta6
    1.14  f5b95602507ac9884e7e943cc1eab9da91ff890b translate

     2.1 --- a/app/main/initiative/_show_voting.lua	Thu May 24 00:16:19 2012 +0200
     2.2 +++ b/app/main/initiative/_show_voting.lua	Sun May 27 23:08:33 2012 +0200
     2.3 @@ -29,8 +29,8 @@
     2.4          :left_join("vote", nil, { "vote.initiative_id = ? AND vote.member_id = member.id", initiative.id })
     2.5          :add_field("direct_voter.weight as voter_weight")
     2.6          :add_field("coalesce(vote.grade, 0) as grade")
     2.7 -        :join("initiative", nil, "initiative.id = vote.initiative_id")
     2.8 -        :join("issue", nil, "issue.id = initiative.issue_id")
     2.9 +        :left_join("initiative", nil, "initiative.id = vote.initiative_id")
    2.10 +        :left_join("issue", nil, "issue.id = initiative.issue_id")
    2.11      }
    2.12    }
    2.13  

     3.1 --- a/config/default.lua	Thu May 24 00:16:19 2012 +0200
     3.2 +++ b/config/default.lua	Sun May 27 23:08:33 2012 +0200
     3.3 @@ -10,7 +10,7 @@
     3.4  end
     3.5  
     3.6  config.app_name = "LiquidFeedback"
     3.7 -config.app_version = "2.beta5"
     3.8 +config.app_version = "2.beta6"
     3.9  
    3.10  config.instance_name = request.get_config_name()
    3.11  

     4.1 --- a/config/example.lua	Thu May 24 00:16:19 2012 +0200
     4.2 +++ b/config/example.lua	Sun May 27 23:08:33 2012 +0200
     4.3 @@ -2,7 +2,7 @@
     4.4  -- request.set_absolute_baseurl("http://www.example.com/lf/")
     4.5  
     4.6  config.app_name = "LiquidFeedback"
     4.7 -config.app_version = "2.beta1"
     4.8 +config.app_version = "2.beta6"
     4.9  
    4.10  config.instance_name = request.get_config_name()
    4.11