Merge branch 'master' of https://github.com/Pita/etherpad-lite into develop

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

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):**
 
 <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>&nbsp;</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>&nbsp;</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>&nbsp;</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>

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()
   {