jdarwood007 commited on 2020-12-07 17:45:03
Showing 5 changed files, with 135 additions and 59 deletions.
... | ... |
@@ -0,0 +1,19 @@ |
1 |
+name: Javascript Checks |
|
2 |
+ |
|
3 |
+on: |
|
4 |
+ push: |
|
5 |
+ branches: [ smf21, smf20, master ] |
|
6 |
+ pull_request: |
|
7 |
+ branches: [ smf21, smf20, master ] |
|
8 |
+ |
|
9 |
+ workflow_dispatch: |
|
10 |
+jobs: |
|
11 |
+ lint: |
|
12 |
+ runs-on: ubuntu-latest |
|
13 |
+ name: LINT Checks |
|
14 |
+ steps: |
|
15 |
+ - uses: actions/checkout@master |
|
16 |
+ - name: Javascript LINT |
|
17 |
+ uses: tj-actions/eslint-changed-files@v4 |
|
18 |
+ with: |
|
19 |
+ config-path: buildTools/eslintrc |
|
0 | 20 |
\ No newline at end of file |
... | ... |
@@ -0,0 +1,46 @@ |
1 |
+name: Software Checks |
|
2 |
+ |
|
3 |
+on: |
|
4 |
+ push: |
|
5 |
+ branches: [ smf21, smf20, master ] |
|
6 |
+ pull_request: |
|
7 |
+ branches: [ smf21, smf20, master ] |
|
8 |
+ |
|
9 |
+ workflow_dispatch: |
|
10 |
+jobs: |
|
11 |
+ check-signedoff: |
|
12 |
+ runs-on: ubuntu-latest |
|
13 |
+ name: Check Signed Off |
|
14 |
+ steps: |
|
15 |
+ - uses: actions/checkout@master |
|
16 |
+ with: |
|
17 |
+ submodules: true |
|
18 |
+ - name: Update Build Tools |
|
19 |
+ run: git submodule foreach git pull origin master |
|
20 |
+ - name: Checking Sign off |
|
21 |
+ id: check-signoff |
|
22 |
+ run: php ./buildTools/check-signed-off.php github |
|
23 |
+ check-licensing: |
|
24 |
+ runs-on: ubuntu-latest |
|
25 |
+ name: Check Licensing |
|
26 |
+ steps: |
|
27 |
+ - uses: actions/checkout@master |
|
28 |
+ with: |
|
29 |
+ submodules: true |
|
30 |
+ - name: Update Build Tools |
|
31 |
+ run: git submodule foreach git pull origin master |
|
32 |
+ - name: Checking Licensing |
|
33 |
+ id: check-licensing |
|
34 |
+ run: php ./buildTools/check-license-master.php ./ |
|
35 |
+ check-eof: |
|
36 |
+ runs-on: ubuntu-latest |
|
37 |
+ name: Check End of File |
|
38 |
+ steps: |
|
39 |
+ - uses: actions/checkout@master |
|
40 |
+ with: |
|
41 |
+ submodules: true |
|
42 |
+ - name: Update Build Tools |
|
43 |
+ run: git submodule foreach git pull origin master |
|
44 |
+ - name: Checking End of File |
|
45 |
+ id: check-eof |
|
46 |
+ run: php ./buildTools/check-eof-master.php ./ |
|
0 | 47 |
\ No newline at end of file |
... | ... |
@@ -0,0 +1,27 @@ |
1 |
+name: PHP Syntax Check |
|
2 |
+ |
|
3 |
+on: |
|
4 |
+ push: |
|
5 |
+ branches: [ smf21, smf20, master ] |
|
6 |
+ pull_request: |
|
7 |
+ branches: [ smf21, smf20, master ] |
|
8 |
+ |
|
9 |
+ workflow_dispatch: |
|
10 |
+jobs: |
|
11 |
+ syntax-checker: |
|
12 |
+ runs-on: ${{ matrix.operating-system }} |
|
13 |
+ strategy: |
|
14 |
+ matrix: |
|
15 |
+ operating-system: [ ubuntu-latest ] |
|
16 |
+ php: [ '7.1', '7.2', '7.3', '7.4', '8.0' ] |
|
17 |
+ name: PHP ${{ matrix.php }} Syntax Check |
|
18 |
+ steps: |
|
19 |
+ - uses: actions/checkout@master |
|
20 |
+ with: |
|
21 |
+ submodules: true |
|
22 |
+ - name: Setup PHP |
|
23 |
+ id: SetupPHP |
|
24 |
+ uses: nanasess/setup-php@master |
|
25 |
+ with: |
|
26 |
+ php-version: ${{ matrix.php }} |
|
27 |
+ - run: php ./buildTools/check-php-syntax.php ./ |
|
0 | 28 |
\ No newline at end of file |
... | ... |
@@ -1,18 +0,0 @@ |
1 |
-sudo: required |
|
2 |
- |
|
3 |
-language: php |
|
4 |
- |
|
5 |
-php: |
|
6 |
- - 7.1 |
|
7 |
- - 7.2 |
|
8 |
- - 7.3 |
|
9 |
- |
|
10 |
-matrix: |
|
11 |
- include: |
|
12 |
- dist: xenial |
|
13 |
- |
|
14 |
-script: |
|
15 |
- - sudo add-apt-repository ppa:git-core/ppa -y |
|
16 |
- - sudo apt-get update |
|
17 |
- - sudo apt-get install git |
|
18 |
- - if ./buildTools/runTools.sh travis | grep "Error:"; then exit 1; fi |
|
19 | 0 |
\ No newline at end of file |
... | ... |
@@ -3,7 +3,7 @@ |
3 | 3 |
<package-info xmlns="http://www.simplemachines.org/xml/package-info" xmlns:smf="http://www.simplemachines.org/"> |
4 | 4 |
<id>SimpleDeskTeam:SimpleDesk</id> |
5 | 5 |
<name>SimpleDesk - Integrated Helpdesk for Simple Machines Forum</name> |
6 |
- <version>2.1</version> |
|
6 |
+ <version>2.1 RC1</version> |
|
7 | 7 |
<type>modification</type> |
8 | 8 |
|
9 | 9 |
<install for="1.1.*, 2.0.*, 2.1 Beta 1, 2.1 Beta 2, Beta 3, 2.1 Beta 4, 2.1 RC1, 2.1 RC2"> |
... | ... |
@@ -46,19 +46,19 @@ |
46 | 46 |
<!-- All the hooks --> |
47 | 47 |
<!-- SMF Core --> |
48 | 48 |
<hook hook="integrate_pre_include" function="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
49 |
- <hook hook="integrate_user_info" function="shd_init" /> |
|
50 |
- <hook hook="integrate_actions" function="shd_init_actions" /> |
|
51 |
- <hook hook="integrate_buffer" function="shd_buffer_replace" /> |
|
52 |
- <hook hook="integrate_menu_buttons" function="shd_main_menu" /> |
|
53 |
- <hook hook="integrate_load_permissions" function="shd_admin_smf_perms" /> |
|
49 |
+ <hook hook="integrate_user_info" function="shd_init" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
50 |
+ <hook hook="integrate_actions" function="shd_init_actions" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
51 |
+ <hook hook="integrate_buffer" function="shd_buffer_replace" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
52 |
+ <hook hook="integrate_menu_buttons" function="shd_main_menu" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
53 |
+ <hook hook="integrate_load_permissions" function="shd_admin_smf_perms" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
54 | 54 |
<hook hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
55 | 55 |
<hook hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
56 | 56 |
<hook hook="integrate_post_parsebbc" function="shd_parse_wikilinks" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
57 | 57 |
|
58 | 58 |
<!-- Admin Section: Core --> |
59 | 59 |
<hook hook="integrate_admin_include" function="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
60 |
- <hook hook="integrate_admin_areas" function="shd_admin_bootstrap" /> |
|
61 |
- <hook hook="integrate_admin_search" function="shd_admin_search" /> |
|
60 |
+ <hook hook="integrate_admin_areas" function="shd_admin_bootstrap" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
61 |
+ <hook hook="integrate_admin_search" function="shd_admin_search" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
62 | 62 |
|
63 | 63 |
<!-- Admin Section: Attachments --> |
64 | 64 |
<hook hook="integrate_remove_attachments" function="shd_remove_attachments" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
... | ... |
@@ -72,11 +72,11 @@ |
72 | 72 |
<hook hook="integrate_modification_types" function="shd_modification_types" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" /> |
73 | 73 |
|
74 | 74 |
<!-- Admin Section: Other --> |
75 |
- <hook hook="integrate_convert_msgbody" function="shd_convert_msgbody" /> |
|
76 |
- <hook hook="integrate_modifylanguages" function="shd_modifylanguages" /> |
|
75 |
+ <hook hook="integrate_convert_msgbody" function="shd_convert_msgbody" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
76 |
+ <hook hook="integrate_modifylanguages" function="shd_modifylanguages" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
77 | 77 |
|
78 | 78 |
<!-- Display --> |
79 |
- <hook hook="integrate_display_buttons" function="shd_display_btn_mvtopic" /> |
|
79 |
+ <hook hook="integrate_display_buttons" function="shd_display_btn_mvtopic" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
80 | 80 |
|
81 | 81 |
<!-- ShowAttachments --> |
82 | 82 |
<hook hook="integrate_download_request" function="shd_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" /> |
... | ... |
@@ -86,8 +86,8 @@ |
86 | 86 |
|
87 | 87 |
<!-- Profile --> |
88 | 88 |
<hook hook="integrate_pre_profile_areas" function="shd_profile_areas" file="$sourcedir/sd_source/Subs-SimpleDeskProfile.php" /> |
89 |
- <hook hook="integrate_profile_profileSaveGroups" function="shd_clear_active_tickets" /> |
|
90 |
- <hook hook="integrate_profile_trackip" function="shd_profile_trackip" /> |
|
89 |
+ <hook hook="integrate_profile_profileSaveGroups" function="shd_clear_active_tickets" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
90 |
+ <hook hook="integrate_profile_trackip" function="shd_profile_trackip" file="$sourcedir/sd_source/Subs-SimpleDeskProfile.php" /> |
|
91 | 91 |
|
92 | 92 |
<!-- Other --> |
93 | 93 |
<hook hook="integrate_SSI" function="ssi_shd_called" file="$sourcedir/sd_source/SimpleDesk-SSI.php" /> |
... | ... |
@@ -96,6 +96,8 @@ |
96 | 96 |
<database>install-sd.php</database> |
97 | 97 |
|
98 | 98 |
<redirect url="?action=admin;area=helpdesk_info" /> |
99 |
+ |
|
100 |
+ <credits url="https://www.simpledesk.net" license="BSD 3-Clause" licenseurl="https://github.com/SimpleMachines/SimpleDesk/blob/master/license.txt" copyright="2010-2020">Simple Desk</credits> |
|
99 | 101 |
</install> |
100 | 102 |
|
101 | 103 |
<uninstall for="2.1 RC3, 2.1 RC4, 2.1.0-2.1.99"> |
... | ... |
@@ -105,52 +107,52 @@ |
105 | 107 |
|
106 | 108 |
<!-- All the hooks --> |
107 | 109 |
<!-- SMF Core --> |
108 |
- <hook hook="integrate_pre_include" function="$sourcedir/sd_source/Subs-SimpleDesk.php" reverse="true" /> |
|
109 |
- <hook hook="integrate_user_info" function="shd_init" reverse="true" /> |
|
110 |
- <hook hook="integrate_actions" function="shd_init_actions" reverse="true" /> |
|
111 |
- <hook hook="integrate_buffer" function="shd_buffer_replace" reverse="true" /> |
|
112 |
- <hook hook="integrate_menu_buttons" function="shd_main_menu" reverse="true" /> |
|
113 |
- <hook hook="integrate_load_permissions" function="shd_admin_smf_perms" reverse="true" /> |
|
114 |
- <hook hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" reverse="true" /> |
|
115 |
- <hook hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" reverse="true" /> |
|
116 |
- <hook hook="integrate_post_parsebbc" function="shd_parse_wikilinks" file="$sourcedir/sd_source/Subs-SimpleDesk.php" reverse="true" /> |
|
110 |
+ <hook reverse="true" hook="integrate_pre_include" function="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
111 |
+ <hook reverse="true" hook="integrate_user_info" function="shd_init" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
112 |
+ <hook reverse="true" hook="integrate_actions" function="shd_init_actions" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
113 |
+ <hook reverse="true" hook="integrate_buffer" function="shd_buffer_replace" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
114 |
+ <hook reverse="true" hook="integrate_menu_buttons" function="shd_main_menu" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
115 |
+ <hook reverse="true" hook="integrate_load_permissions" function="shd_admin_smf_perms" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
116 |
+ <hook reverse="true" hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
117 |
+ <hook reverse="true" hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
118 |
+ <hook reverse="true" hook="integrate_post_parsebbc" function="shd_parse_wikilinks" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
117 | 119 |
|
118 | 120 |
<!-- Admin Section: Core --> |
119 |
- <hook hook="integrate_admin_include" function="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" reverse="true" /> |
|
120 |
- <hook hook="integrate_admin_areas" function="shd_admin_bootstrap" reverse="true" /> |
|
121 |
- <hook hook="integrate_admin_search" function="shd_admin_search" reverse="true" /> |
|
121 |
+ <hook reverse="true" hook="integrate_admin_include" function="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
122 |
+ <hook reverse="true" hook="integrate_admin_areas" function="shd_admin_bootstrap" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
123 |
+ <hook reverse="true" hook="integrate_admin_search" function="shd_admin_search" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
122 | 124 |
|
123 | 125 |
<!-- Admin Section: Attachments --> |
124 |
- <hook hook="integrate_remove_attachments" function="shd_remove_attachments" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" reverse="true" /> |
|
125 |
- <hook hook="integrate_attachments_browse" function="shd_attachments_browse" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" reverse="true" /> |
|
126 |
- <hook hook="integrate_attachment_remove" function="shd_attachment_remove" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" reverse="true" /> |
|
126 |
+ <hook reverse="true" hook="integrate_remove_attachments" function="shd_remove_attachments" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
127 |
+ <hook reverse="true" hook="integrate_attachments_browse" function="shd_attachments_browse" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" /> |
|
128 |
+ <hook reverse="true" hook="integrate_attachment_remove" function="shd_attachment_remove" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" /> |
|
127 | 129 |
|
128 | 130 |
<!-- Admin Section: Packages --> |
129 |
- <hook hook="integrate_packages_sort_id" function="shd_packages_sort_id" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" reverse="true" /> |
|
130 |
- <hook hook="integrate_package_download" function="shd_package_download" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" reverse="true" /> |
|
131 |
- <hook hook="integrate_package_upload" function="shd_package_upload" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" reverse="true" /> |
|
132 |
- <hook hook="integrate_modification_types" function="shd_modification_types" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" reverse="true" /> |
|
131 |
+ <hook reverse="true" hook="integrate_packages_sort_id" function="shd_packages_sort_id" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" /> |
|
132 |
+ <hook reverse="true" hook="integrate_package_download" function="shd_package_download" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" /> |
|
133 |
+ <hook reverse="true" hook="integrate_package_upload" function="shd_package_upload" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" /> |
|
134 |
+ <hook reverse="true" hook="integrate_modification_types" function="shd_modification_types" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" /> |
|
133 | 135 |
|
134 | 136 |
<!-- Admin Section: Other --> |
135 |
- <hook hook="integrate_convert_msgbody" function="shd_convert_msgbody" reverse="true" /> |
|
136 |
- <hook hook="integrate_modifylanguages" function="shd_modifylanguages" reverse="true" /> |
|
137 |
+ <hook reverse="true" hook="integrate_convert_msgbody" function="shd_convert_msgbody" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
138 |
+ <hook reverse="true" hook="integrate_modifylanguages" function="shd_modifylanguages" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" /> |
|
137 | 139 |
|
138 | 140 |
<!-- Display --> |
139 |
- <hook hook="integrate_display_buttons" function="shd_display_btn_mvtopic" reverse="true" /> |
|
141 |
+ <hook reverse="true" hook="integrate_display_buttons" function="shd_display_btn_mvtopic" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
140 | 142 |
|
141 | 143 |
<!-- ShowAttachments --> |
142 |
- <hook hook="integrate_download_request" function="shd_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" reverse="true" /> |
|
144 |
+ <hook reverse="true" hook="integrate_download_request" function="shd_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" /> |
|
143 | 145 |
|
144 | 146 |
<!-- BoardIndex --> |
145 |
- <hook hook="integrate_getboardtree" function="shd_add_to_boardindex" file="$sourcedir/sd_source/Subs-SimpleDeskBoardIndex.php" reverse="true" /> |
|
147 |
+ <hook reverse="true" hook="integrate_getboardtree" function="shd_add_to_boardindex" file="$sourcedir/sd_source/Subs-SimpleDeskBoardIndex.php" /> |
|
146 | 148 |
|
147 | 149 |
<!-- Profile --> |
148 |
- <hook hook="integrate_pre_profile_areas" function="shd_profile_areas" file="$sourcedir/sd_source/Subs-SimpleDeskProfile.php" reverse="true" /> |
|
149 |
- <hook hook="integrate_profile_profileSaveGroups" function="shd_clear_active_tickets" reverse="true" /> |
|
150 |
- <hook hook="integrate_profile_trackip" function="shd_profile_trackip" reverse="true" /> |
|
150 |
+ <hook reverse="true" hook="integrate_pre_profile_areas" function="shd_profile_areas" file="$sourcedir/sd_source/Subs-SimpleDeskProfile.php" /> |
|
151 |
+ <hook reverse="true" hook="integrate_profile_profileSaveGroups" function="shd_clear_active_tickets" file="$sourcedir/sd_source/Subs-SimpleDesk.php" /> |
|
152 |
+ <hook reverse="true" hook="integrate_profile_trackip" function="shd_profile_trackip" file="$sourcedir/sd_source/Subs-SimpleDeskProfile.php" /> |
|
151 | 153 |
|
152 | 154 |
<!-- Other --> |
153 |
- <hook hook="integrate_SSI" function="ssi_shd_called" file="$sourcedir/sd_source/SimpleDesk-SSI.php" reverse="true" /> |
|
155 |
+ <hook reverse="true" hook="integrate_SSI" function="ssi_shd_called" file="$sourcedir/sd_source/SimpleDesk-SSI.php" /> |
|
154 | 156 |
|
155 | 157 |
<!-- language files, removed --> |
156 | 158 |
<remove-dir name="$themes_dir/default/languages/sd_language" /> |
157 | 159 |