diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2012-07-03 23:55:55 +0200 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2012-07-03 23:55:55 +0200 |
| commit | 1ff8debfbddb1bd139f5d0c65b94c102ad48b258 (patch) | |
| tree | d29ad959fed09d8be121e605f3b1617fc61ba393 | |
| parent | 35c24c11911b1981008c396760aba3e3cafb510b (diff) | |
| parent | 4195e11a41c5992bc555cef71246800bceaf1915 (diff) | |
| download | etherpad-lite-1ff8debfbddb1bd139f5d0c65b94c102ad48b258.zip | |
Merge branch 'master' of git://github.com/Pita/etherpad-lite
Conflicts:
src/node/hooks/express/padurlsanitize.js
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | README.md | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f53fa3b9..5810ed25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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>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>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>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> |