Merge pull request #5 from zackkatz/develop

Version 1.0.3
zackkatz · Aug 4, 2023 · 7aa866a · 7aa866a
2 parents 8cdd9e3 + 35ab660
commit 7aa866a
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 11 deletions.
diff --git a/Providers/FreeHelpServiceProvider.php b/Providers/FreeHelpServiceProvider.php
@@ -17,11 +17,30 @@ public function boot() {
 */
 $('[target="_blank"]').attr("target", null );
 
+// Let's use better terminology.
+$('a[href*=whitelist]').text(function ( index, text ) {
+	return text.replace( 'Whitelist', 'Allowlist' ).replace( 'whitelist', 'allowlist' );
+});
+
+// Let's use better terminology.
+$('a[href*=blacklist]').text(function ( index, text ) {
+	return text.replace( 'Blacklist', 'Blocklist' ).replace( 'blacklist', 'blocklist' );
+});
+
 // In Reports and other AJAX-generated links.
 $( document ).ajaxComplete(function() {
 	$('[target="_blank"]').attr("target", null );
 });
 
+/**
+ *  Use Command/Control + Enter to submit a note or reply.
+ */
+$( document ).on( 'keydown', function( e ) {
+	if ( (e.ctrlKey || e.metaKey) && e.key == "Enter") {
+		$( '.note-editor .btn-send-text' ).click();
+	}
+} );
+
 /**
 * Convert custom field dropdowns to Select2.
 */
@@ -46,11 +65,6 @@ public function boot() {
 	}
 	
 	switch ( e.which ) {
-		// Forward slash
-		case 191:
-			$( '#search-dt').not('[aria-expanded=true]').trigger('click'); // Click instead of toggle to run the .setTimeout() focus that FS uses.
-			break;
-		
 		// Escape key
 		case 27:
 			// Close all open dropdowns.
@@ -547,6 +561,13 @@ public function boot() {
 	    }
 	}
 	
+	/** Make the editor feel more like Help Scout's */
+	#app .note-editor.note-frame .note-editing-area .note-editable {
+		color: #405261;
+		font: 14px / 20px Arial, Helvetica, Verdana, Tahoma, sans-serif;
+		outline:  rgb(64, 82, 97) none 0px;
+	}
+	
 	#app .panel-default > .panel-heading + .panel-collapse > .panel-body {
 		background-color: #fff!important;
 		border-radius: 0 0 4px 4px;

diff --git a/README.md b/README.md
@@ -6,8 +6,11 @@ FreeHelp makes FreeScout look and feel more like Help Scout, adding many small q
 - Shift-click checkboxes to select a range of conversations at once [#1312](https://github.com/freescout-helpdesk/freescout/issues/1312)
 - Convert Dropdown-type Custom Fields to Select2 inputs
 - Type `Escape` to close dropdowns, cancel editing conversation titles, and cancel editing a note
+- Use Command + Return to submit a reply or note (or Control + Return in Windows)
+- Use nicer [Heroicons](https://heroicons.com) instead of the default FreeScout icons
 - Apply many CSS tweaks to make FreeScout look and feel more like Help Scout
   - Wrap Custom Fields in the familiar gray box
+  - Update the editor fonts to match Help Scout
   - Replace folder icons with nicer [Heroicons](https://heroicons.com)
   - Remove many of the blue highlights in the FreeScout interface
   - Match more line spacing and font styles/sizings
@@ -20,7 +23,6 @@ FreeHelp makes FreeScout look and feel more like Help Scout, adding many small q
 ## Known bugs
 
 - [ ] The modal is too low when using editing a customer in the CRM module
-- [ ] The brand icon is too large when on the main FreeScout mailboxes screen
 
 ## Todo list
 
@@ -32,6 +34,35 @@ FreeHelp makes FreeScout look and feel more like Help Scout, adding many small q
 
 - [ ] Implement a nicer search modal
 
+--------------------
+
+## Changelog
+
+### 1.0.3 on August 4, 2023
+
+- Update fonts to make the editor text feel more like Help Scout's
+- Type Command + Return to submit a reply or note (or Control + Return in Windows)
+- Replace "Blacklist" with "Blocklist" and "Whitelist" with "Allowlist"
+
+### 1.0.2 on August 4, 2023
+
+- Clean up the sidebar gear icon dropdown menu by removing icons, matching Help Scout
+- Add way more Heroicons (https://github.com/zackkatz/FreeHelp/issues/2)[#2]
+- Don't hide Remove Formatting, color, underline buttons from editor. Instead, if wanted, add this to the Customization module instead (https://github.com/zackkatz/FreeHelp/issues/4)[#4]
+- Improve positioning of the icons in the sidebar buttons
+
+### 1.0.1 on July 21, 2023
+
+- Update icons to use [Heroicons](https://heroicons.com)
+- Update user response thread styling to match Help Scout
+- Add module image
+
+### 1.0.0 on June 9, 2023
+
+- Initial release
+
+--------------------
+
 ## Installation
 
 These instructions assume you installed FreeScout using the [recommended process](https://github.com/freescout-helpdesk/freescout/wiki/Installation-Guide), the "one-click install" or the "interactive installation bash-script", and you are viewing this page using a macOS or Ubuntu system.
@@ -57,7 +88,3 @@ Other installations are possible, but not supported here.
 5. Access your admin modules page like https://freescout.example.com/modules/list.
 
 6. Find **FreeHelp** and click ACTIVATE.
-
-## Inspiration
-
-* This project was inspired by [DropkickJS](https://github.com/fulldecent/freescout-dropkick-js).
diff --git a/module.json b/module.json
@@ -2,7 +2,7 @@
     "name": "FreeHelp",
     "alias": "freehelp",
     "description": "FreeHelp makes FreeScout look and feel more like Help Scout, adding many small quality-of-life improvements.",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "detailsUrl": "https://github.com/zackkatz/FreeHelp",
     "img": "https://www.gravitykit.com/wp-content/uploads/2023/06/freehelp-640x640-1.png",
     "author": "Zack Katz",