Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: BookStackApp/BookStack
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: development
Choose a base ref
...
head repository: Experience-Monks/BookStack
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 12 commits
  • 6 files changed
  • 3 contributors

Commits on Apr 10, 2019

  1. Added initial Markdown Toolbar

    TODO: Style Buttons
    njam3 committed Apr 10, 2019
    Copy the full SHA
    8412908 View commit details

Commits on May 1, 2019

  1. Added icons

    njam3 committed May 1, 2019
    Copy the full SHA
    3b4695b View commit details
  2. Remove ref & mention

    njam3 authored May 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8d6fc83 View commit details
  3. Merge pull request #1 from Jam3/feature/markdown-toolbar

    Add Markdown Toolbar
    njam3 authored May 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2e600df View commit details
  4. Merge remote-tracking branch 'parent/master'

    * parent/master: (77 commits)
      Updated TinyMCE to version 4.9.4
      Updated register link text/placement on login card
      Added deeper content id de-duplication
      Add revision restore confirm and changed http method
      Updated md drawing mngr shortcut to work on mac cmd key
      Added test to check page HTML id de-duplication
      Updated ldap server option parsing to work with protocol and port
      Add min length validation on name on register form & add sign up link
      Reduced markup for books icon
      Prevented bad duplicate IDs causing major exception
      Aligned item creation wording and updated shelf-book-add logic
      Replace dots with something else on user create and edit screens
      Update create new book button on shelves to 2019 design
      Fix phpcs issues
      Add tests for creating a book and adding directly to a shelf
      Add button to add a book directly from a shelf view
      Tweaked header font size to fit redesign better
      Updated user references to be app-default-supporting functions
      Updated view toggle to store date
      Updated markdown editor for mobile
      ...
    iranreyes committed May 1, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    ce82b7a View commit details

Commits on Jul 31, 2019

  1. build test

    njam3 authored Jul 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    174ba37 View commit details

Commits on Mar 16, 2020

  1. Copy the full SHA
    7140cc8 View commit details
  2. Copy the full SHA
    3bdf24e View commit details
  3. New package lock

    njam3 committed Mar 16, 2020
    Copy the full SHA
    1afd71d View commit details
  4. Merge pull request #5 from Jam3/feature/update

    Updated to latest version
    njam3 authored Mar 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ed3801e View commit details

Commits on Mar 23, 2020

  1. Merge pull request #6 from Jam3/staging

    Merge Staging & Master
    njam3 authored Mar 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    df7b1a8 View commit details

Commits on Jun 11, 2020

  1. Merge pull request #7 from BookStackApp/master

    Pull Upstream Changes
    njam3 authored Jun 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    240677d View commit details
Showing with 39 additions and 0 deletions.
  1. +5 −0 package-lock.json
  2. +1 −0 package.json
  3. +2 −0 resources/js/components/markdown-editor.js
  4. +18 −0 resources/sass/_forms.scss
  5. +1 −0 resources/views/pages/edit.blade.php
  6. +12 −0 resources/views/pages/markdown-editor.blade.php
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
"webpack-cli": "^3.3.11"
},
"dependencies": {
"@github/markdown-toolbar-element": "^0.2.0",
"clipboard": "^2.0.6",
"codemirror": "^5.52.2",
"dropzone": "^5.7.0",
2 changes: 2 additions & 0 deletions resources/js/components/markdown-editor.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import '@github/markdown-toolbar-element';
import MarkdownIt from "markdown-it";
import mdTasksLists from 'markdown-it-task-lists';
import code from '../services/code';
@@ -24,6 +25,7 @@ class MarkdownEditor {
this.input = this.elem.querySelector('textarea');
this.htmlInput = this.elem.querySelector('input[name=html]');
this.cm = code.markdownEditor(this.input);
this.cm.getInputField().id = 'markdown-textarea';

this.onMarkdownScroll = this.onMarkdownScroll.bind(this);

18 changes: 18 additions & 0 deletions resources/sass/_forms.scss
Original file line number Diff line number Diff line change
@@ -41,6 +41,24 @@
#markdown-editor {
position: relative;
z-index: 5;
markdown-toolbar {
padding: 5px;
}
markdown-toolbar > * {
border: solid 1px #666;
border-radius: 5px;
cursor: pointer;
margin: 5px 0px;
padding: 2px 5px;
text-align: center;
}
markdown-toolbar > *:hover {
background-color: #666;
color: #fff;
}
markdown-toolbar > * > i {
padding-left: 5px;
}
#markdown-editor-input {
font-style: normal;
font-weight: 400;
1 change: 1 addition & 0 deletions resources/views/pages/edit.blade.php
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

@section('head')
<script src="{{ url('/libs/tinymce/tinymce.min.js?ver=4.9.4') }}"></script>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
@stop

@section('body-class', 'flexbox')
12 changes: 12 additions & 0 deletions resources/views/pages/markdown-editor.blade.php
Original file line number Diff line number Diff line change
@@ -19,6 +19,18 @@
</div>
</div>

<markdown-toolbar for="markdown-textarea">
<md-bold><i class="fas fa-bold"></i></md-bold>
<md-header><i class="fas fa-heading"></i></md-header>
<md-italic><i class="fas fa-italic"></i></md-italic>
<md-quote><i class="fas fa-quote-right"></i></md-quote>
<md-code><i class="fas fa-code"></i></md-code>
<md-link><i class="fas fa-link"></i></md-link>
<md-unordered-list><i class="fas fa-list-ul"></i></md-unordered-list>
<md-ordered-list><i class="fas fa-list-ol"></i></md-ordered-list>
<md-task-list><i class="fas fa-tasks"></i></md-task-list>
</markdown-toolbar>

<div markdown-input class="flex flex-fill">
<textarea id="markdown-editor-input"
@if($errors->has('markdown')) class="text-neg" @endif