mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-06-17 19:54:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'develop' into feature/connectivity-toolbar

Browse source 
Conflicts:
	src/templates/pad.html
This commit is contained in:
Marcel Klehr 2012-07-23 11:26:15 +02:00
commit 9d25dcc1f9
7 changed files with 269 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/templates/admin/plugins.html
View file

@ -21,7 +21,7 @@
<h1>Etherpad Lite</h1>
<a href="/admin/plugins/info">Technical information on installed plugins</a>
<a href="plugins/info">Technical information on installed plugins</a>
<div class="separator"></div>
<h2>Installed plugins</h2>

8
src/templates/pad.html
View file

@ -149,6 +149,14 @@
<div id="userlistbuttonarea"></div>
</div>
<div id="editorcontainerbox">
<div id="editorcontainer"></div>
<div id="editorloadingbox">
<p>Loading...</p>
<noscript><strong>Sorry, you have to enable Javascript in order to use this.</strong></noscript>
</div>
</div>
<div id="settings" class="popup">
<h1>Pad settings</h1>
<div class="column">