diff --git a/codemirror/AUTHORS b/codemirror/AUTHORS index 362fd94a..9d62d48e 100644 --- a/codemirror/AUTHORS +++ b/codemirror/AUTHORS @@ -2,6 +2,7 @@ List of CodeMirror contributors. Updated before every release. 4r2r Aaron Brooks +Abdelouahab Abe Fettig Adam Ahmed Adam King @@ -23,6 +24,7 @@ Alexander Solovyov Alexandre Bique alexey-k Alex Piggott +Aliaksei Chapyzhenka Amsul amuntean Amy @@ -31,15 +33,18 @@ anaran AndersMad Anders Nawroth Anderson Mesquita +Andrea G Andreas Reischuck Andre von Houck Andrey Fedorov +Andrey Klyuchnikov Andrey Lushnikov Andy Joslin Andy Kimball Andy Li angelozerr angelo.zerr@gmail.com +Ankit Ankit Ahuja Ansel Santosa Anthony Grimes @@ -61,6 +66,7 @@ Billy Moon binny B Krishna Chaitanya Blaine G +blukat29 boomyjee borawjm Brandon Frohs @@ -76,6 +82,8 @@ Chris Coyier Chris Granger Chris Houseknecht Chris Morgan +Christian Oyarzun +Christian Petrov Christopher Brown ciaranj CodeAnimal @@ -83,6 +91,8 @@ ComFreek Curtis Gagliardi dagsta daines +Dale Jung +Dan Bentley Dan Heberden Daniel, Dao Quang Minh Daniele Di Sarli @@ -92,13 +102,18 @@ Daniel KJ Daniel Neel Daniel Parnell Danny Yoo +darealshinji Darius Roberts Dave Myers David Mignot David Pathakjee +David Vázquez deebugger Deep Thought +Devon Carew dignifiedquire +Dimage Sapelkin +Dmitry Kiselyov domagoj412 Dominator008 Domizio Demichelis @@ -127,19 +142,24 @@ flack ForbesLindesay Forbes Lindesay Ford_Lawnmower +Forrest Oliphant Frank Wiegand +Gabriel Gheorghian Gabriel Horner Gabriel Nahmias galambalazs Gautam Mehta gekkoe +Gerard Braad Gergely Hegykozi +Giovanni Calò Glenn Jorde Glenn Ruehle Golevka Gordon Smith Grant Skinner greengiant +Gregory Koberger Guillaume Massé Guillaume Massé Gustavo Rodrigues @@ -147,6 +167,7 @@ Hakan Tunc Hans Engel Hardest Hasan Karahan +Herculano Campos Hiroyuki Makino hitsthings Hocdoc @@ -163,6 +184,7 @@ Ivan Kurnosov Jacob Lee Jakob Miland Jakub Vrana +Jakub Vrána James Campos James Thorne Jamie Hill @@ -171,7 +193,9 @@ jankeromnes Jan Keromnes Jan Odvarko Jan T. Sott +Jared Forsyth Jason +Jason Barnabe Jason Grout Jason Johnston Jason San Jose @@ -181,6 +205,7 @@ Jean Boussier jeffkenton Jeff Pickhardt jem (graphite) +Jeremy Parmenter Jochen Berger Johan Ask John Connor @@ -190,6 +215,7 @@ John Van Der Loo Jonathan Malmaud jongalloway Jon Malmaud +Jon Sangster Joost-Wim Boekesteijn Joseph Pecoraro Joshua Newman @@ -199,11 +225,13 @@ jsoojeon Juan Benavides Romero Jucovschi Constantin Juho Vuori +Justin Hileman jwallers@gmail.com kaniga Ken Newman Ken Rockot Kevin Sawicki +Kevin Ushey Klaus Silveira Koh Zi Han, Cliff komakino @@ -211,16 +239,20 @@ Konstantin Lopuhin koops ks-ifware kubelsmieci +KwanEsq +Lanfei Lanny Laszlo Vidacs leaf corcoran Leonid Khachaturov +Leon Sorokin Leonya Khachaturov Liam Newman LM lochel Lorenzo Stoakes Luciano Longo +Luke Stagner lynschinzer Maksim Lin Maksym Taran @@ -231,7 +263,9 @@ Marcel Gerber Marco Aurélio Marco Munizaga Marcus Bointon +Marek Rudnicki Marijn Haverbeke +Mário Gonçalves Mario Pietsch Mark Lentczner Marko Bonaci @@ -243,6 +277,7 @@ Mateusz Paprocki Mathias Bynens mats cronqvist Matthew Beale +Matthias Bussonnier Matthias BUSSONNIER Matt McDonald Matt Pass @@ -251,6 +286,7 @@ mauricio Maximilian Hils Maxim Kraev Max Kirsch +Max Xiantu mbarkhau Metatheos Micah Dubinko @@ -258,6 +294,7 @@ Michael Lehenbauer Michael Zhou Mighty Guava Miguel Castillo +mihailik Mike Mike Brevoort Mike Diaz @@ -267,6 +304,7 @@ MinRK Miraculix87 misfo mloginov +Moritz Schwörer mps mtaran-google Narciso Jaramillo @@ -274,21 +312,27 @@ Nathan Williams ndr nerbert nextrevision +ngn nguillaumin Ng Zhi An Nicholas Bollweg +Nicholas Bollweg (Nick) Nick Small Niels van Groningen +nightwing Nikita Beloglazov Nikita Vasilyev Nikolay Kostov nilp0inter +Nisarg Jhaveri nlwillia +Norman Rzepka pablo Page Panupong Pasupat paris Patil Arpith +Patrick Stoica Patrick Strawderman Paul Garvin Paul Ivanov @@ -303,10 +347,14 @@ prasanthj Prasanth J Radek Piórkowski Rahul +Randall Mason +Randy Burden Randy Edmunds Rasmus Erik Voel Jensen +Ray Ratchup Richard van der Meer Richard Z.H. Wang +Robert Crossfield Roberto Abdelkader Martínez Pérez robertop23 Robert Plummer @@ -322,6 +370,7 @@ satchmorun sathyamoorthi SCLINIC\jdecker Scott Aikin +Scott Goodhew Sebastian Zaha shaund shaun gilchrist @@ -330,6 +379,7 @@ sheopory Shiv Deepak Shmuel Englard Shubham Jain +silverwind snasa soliton4 sonson @@ -344,6 +394,7 @@ stoskov Taha Jahangir Takuji Shimokawa Tarmil +tel tfjgeorge Thaddee Tyl TheHowl @@ -369,13 +420,17 @@ Vincent Woo Volker Mische wenli Wesley Wiser +Will Binns-Smith William Jamieson William Stein +Willy Wojtek Ptak Xavier Mendez +Yassin N. Hassan YNH Webdev Yunchi Luo Yuvi Panda Zachary Dremann +Zhang Hao zziuni 魏鹏刚 diff --git a/codemirror/CONTRIBUTING.md b/codemirror/CONTRIBUTING.md index 3624a39e..c4296ce4 100644 --- a/codemirror/CONTRIBUTING.md +++ b/codemirror/CONTRIBUTING.md @@ -7,17 +7,17 @@ ## Getting help Community discussion, questions, and informal bug reporting is done on the -[CodeMirror Google group](http://groups.google.com/group/codemirror). +[discuss.CodeMirror forum](http://discuss.codemirror.net). ## Submitting bug reports The preferred way to report bugs is to use the -[GitHub issue tracker](http://github.com/marijnh/CodeMirror/issues). Before +[GitHub issue tracker](http://github.com/codemirror/CodeMirror/issues). Before reporting a bug, read these pointers. **Note:** The issue tracker is for *bugs*, not requests for help. Questions should be asked on the -[CodeMirror Google group](http://groups.google.com/group/codemirror) instead. +[discuss.CodeMirror forum](http://discuss.codemirror.net) instead. ### Reporting bugs effectively @@ -48,7 +48,7 @@ should be asked on the ## Contributing code - Make sure you have a [GitHub Account](https://github.com/signup/free) -- Fork [CodeMirror](https://github.com/marijnh/CodeMirror/) +- Fork [CodeMirror](https://github.com/codemirror/CodeMirror/) ([how to fork a repo](https://help.github.com/articles/fork-a-repo)) - Make your changes - If your changes are easy to test or likely to regress, add tests. diff --git a/codemirror/README.md b/codemirror/README.md index 6a0011b6..bc6e7f5c 100644 --- a/codemirror/README.md +++ b/codemirror/README.md @@ -1,6 +1,7 @@ # CodeMirror -[![Build Status](https://travis-ci.org/marijnh/CodeMirror.svg)](https://travis-ci.org/marijnh/CodeMirror) -[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror) +[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror) +[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror) +[Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png)](https://marijnhaverbeke.nl/fund/) CodeMirror is a JavaScript component that provides a code editor in the browser. When a mode is available for the language you are coding @@ -8,4 +9,4 @@ in, it will color your code, and optionally help with indentation. The project page is http://codemirror.net The manual is at http://codemirror.net/doc/manual.html -The contributing guidelines are in [CONTRIBUTING.md](https://github.com/marijnh/CodeMirror/blob/master/CONTRIBUTING.md) +The contributing guidelines are in [CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md) diff --git a/codemirror/bin/authors.sh b/codemirror/bin/authors.sh old mode 100644 new mode 100755 diff --git a/codemirror/bin/compress b/codemirror/bin/compress old mode 100644 new mode 100755 diff --git a/codemirror/bin/lint b/codemirror/bin/lint old mode 100644 new mode 100755 index 4f70994c..47f45f36 --- a/codemirror/bin/lint +++ b/codemirror/bin/lint @@ -1,16 +1,3 @@ #!/usr/bin/env node -var lint = require("../test/lint/lint"), - path = require("path"); - -if (process.argv.length > 2) { - lint.checkDir(process.argv[2]); -} else { - process.chdir(path.resolve(__dirname, "..")); - lint.checkDir("lib"); - lint.checkDir("mode"); - lint.checkDir("addon"); - lint.checkDir("keymap"); -} - -process.exit(lint.success() ? 0 : 1); +process.exit(require("../test/lint").ok ? 0 : 1); diff --git a/codemirror/bin/release b/codemirror/bin/release old mode 100644 new mode 100755 index ba6630aa..9b58b872 --- a/codemirror/bin/release +++ b/codemirror/bin/release @@ -41,6 +41,6 @@ rewrite("doc/compress.html", function(cmp) { }); rewrite("index.html", function(index) { - return index.replace(/version \d+\.\d+<\/strong>/, - "version " + simple + ""); + return index.replace(/\.zip">\d+\.\d+<\/a>/, + ".zip\">" + simple + ""); }); diff --git a/codemirror/bin/source-highlight b/codemirror/bin/source-highlight old mode 100644 new mode 100755 diff --git a/codemirror/bower.json b/codemirror/bower.json index 638b9d00..c59f2d9d 100644 --- a/codemirror/bower.json +++ b/codemirror/bower.json @@ -1,6 +1,6 @@ { "name": "codemirror", - "version":"4.6.0", + "version":"5.0.0", "main": ["lib/codemirror.js", "lib/codemirror.css"], "ignore": [ "**/.*", diff --git a/codemirror/index.html b/codemirror/index.html index 3b53e00d..3813fda1 100644 --- a/codemirror/index.html +++ b/codemirror/index.html @@ -21,12 +21,12 @@