Skip to content

Commit c2d6649

Browse files
author
houzhenhong
committed
升级beta5
1 parent 2f10c89 commit c2d6649

File tree

1,537 files changed

+25335
-55203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,537 files changed

+25335
-55203
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2015 Toby Zerner
3+
Copyright (c) 2014-2016 Toby Zerner
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Vagrantfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Config Github Settings
55
github_username = "fideloper"
66
github_repo = "Vaprobash"
7-
github_branch = "1.4.1"
7+
github_branch = "1.4.2"
88
github_url = "https://raw.githubusercontent.com/#{github_username}/#{github_repo}/#{github_branch}"
99

1010
# Server Configuration
@@ -282,7 +282,7 @@ Vagrant.configure("2") do |config|
282282
##########
283283

284284
# Install Nodejs
285-
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)
285+
config.vm.provision "shell", path: "#{github_url}/scripts/nodejs.sh", privileged: false, args: nodejs_packages.unshift(nodejs_version, github_url)
286286

287287
# Install Ruby Version Manager (RVM)
288288
# config.vm.provision "shell", path: "#{github_url}/scripts/rvm.sh", privileged: false, args: ruby_gems.unshift(ruby_version)

assets/fonts/FontAwesome.otf

104 KB
Binary file not shown.
67.3 KB
Binary file not shown.

assets/fonts/fontawesome-webfont.svg

Lines changed: 640 additions & 0 deletions
Loading
135 KB
Binary file not shown.
79.4 KB
Binary file not shown.
63 KB
Binary file not shown.

composer.json

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,36 @@
2121
"docs": "http://flarum.org/docs"
2222
},
2323
"require": {
24-
"flarum/composer-installer": "*",
2524
"flarum/core": "^0.1.0",
26-
"flarum/akismet": "^0.1.0",
27-
"flarum/approval": "^0.1.0",
28-
"flarum/auth-facebook": "^0.1.0",
29-
"flarum/auth-github": "^0.1.0",
30-
"flarum/auth-twitter": "^0.1.0",
31-
"flarum/bbcode": "^0.1.0",
32-
"flarum/emoji": "^0.1.0",
33-
"flarum/english": "^0.1.0",
34-
"flarum/flags": "^0.1.0",
35-
"flarum/likes": "^0.1.0",
36-
"flarum/lock": "^0.1.0",
37-
"flarum/markdown": "^0.1.0",
38-
"flarum/mentions": "^0.1.0",
39-
"flarum/pusher": "^0.1.0",
40-
"flarum/sticky": "^0.1.0",
41-
"flarum/subscriptions": "^0.1.0",
42-
"flarum/suspend": "^0.1.0",
43-
"flarum/tags": "^0.1.0",
44-
"flagrow/flarum-ext-image-upload": "0.2.0-beta.2",
45-
"cloudinary/cloudinary_php": "^1.3",
46-
"vingle/flarum-configure-smtp": "^0.1.0@beta",
25+
"flarum/flarum-ext-akismet": "^0.1.0",
26+
"flarum/flarum-ext-approval": "^0.1.0",
27+
"flarum/flarum-ext-auth-facebook": "^0.1.0",
28+
"flarum/flarum-ext-auth-github": "^0.1.0",
29+
"flarum/flarum-ext-auth-twitter": "^0.1.0",
30+
"flarum/flarum-ext-bbcode": "^0.1.0",
31+
"flarum/flarum-ext-emoji": "^0.1.0",
32+
"flarum/flarum-ext-english": "^0.1.0",
33+
"flarum/flarum-ext-flags": "^0.1.0",
34+
"flarum/flarum-ext-likes": "^0.1.0",
35+
"flarum/flarum-ext-lock": "^0.1.0",
36+
"flarum/flarum-ext-markdown": "^0.1.0",
37+
"flarum/flarum-ext-mentions": "^0.1.0",
38+
"flarum/flarum-ext-pusher": "^0.1.0",
39+
"flarum/flarum-ext-sticky": "^0.1.0",
40+
"flarum/flarum-ext-subscriptions": "^0.1.0",
41+
"flarum/flarum-ext-suspend": "^0.1.0",
42+
"flarum/flarum-ext-tags": "^0.1.0",
43+
"jsthon/flarum-ext-simplified-chinese": "^0.1.0@beta",
4744
"s9e/flarum-ext-mediaembed": "^0.3.2",
48-
"lazyboywu/flarum-ext-auth-qq": "^0.1.0",
49-
"flagrow/flarum-ext-guardian": "^0.1.2",
50-
"davis/flarum-ext-socialprofile": "^0.1.3"
45+
"vingle/flarum-configure-smtp": "^0.1.0@beta",
46+
"flagrow/flarum-ext-image-upload": "^0.2.1"
5147
},
5248
"require-dev": {
53-
"franzl/studio": "0.10.x@dev"
49+
"franzl/studio": "^0.10.0"
5450
},
5551
"config": {
5652
"preferred-install": "dist"
5753
},
58-
"minimum-stability": "beta"
54+
"minimum-stability": "beta",
55+
"prefer-stable": true
5956
}

0 commit comments

Comments
 (0)