Skip to content

Commit e9eb2fb

Browse files
jdarwood007jdarwood007
authored
Update master (#159)
* Release 2.1.0 (#158) * Release 2.1.0 * Fix buildTools * Sync up smf21 to master * Fix buildTools
1 parent 4dec93f commit e9eb2fb

Some content is hidden

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

51 files changed

+164
-96
lines changed

‎buildTools‎

‎install-sd.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 RC1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: install.php *
1818
**************************************************************/
1919

@@ -181,7 +181,7 @@ function sd_get_install_modSettings($getAll = false)
181181
function sd_get_install_rows()
182182
{
183183
global $smcFunc;
184-
static $current_package_server_url = 'https://www.simpledesk.net/download/plugins/2.0';
184+
static $current_package_server_url = 'https://www.simpledesk.net/download/plugins/2.1';
185185

186186
$rows = array();
187187
$rows[] = array(

‎language-readme/readme.english.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Thank you for downloading SimpleDesk :)
66

77
Yes, we know, you don't want the boring formality of a license, but to protect us - and you - we have a license in the code. Clicking the install button after this constitutes acceptance of the following terms.
88

9-
[code]Copyright (c) 2010-2015, SimpleDesk Team
9+
[code]Copyright (c) 2010-2022, SimpleDesk Team
1010
All rights reserved.
1111

1212
Redistribution and use in source and binary forms, with or without

‎package-info.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package-info xmlns="http://www.simplemachines.org/xml/package-info" xmlns:smf="http://www.simplemachines.org/">
44
<id>SimpleDeskTeam:SimpleDesk</id>
55
<name>SimpleDesk - Integrated Helpdesk for Simple Machines Forum</name>
6-
<version>2.1 RC2</version>
6+
<version>2.1.0</version>
77
<type>modification</type>
88

99
<install for="2.1 RC4, 2.1.0-2.1.99">
@@ -28,6 +28,7 @@
2828
<!-- css -->
2929
<require-file name="css/helpdesk.css" destination="$themedir/css" />
3030
<require-file name="css/helpdesk_admin.css" destination="$themedir/css" />
31+
<require-file name="css/helpdesk_responsive.css" destination="$themedir/css" />
3132
<require-file name="css/helpdesk_icons.css" destination="$themedir/css" />
3233

3334
<!-- scripts -->
@@ -46,6 +47,7 @@
4647
<hook hook="integrate_actions" function="shd_init_actions" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
4748
<hook hook="integrate_buffer" function="shd_buffer_replace" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
4849
<hook hook="integrate_menu_buttons" function="shd_main_menu" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
50+
<hook hook="integrate_current_action" function="shd_init_current_action" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
4951
<hook hook="integrate_load_permissions" function="shd_admin_smf_perms" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" />
5052
<hook hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
5153
<hook hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
@@ -76,6 +78,7 @@
7678
<hook hook="integrate_display_buttons" function="shd_display_btn_mvtopic" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
7779

7880
<!-- ShowAttachments -->
81+
<hook hook="integrate_pre_download_request" function="shd_pre_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" />
7982
<hook hook="integrate_download_request" function="shd_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" />
8083

8184
<!-- BoardIndex -->
@@ -94,7 +97,7 @@
9497

9598
<redirect url="?action=admin;area=helpdesk_info" />
9699

97-
<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>
100+
<credits url="https://www.simpledesk.net" license="BSD 3-Clause" licenseurl="https://github.com/SimpleMachines/SimpleDesk/blob/master/license.txt" copyright="2010-2021">Simple Desk</credits>
98101
</install>
99102

100103
<uninstall for="2.1 RC4, 2.1.0-2.1.99">
@@ -109,6 +112,7 @@
109112
<hook reverse="true" hook="integrate_actions" function="shd_init_actions" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
110113
<hook reverse="true" hook="integrate_buffer" function="shd_buffer_replace" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
111114
<hook reverse="true" hook="integrate_menu_buttons" function="shd_main_menu" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
115+
<hook reverse="true" hook="integrate_current_action" function="shd_init_current_action" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
112116
<hook reverse="true" hook="integrate_load_permissions" function="shd_admin_smf_perms" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" />
113117
<hook reverse="true" hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
114118
<hook reverse="true" hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
@@ -139,6 +143,7 @@
139143
<hook reverse="true" hook="integrate_display_buttons" function="shd_display_btn_mvtopic" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
140144

141145
<!-- ShowAttachments -->
146+
<hook reverse="true" hook="integrate_pre_download_request" function="shd_pre_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" />
142147
<hook reverse="true" hook="integrate_download_request" function="shd_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" />
143148

144149
<!-- BoardIndex -->
@@ -169,6 +174,7 @@
169174
<!-- css, removed -->
170175
<remove-file name="$themedir/css/helpdesk.css" />
171176
<remove-file name="$themedir/css/helpdesk_admin.css" />
177+
<remove-file name="$themedir/css/helpdesk_responsive.css" />
172178
<remove-file name="$themedir/css/helpdesk_icons.css" />
173179

174180
<!-- bundled plugins removed (NOTE: done one by one to avoid eating existing plugins on upgrade) -->

‎sd_language/SimpleDesk.english.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 RC1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: SimpleDesk.english.php *
1818
**************************************************************/
1919
// Version: 2.1; SimpleDesk main language file

‎sd_language/SimpleDeskAdmin.english.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 RC1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: SimpleDeskAdmin.english.php *
1818
**************************************************************/
1919
// Version: 2.1; SimpleDesk administration options

‎sd_language/SimpleDeskLogAction.english.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 RC1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: SimpleDeskLogAction.english.php *
1818
**************************************************************/
1919
// Version: 2.1; SimpleDesk action log

‎sd_language/SimpleDeskNotifications.english.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 RC1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: SimpleDeskNotifications.english.php *
1818
**************************************************************/
1919
// Version: 2.1; SimpleDesk Notifications language file

‎sd_language/SimpleDeskPermissions.english.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 RC1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: SimpleDeskPermissions.english.php *
1818
**************************************************************/
1919
// Version: 2.1; SimpleDesk permissions

‎sd_language/SimpleDeskProfile.english.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 RC1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: SimpleDeskProfile.english.php *
1818
**************************************************************/
1919
// Version: 2.1; SimpleDesk Profile language file

0 commit comments

Comments
 (0)