upstream/kallithea Files · rhodecode/public/js/mode/shell/index.html

Migrate to Mergely 3.3.4....

Migrate to Mergely 3.3.4. RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be changes we want for Kallithea this way and we take the 3.3.4 files as they are. I've also included the Mergely license file, as downloaded from: http://www.mergely.com/license.php That LICENSE file is kept in HTML just as it was downloaded from their website. While it's a bit annoying to keep the license file in HTML, this is the way it came from upstream so we'll leave it that way. Since the Javascript code is used with other GPLv3 Javascript, we are using the GPL option of Mergely's tri-license. Finally, note that previously, this was incorrectly called "mergerly", so the opportunity is taken here to correct the name. That required changes to diff_2way.html. As commands:: $ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php $ hg add LICENSE-MERGELY.html $ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css $ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js $ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html $ ( cd /tmp; \ wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \ unzip mergely-3.3.4.zip ) $ sha256sum /tmp/mergely-3.3.4.zip 87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip $ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js $ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css $ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css

marcink - - Load All Authors

File last commit:

r4026:a60a0e90 default


                r4125:aa3b5594

rhodecode-2.2.5-gpl

Download file

             index.html
        
                    51 lines
            
             | 1.3 KiB
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / public / js / mode / shell / index.html
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <!doctype html>

      <meta charset=utf-8>

      <title>CodeMirror: Shell mode</title>

      <link rel=stylesheet href=../../lib/codemirror.css>

      <link rel=stylesheet href=../../doc/docs.css>

      <style type=text/css>

        .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}

      </style>

      <script src=../../lib/codemirror.js></script>

      <script src="../../addon/edit/matchbrackets.js"></script>

      <script src=shell.js></script>

      <h1>CodeMirror: Shell mode</h1>

      <textarea id=code>

      #!/bin/bash

      # clone the repository

      git clone http://github.com/garden/tree

      # generate HTTPS credentials

      cd tree

      openssl genrsa -aes256 -out https.key 1024

      openssl req -new -nodes -key https.key -out https.csr

      openssl x509 -req -days 365 -in https.csr -signkey https.key -out https.crt

      cp https.key{,.orig}

      openssl rsa -in https.key.orig -out https.key

      # start the server in HTTPS mode

      cd web

      sudo node ../server.js 443 'yes' &gt;&gt; ../node.log &amp;

      # here is how to stop the server

      for pid in `ps aux | grep 'node ../server.js' | awk '{print $2}'` ; do

        sudo kill -9 $pid 2&gt; /dev/null

      done

      exit 0</textarea>

      <script>

        var editor = CodeMirror.fromTextArea(document.getElementById('code'), {

          mode: 'shell',

          lineNumbers: true,

          matchBrackets: true

        });

      </script>

      <p><strong>MIME types defined:</strong> <code>text/x-sh</code>.</p>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				<!doctype html>
				<meta charset=utf-8>
				<title>CodeMirror: Shell mode</title>

				<link rel=stylesheet href=../../lib/codemirror.css>
				<link rel=stylesheet href=../../doc/docs.css>

				<style type=text/css>
				.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
				</style>

				<script src=../../lib/codemirror.js></script>
				<script src="../../addon/edit/matchbrackets.js"></script>
				<script src=shell.js></script>

				<h1>CodeMirror: Shell mode</h1>

				<textarea id=code>
				#!/bin/bash

				# clone the repository
				git clone http://github.com/garden/tree

				# generate HTTPS credentials
				cd tree
				openssl genrsa -aes256 -out https.key 1024
				openssl req -new -nodes -key https.key -out https.csr
				openssl x509 -req -days 365 -in https.csr -signkey https.key -out https.crt
				cp https.key{,.orig}
				openssl rsa -in https.key.orig -out https.key

				# start the server in HTTPS mode
				cd web
				sudo node ../server.js 443 'yes' >> ../node.log &

				# here is how to stop the server
				for pid in `ps aux \| grep 'node ../server.js' \| awk '{print $2}'` ; do
				sudo kill -9 $pid 2> /dev/null
				done

				exit 0</textarea>

				<script>
				var editor = CodeMirror.fromTextArea(document.getElementById('code'), {
				mode: 'shell',
				lineNumbers: true,
				matchBrackets: true
				});
				</script>

				<p><strong>MIME types defined:</strong> <code>text/x-sh</code>.</p>