Merge branch 'master' of git://github.com/Pita/etherpad-lite
Conflicts: src/node/hooks/express/padurlsanitize.js
This commit is contained in:
commit
1ff8debfbd
|
@ -1,3 +1,12 @@
|
|||
# v1.1
|
||||
* Introduced Plugin framework
|
||||
* Many bugfixes
|
||||
* Faster page loading
|
||||
* Various UI polishes
|
||||
* Saved Revisions
|
||||
* Read only Real time view
|
||||
* More API functionality
|
||||
|
||||
# v 1.0.1
|
||||
|
||||
* Updated MySQL driver, this fixes some problems with mysql
|
||||
|
|
|
@ -72,9 +72,8 @@ Here is the **[FAQ](https://github.com/Pita/etherpad-lite/wiki/FAQ)**
|
|||
**As any user (we recommend creating a separate user called etherpad-lite):**
|
||||
|
||||
<ol start="3">
|
||||
<li>Move to a folder where you want to install Etherpad Lite. Clone the git repository <code>git clone 'git://github.com/Pita/etherpad-lite.git'</code><br> </li>
|
||||
<li>Move to a folder where you want to install Etherpad Lite. Clone the git repository <code>git clone 'git://github.com/Pita/etherpad-lite.git'</code><br></li>
|
||||
<li>Change into the directory containing the Etherpad Lite source code clone with <code>cd etherpad-lite</code><br></li>
|
||||
<li>Install the dependencies with <code>bin/installDeps.sh</code><br> </li>
|
||||
<li>Start it with <code>bin/run.sh</code><br> </li>
|
||||
<li>Open your web browser and visit <a href="http://localhost:9001">http://localhost:9001</a>. You like it? Look at the 'Next Steps' section below</li>
|
||||
</ol>
|
||||
|
|
Loading…
Reference in New Issue