upstream/kallithea Files · rhodecode/templates/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

Bradley M. Kuhn - - Load All Authors

File last commit:

r4116:ffd45b18 rhodecode-2.2.5-gpl


                r4125:aa3b5594

rhodecode-2.2.5-gpl

Download file

             index.html
        
                    20 lines
            
             | 373 B
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / templates / index.html
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
renamed project to rhodecode

              r547
            
      ## -*- coding: utf-8 -*-

      <%inherit file="base/base.html"/>

        Mads Kiilerich
    
use valid options for the top menu: repositories, journal, search and admin

              r3603
            
      <%def name="title()">

        Bradley M. Kuhn
    
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....

              r4116
            
          ${_('Dashboard')}

          %if c.rhodecode_name:

              &middot; ${c.rhodecode_name}

          %endif

        Mads Kiilerich
    
use valid options for the top menu: repositories, journal, search and admin

              r3603
            
      </%def>

      <%def name="breadcrumbs()">

      </%def>

      <%def name="page_nav()">

      ${self.menu('repositories')}

      </%def>

        marcink
    
renamed project to rhodecode

              r547
            
      <%def name="main()">

        marcink
    
#402 removed group prefix from repository name when listing repositories inside a group

              r2133
            
         <%include file="index_base.html" args="parent=self"/>

        marcink
    
White-space cleanup

              r1888
            
      </%def>

	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

marcink renamed project to rhodecode	r547	## -- coding: utf-8 --
		<%inherit file="base/base.html"/>
Mads Kiilerich use valid options for the top menu: repositories, journal, search and admin	r3603
		<%def name="title()">
Bradley M. Kuhn Imported some of the GPLv3'd changes from RhodeCode v2.2.5....	r4116	${_('Dashboard')}
		%if c.rhodecode_name:
		· ${c.rhodecode_name}
		%endif
Mads Kiilerich use valid options for the top menu: repositories, journal, search and admin	r3603	</%def>

		<%def name="breadcrumbs()">
		</%def>

		<%def name="page_nav()">
		${self.menu('repositories')}
		</%def>

marcink renamed project to rhodecode	r547	<%def name="main()">
marcink #402 removed group prefix from repository name when listing repositories inside a group	r2133	<%include file="index_base.html" args="parent=self"/>
marcink White-space cleanup	r1888	</%def>