upstream/kallithea Commit - r5709:d21305f7

Merge stable

Mads Kiilerich -

r5709:d21305f7 default

parent child

CONTRIBUTORS

0 +14 -10

             List of contributors to Kallithea project:
-                Mads Kiilerich <madski@unity3d.com> 2012-2015
+                Mads Kiilerich <madski@unity3d.com> 2012-2016
-                Takumi IINO <trot.thunder@gmail.com> 2012-2015
+                Takumi IINO <trot.thunder@gmail.com> 2012-2016
-                Unity Technologies 2012-2015
+                Unity Technologies 2012-2016
-                Andrew Shadura <andrew@shadura.me> 2012 2014-2015
+                Andrew Shadura <andrew@shadura.me> 2012 2014-2016
+                Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> 2014-2016
+                Jan Heylen <heyleke@gmail.com> 2015-2016
+                Robert Rauch <mail@robertrauch.de> 2015-2016
+                Søren Løvborg <sorenl@unity3d.com> 2015-2016
+                Angel Ezquerra <angel.ezquerra@gmail.com> 2016
+                Asterios Dimitriou <steve@pci.gr> 2016
+                Robert James Dennington <tinytimrob@googlemail.com> 2016
                 Aras Pranckevičius <aras@unity3d.com> 2012-2013 2015
+                Dominik Ruf <dominikruf@gmail.com> 2012 2014-2015
                 Sean Farley <sean.michael.farley@gmail.com> 2013-2015
                 Christian Oyarzun <oyarzun@gmail.com> 2014-2015
                 Joseph Rivera <rivera.d.joseph@gmail.com> 2014-2015
-                Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> 2014-2015
+                Michal Čihař <michal@cihar.com> 2014-2015
                 Anatoly Bubenkov <bubenkoff@gmail.com> 2015
                 Andrew Bartlett <abartlet@catalyst.net.nz> 2015
                 Balázs Úr <urbalazs@gmail.com> 2015
                 EriCSN Chang <ericsning@gmail.com> 2015
                 Étienne Gilli <etienne.gilli@gmail.com> 2015
                 Grzegorz Krason <grzegorz.krason@gmail.com> 2015
-                Jan Heylen <heyleke@gmail.com> 2015
                 Jiří Suchan <yed@vanyli.net> 2015
                 Kazunari Kobayashi <kobanari@nifty.com> 2015
                 Kevin Bullock <kbullock@ringworld.org> 2015
                 Niemand Jedermann <predatorix@web.de> 2015
                 Peter Vitt <petervitt@web.de> 2015
                 Robert Martinez <ntttq@inboxen.org> 2015
-                Robert Rauch <mail@robertrauch.de> 2015
                 Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> 2015
                 Sam Jaques <sam.jaques@me.com> 2015
-                Søren Løvborg <sorenl@unity3d.com> 2015
                 Tuux <tuxa@galaxie.eu.org> 2015
                 Viktar Palstsiuk <vipals@gmail.com> 2015
-                Dominik Ruf <dominikruf@gmail.com> 2012 2014
+                Ante Ilic <ante@unity3d.com> 2014
                 Bradley M. Kuhn <bkuhn@sfconservancy.org> 2014
                 Calinou <calinou@opmbx.org> 2014
                 Daniel Anderson <daniel@dattrix.com> 2014
                 Jim Hague <jim.hague@acm.org> 2014
                 Matt Fellows <kallithea@matt-fellows.me.uk> 2014
                 Max Roman <max@choloclos.se> 2014
-                Michal Čihař <michal@cihar.com> 2014
                 Na'Tosha Bard <natosha@unity3d.com> 2014
                 Rasmus Selsmark <rasmuss@unity3d.com> 2014
                 Tim Freund <tim@freunds.net> 2014

docs/conf.py

0 +1 -1

             # General information about the project.
             project = u'Kallithea'
-            copyright = u'2010-2015 by various authors, licensed as GPLv3.'
+            copyright = u'2010-2016 by various authors, licensed as GPLv3.'
             # The version info for the project you're documenting, acts as replacement for
             # |version| and |release|, also used in various other places throughout the

kallithea/templates/about.html

0 +14 -10

               necessarily limited to the following:
               <ul style="margin: 0 0 0 50px;">
-              <li>Copyright &copy; 2012&ndash;2015, Mads Kiilerich</li>
+              <li>Copyright &copy; 2012&ndash;2016, Mads Kiilerich</li>
-              <li>Copyright &copy; 2012&ndash;2015, Takumi IINO</li>
+              <li>Copyright &copy; 2012&ndash;2016, Takumi IINO</li>
-              <li>Copyright &copy; 2012&ndash;2015, Unity Technologies</li>
+              <li>Copyright &copy; 2012&ndash;2016, Unity Technologies</li>
-              <li>Copyright &copy; 2012, 2014&ndash;2015, Andrew Shadura</li>
+              <li>Copyright &copy; 2012, 2014&ndash;2016, Andrew Shadura</li>
+              <li>Copyright &copy; 2014&ndash;2016, Thomas De Schampheleire</li>
+              <li>Copyright &copy; 2015&ndash;2016, Jan Heylen</li>
+              <li>Copyright &copy; 2015&ndash;2016, Robert Rauch</li>
+              <li>Copyright &copy; 2015&ndash;2016, Søren Løvborg</li>
+              <li>Copyright &copy; 2016, Angel Ezquerra</li>
+              <li>Copyright &copy; 2016, Asterios Dimitriou</li>
+              <li>Copyright &copy; 2016, Robert James Dennington</li>
               <li>Copyright &copy; 2012&ndash;2013, 2015, Aras Pranckevičius</li>
+              <li>Copyright &copy; 2012, 2014&ndash;2015, Dominik Ruf</li>
               <li>Copyright &copy; 2014&ndash;2015, Christian Oyarzun</li>
               <li>Copyright &copy; 2014&ndash;2015, Joseph Rivera</li>
+              <li>Copyright &copy; 2014&ndash;2015, Michal Čihař</li>
               <li>Copyright &copy; 2014&ndash;2015, Sean Farley</li>
-              <li>Copyright &copy; 2014&ndash;2015, Thomas De Schampheleire</li>
               <li>Copyright &copy; 2015, Anatoly Bubenkov</li>
               <li>Copyright &copy; 2015, Andrew Bartlett</li>
               <li>Copyright &copy; 2015, Balázs Úr</li>
               <li>Copyright &copy; 2015, EriCSN Chang</li>
               <li>Copyright &copy; 2015, Étienne Gilli</li>
               <li>Copyright &copy; 2015, Grzegorz Krason</li>
-              <li>Copyright &copy; 2015, Jan Heylen</li>
               <li>Copyright &copy; 2015, Jiří Suchan</li>
               <li>Copyright &copy; 2015, Kazunari Kobayashi</li>
               <li>Copyright &copy; 2015, Kevin Bullock</li>
               <li>Copyright &copy; 2015, Niemand Jedermann</li>
               <li>Copyright &copy; 2015, Peter Vitt</li>
               <li>Copyright &copy; 2015, Robert Martinez</li>
-              <li>Copyright &copy; 2015, Robert Rauch</li>
               <li>Copyright &copy; 2015, Ronny Pfannschmidt</li>
               <li>Copyright &copy; 2015, Sam Jaques</li>
-              <li>Copyright &copy; 2015, Søren Løvborg</li>
               <li>Copyright &copy; 2015, Tuux</li>
               <li>Copyright &copy; 2015, Viktar Palstsiuk</li>
-              <li>Copyright &copy; 2012, 2014, Dominik Ruf</li>
+              <li>Copyright &copy; 2014, Ante Ilic</li>
               <li>Copyright &copy; 2014, Bradley M. Kuhn</li>
               <li>Copyright &copy; 2014, Calinou</li>
               <li>Copyright &copy; 2014, Daniel Anderson</li>
               <li>Copyright &copy; 2014, Jim Hague</li>
               <li>Copyright &copy; 2014, Matt Fellows</li>
               <li>Copyright &copy; 2014, Max Roman</li>
-              <li>Copyright &copy; 2014, Michal Čihař</li>
               <li>Copyright &copy; 2014, Na'Tosha Bard</li>
               <li>Copyright &copy; 2014, Rasmus Selsmark</li>
               <li>Copyright &copy; 2014, Tim Freund</li>

kallithea/templates/base/base.html

0 +1 -1

                                <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>,
                            %endif
                            which is
-                           <a href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2015 by various authors &amp; licensed under GPLv3</a>.
+                           <a href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2016 by various authors &amp; licensed under GPLv3</a>.
                            %if c.issues_url:
                                &ndash; <a href="${c.issues_url}" target="_blank">${_('Support')}</a>
                            %endif

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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