@@ -81,7 +81,7 @@ plugin 'community_engine', :git => ce_git_repo, :submodule => true
# Initialize submodules
git :submodule => "init"
git :submodule => "update"
-checkout_ce_branch('edge')
+# checkout_ce_branch('edge')
# Add CE routes
route "map.routes_from_plugin :community_engine"
community_engine_setup_template.rb
@@ -310,7 +310,7 @@ sv:
#en: delete_this_user: Delete this user
delete_this_user: Ta bort den här användaren
#en: deny: Deny
- deny: Avly
+ deny: Avslå
#en: denied: denied
denied: avslagen
#en: denied_friendships: Denied Friendships
@@ -388,7 +388,7 @@ sv:
#en: end: end
end: slut
#en: end_date: End date
- end_date: Sluttdatum
+ end_date: Slutdatum
#en: end_required: end (required)
end_required: slut (obligatoriskt)
#en: end_tome: End time
lang/ui/sv-SE.yml
@@ -125,7 +125,9 @@ module AssetHelpers
end
module ::ActionView::Helpers::AssetTagHelper
- include AssetHelpers
+ if !self.included_modules.include? AssetHelpers
+ include AssetHelpers
+ end
end
lib/rails_asset_extensions.rb
067be4ba83c2c477b98832cce9783e06625e1482
68e498853e113c6adfef0ef0f6d076f0a403ef0b
bborn
bruno.bornsztein@gmail.com
http://github.com/bborn/communityengine/commit/1e2b90ae1497b06ef79531da7643b0f543b834bc
1e2b90ae1497b06ef79531da7643b0f543b834bc
2009-05-21T13:16:21-07:00
2009-05-21T13:16:21-07:00
Merge branch 'merge-forks' into edge
Conflicts:
README.markdown
6ac4daf2a826981c1681bff55ae3e800517d2faa
bborn
bruno.bornsztein@gmail.com