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
diff --git a/README.md b/README.md
index 2a30b970..6cdb623f 100644
--- a/README.md
+++ b/README.md
@@ -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):**
- - Move to a folder where you want to install Etherpad Lite. Clone the git repository
git clone 'git://github.com/Pita/etherpad-lite.git'
- - Change into the directory containing the Etherpad Lite source code clone with
cd etherpad-lite
- - Install the dependencies with
bin/installDeps.sh
+ - Move to a folder where you want to install Etherpad Lite. Clone the git repository
git clone 'git://github.com/Pita/etherpad-lite.git'
+ - Change into the directory containing the Etherpad Lite source code clone with
cd etherpad-lite
- Start it with
bin/run.sh
- Open your web browser and visit http://localhost:9001. You like it? Look at the 'Next Steps' section below
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 723d410f..cc9f1288 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -341,6 +341,11 @@ function Ace2Inner(){
return rep;
};
+ editorInfo.ace_getAuthor = function()
+ {
+ return thisAuthor;
+ }
+
var currentCallStack = null;
function inCallStack(type, action)
@@ -439,6 +444,14 @@ function Ace2Inner(){
try
{
result = action();
+
+ hooks.callAll('aceEditEvent', {
+ callstack: currentCallStack,
+ editorInfo: editorInfo,
+ rep: rep,
+ documentAttributeManager: documentAttributeManager
+ });
+
//console.log("Just did action for: "+type);
cleanExit = true;
}
@@ -522,6 +535,7 @@ function Ace2Inner(){
{
return rep.lines.atOffset(charOffset).key;
}
+
function dispose()
{