Skip to content

Commit

Permalink
升级beta5
Browse files Browse the repository at this point in the history
  • Loading branch information
houzhenhong committed Apr 2, 2016
1 parent 2f10c89 commit c2d6649
Show file tree
Hide file tree
Showing 1,537 changed files with 25,335 additions and 55,203 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2015 Toby Zerner
Copyright (c) 2014-2016 Toby Zerner

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Config Github Settings
github_username = "fideloper"
github_repo = "Vaprobash"
github_branch = "1.4.1"
github_branch = "1.4.2"
github_url = "https://raw.githubusercontent.com/#{github_username}/#{github_repo}/#{github_branch}"

# Server Configuration
Expand Down Expand Up @@ -282,7 +282,7 @@ Vagrant.configure("2") do |config|
##########

# Install Nodejs
config.vm.provision "shell", path: "https://raw.githubusercontent.com/franzliedke/Vaprobash/patch-3/scripts/nodejs.sh", privileged: false, args: nodejs_packages.unshift(nodejs_version, github_url)
config.vm.provision "shell", path: "#{github_url}/scripts/nodejs.sh", privileged: false, args: nodejs_packages.unshift(nodejs_version, github_url)

# Install Ruby Version Manager (RVM)
# config.vm.provision "shell", path: "#{github_url}/scripts/rvm.sh", privileged: false, args: ruby_gems.unshift(ruby_version)
Expand Down
Binary file added assets/fonts/FontAwesome.otf
Binary file not shown.
Binary file added assets/fonts/fontawesome-webfont.eot
Binary file not shown.
640 changes: 640 additions & 0 deletions assets/fonts/fontawesome-webfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file added assets/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file added assets/fonts/fontawesome-webfont.woff2
Binary file not shown.
51 changes: 24 additions & 27 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,39 +21,36 @@
"docs": "http://flarum.org/docs"
},
"require": {
"flarum/composer-installer": "*",
"flarum/core": "^0.1.0",
"flarum/akismet": "^0.1.0",
"flarum/approval": "^0.1.0",
"flarum/auth-facebook": "^0.1.0",
"flarum/auth-github": "^0.1.0",
"flarum/auth-twitter": "^0.1.0",
"flarum/bbcode": "^0.1.0",
"flarum/emoji": "^0.1.0",
"flarum/english": "^0.1.0",
"flarum/flags": "^0.1.0",
"flarum/likes": "^0.1.0",
"flarum/lock": "^0.1.0",
"flarum/markdown": "^0.1.0",
"flarum/mentions": "^0.1.0",
"flarum/pusher": "^0.1.0",
"flarum/sticky": "^0.1.0",
"flarum/subscriptions": "^0.1.0",
"flarum/suspend": "^0.1.0",
"flarum/tags": "^0.1.0",
"flagrow/flarum-ext-image-upload": "0.2.0-beta.2",
"cloudinary/cloudinary_php": "^1.3",
"vingle/flarum-configure-smtp": "^0.1.0@beta",
"flarum/flarum-ext-akismet": "^0.1.0",
"flarum/flarum-ext-approval": "^0.1.0",
"flarum/flarum-ext-auth-facebook": "^0.1.0",
"flarum/flarum-ext-auth-github": "^0.1.0",
"flarum/flarum-ext-auth-twitter": "^0.1.0",
"flarum/flarum-ext-bbcode": "^0.1.0",
"flarum/flarum-ext-emoji": "^0.1.0",
"flarum/flarum-ext-english": "^0.1.0",
"flarum/flarum-ext-flags": "^0.1.0",
"flarum/flarum-ext-likes": "^0.1.0",
"flarum/flarum-ext-lock": "^0.1.0",
"flarum/flarum-ext-markdown": "^0.1.0",
"flarum/flarum-ext-mentions": "^0.1.0",
"flarum/flarum-ext-pusher": "^0.1.0",
"flarum/flarum-ext-sticky": "^0.1.0",
"flarum/flarum-ext-subscriptions": "^0.1.0",
"flarum/flarum-ext-suspend": "^0.1.0",
"flarum/flarum-ext-tags": "^0.1.0",
"jsthon/flarum-ext-simplified-chinese": "^0.1.0@beta",
"s9e/flarum-ext-mediaembed": "^0.3.2",
"lazyboywu/flarum-ext-auth-qq": "^0.1.0",
"flagrow/flarum-ext-guardian": "^0.1.2",
"davis/flarum-ext-socialprofile": "^0.1.3"
"vingle/flarum-configure-smtp": "^0.1.0@beta",
"flagrow/flarum-ext-image-upload": "^0.2.1"
},
"require-dev": {
"franzl/studio": "0.10.x@dev"
"franzl/studio": "^0.10.0"
},
"config": {
"preferred-install": "dist"
},
"minimum-stability": "beta"
"minimum-stability": "beta",
"prefer-stable": true
}
Loading

0 comments on commit c2d6649

Please sign in to comment.