Skip to content

Commit 252d3f9

Browse files
Dmi3yyDmi3yy
authored
Merge pull request #2117 from yama/1.4.x-refactor
merged from ce by cherry pick
2 parents 9bb77ed + 84a7faf commit 252d3f9

File tree

328 files changed

+42224
-12606
lines changed

Some content is hidden

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

328 files changed

+42224
-12606
lines changed

‎.editorconfig‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = lf
5+
insert_final_newline = true
6+
trim_trailing_whitespace = true
7+
indent_style = space
8+
tab_width = 4
9+
10+
[**.js]
11+
tab_width = 4
12+
13+
[**.coffee]
14+
tab_width = 4
15+
16+
[**.cson]
17+
tab_width = 4
18+
19+
[**.json]
20+
tab_width = 4
21+
22+
[**rc]
23+
tab_width = 4
24+
25+
[**php]
26+
tab_width = 4

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.gitattributes export-ignore
22
.gitignore export-ignore
33
.tx export-ignore
4+
.github export-ignore

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
!/assets/cache/.htaccess
1212
!/assets/cache/index.html
1313
!/assets/cache/siteManager.php
14+
!/assets/cache/sitePublishing.idx.php
1415
!/assets/cache/images/index.html
1516
!/assets/cache/rss/index.html
1617
!/assets/cache/updater/index.html

‎assets/.thumbs/.htaccess‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
IndexIgnore */*
22
<Files *.php>
3-
Order Deny,Allow
4-
Deny from all
3+
<ifModule mod_authz_core.c>
4+
Require all denied
5+
</ifModule>
6+
<ifModule !mod_authz_core.c>
7+
order deny,allow
8+
deny from all
9+
</ifModule>
510
</Files>

‎assets/backup/.htaccess‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
order deny,allow
2-
deny from all
1+
<ifModule mod_authz_core.c>
2+
Require all denied
3+
</ifModule>
4+
<ifModule !mod_authz_core.c>
5+
order deny,allow
6+
deny from all
7+
</ifModule>
8+

‎assets/cache/.htaccess‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ifModule mod_authz_core.c>
2+
Require all denied
3+
</ifModule>
4+
<ifModule !mod_authz_core.c>
5+
order deny,allow
6+
deny from all
7+
</ifModule>

‎assets/cache/images/.htaccess‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
order deny,allow
2-
allow from all
1+
<ifModule mod_authz_core.c>
2+
Require all granted
3+
</ifModule>
4+
<ifModule !mod_authz_core.c>
5+
order deny,allow
6+
allow from all
7+
</ifModule>

‎assets/cache/images/ht.access‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
order deny,allow
2-
allow from all
1+
<ifModule mod_authz_core.c>
2+
Require all granted
3+
</ifModule>
4+
<ifModule !mod_authz_core.c>
5+
order deny,allow
6+
allow from all
7+
</ifModule>

‎assets/cache/sitePublishing.idx.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?php $cacheRefreshTime=0; ?>

‎assets/export/.htaccess‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
IndexIgnore */*
22
<Files *.php>
3-
Order Deny,Allow
4-
Deny from all
3+
<ifModule mod_authz_core.c>
4+
Require all denied
5+
</ifModule>
6+
<ifModule !mod_authz_core.c>
7+
order deny,allow
8+
deny from all
9+
</ifModule>
510
</Files>

0 commit comments

Comments
 (0)