Skip to content

Commit 73ae6b2

Browse files
beaver-devbeaver-dev
committed
Merge branch 'development' into pjax
Fixed conflicts: featherbb/View/header.php
2 parents 206fabb + 6b4682e commit 73ae6b2

File tree

212 files changed

+12647
-1562
lines changed

Some content is hidden

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

212 files changed

+12647
-1562
lines changed

‎.gitignore‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
featherbb/config.php
1+
/featherbb/config.php
22
.idea/
33
nbproject/
4-
lang/French
54
.htaccess
65
composer.lock
76
cache/*.php
87
cache/*.cache
9-
plugins/bbcode-toolbar
10-
plugins/private-messages
11-
plugins/*.zip
12-
style/img/avatars/*
13-
!style/img/avatars/.gitkeep
8+
/plugins/*
9+
!/plugins/test
10+
/style/img/avatars/*
11+
!/style/img/avatars/.gitkeep

‎.htaccess.dist‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1+
# Remove index.php from URL
2+
13
RewriteEngine On
24
RewriteCond %{REQUEST_FILENAME} !-f
35
RewriteRule ^ index.php [QSA,L]
46
Options -Indexes
7+
8+
# Disable access to config.php file
9+
# (it should not return any content, but just in case.)
10+
11+
<Files "config.php">
12+
Order Allow,Deny
13+
Deny from all
14+
</Files>

‎composer.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"role": "Contributor"
1717
}],
1818
"autoload": {
19-
"classmap": ["featherbb/Core/pomo/MO.php"],
19+
"classmap": ["featherbb/Core/gettext/MO.php"],
2020
"psr-4": {
21-
"Plugins\\": "plugins/",
21+
"FeatherBB\\Plugins\\": "plugins/",
2222
"FeatherBB\\": "featherbb/"
2323
}
2424
},
@@ -27,7 +27,8 @@
2727
"slim/slim": "~3.1",
2828
"statical/statical": "^1.1",
2929
"slim/flash": "^0.1.0",
30-
"firebase/php-jwt": "^3.0"
30+
"firebase/php-jwt": "^3.0",
31+
"vierbergenlars/php-semver": "^3.0"
3132
},
3233
"support": {
3334
"email": "[email protected]",

0 commit comments

Comments
 (0)