Commit graph

7873 commits

Author SHA1 Message Date
John McLear
d8e39e82d1 Merge branch 'master' of git://github.com/Pita/etherpad-lite 2011-07-20 15:44:36 +01:00
John McLear
184239879f Add fileicons which is the export icosn 2011-07-20 15:43:55 +01:00
John McLear
50c6b9de00 Temporary code that brings in some export support 2011-07-20 15:42:47 +01:00
John McLear
b4c2f6eb11 Updated doctype after I messed it up before, updated some css for import/export 2011-07-20 15:31:50 +01:00
John McLear
a6faf73cbb Basics of import/export dialogue, requires hiding etc. 2011-07-19 22:08:26 +01:00
John McLear
0294c32c2a Hand when hovering over chat and position of chat title bar fix 2011-07-19 21:42:21 +01:00
Peter 'Pita' Martischka
8b6be1b014 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-07-19 20:06:44 +01:00
John McLear
a07bd76625 Final major add for working buttons in IE 2011-07-19 20:04:36 +01:00
John McLear
cf255b2979 Make the pad calls work properly in IE 2011-07-19 20:04:30 +01:00
John McLear
e7b690c7fc Make the chat work in IE 2011-07-19 20:04:24 +01:00
John McLear
322a66aab1 Change order of JS, hope to load utils early on, im not sure this is a proper fix though 2011-07-19 20:04:16 +01:00
John McLear
d9e18f38a3 Add resize image for chatbox 2011-07-19 20:04:10 +01:00
John McLear
ef2d7ef015 updated iframe editor css 2011-07-19 20:04:04 +01:00
John McLear
93aa1ed970 Added a doctype to index.html 2011-07-19 20:03:57 +01:00
John McLear
f8496d2266 Remove big CSS file 2011-07-19 20:03:51 +01:00
John McLear
9f966e0035 Make CSS more comprehendable by mear mortals. 2011-07-19 20:03:40 +01:00
John McLear
9407d33407 Fix timeslider overlap issue 2011-07-19 20:03:28 +01:00
John McLear
72a7550126 Make embed code have the correct right margin so it doesnt overlap scrollbar 2011-07-19 20:03:22 +01:00
John McLear
1f9df665e6 removing broadcast 2011-07-19 20:03:13 +01:00
John McLear
d6bae26978 rename broadcast.css to timeslider 2011-07-19 20:03:06 +01:00
John McLear
f245685c3a Remove a line break.. heh 2011-07-19 20:03:01 +01:00
John McLear
65baa26fca Resize chat 2011-07-19 20:02:48 +01:00
John McLear
bc9aa8579e Change it to use jquery ui instwead of the jquery ui slide file 2011-07-19 20:02:43 +01:00
John McLear
0643bb888f Remove old jquery ui file 2011-07-19 20:02:35 +01:00
John McLear
f7ce124ce2 Add a new version of jquery ui with support for resizable 2011-07-19 20:02:29 +01:00
John McLear
2dd2a4a055 Added support to resize chat 2011-07-19 20:02:03 +01:00
John McLear
fb332cf699 removed outcommented css 2011-07-19 20:01:54 +01:00
John McLear
6ca7dcf999 stop timeslider from taking up more than 100% room 2011-07-19 20:01:48 +01:00
John McLear
ab7b043fd1 Dont show IP addy or browser info when hovering# 2011-07-19 20:01:36 +01:00
John McLear
00a74d8067 Make chat icon background white 2011-07-19 20:01:20 +01:00
John McLear
0206803549 move userlist so it doesnt overlap with scrollbar 2011-07-19 20:00:32 +01:00
Peter 'Pita' Martischka
eeddf1348f Added support for document export, no link from the pad so far 2011-07-19 19:48:11 +01:00
Peter 'Pita' Martischka
83829759e9 Minifying can be disabled for debugging now 2011-07-14 20:11:03 +01:00
Peter 'Pita' Martischka
f871602754 remove the 32000 px lock, thx to @smesher 2011-07-14 18:38:29 +01:00
Peter 'Pita' Martischka
4f743bdb01 Merge branch 'master' of github.com:Pita/etherpad-lite into chat 2011-07-14 16:16:20 +01:00
Peter 'Pita' Martischka
29878e648e added a Chat 2011-07-14 16:15:38 +01:00
Peter 'Pita' Martischka
ebe08d6780 removed some old debug messages 2011-07-13 15:33:20 +02:00
Peter 'Pita' Martischka
51c4aff54b Fixed CSS Bugs in webkit and IE. thx @johnyma22 2011-07-12 16:11:40 +01:00
Peter 'Pita' Martischka
bd1ac333db update jquery 2011-07-12 13:33:44 +01:00
Peter 'Pita' Martischka
dcf1fd1383 update dependencies, including socket.io 2011-07-12 12:01:07 +02:00
Peter 'Pita' Martischka
652f97aef0 Mark the placeholder 2011-07-11 22:52:45 +02:00
Peter 'Pita' Martischka
69cecc0684 Improved the README, again 2011-07-11 22:50:08 +02:00
Peter 'Pita' Martischka
997e163223 Improved the README 2011-07-11 22:46:01 +02:00
Peter 'Pita' Martischka
73e9ef18a9 fixed a little bug in runSafe 2011-07-11 22:37:11 +02:00
Peter 'Pita' Martischka
d9084bd8a2 Added a runSafe script that restarts ep-lite if its failing 2011-07-11 18:56:29 +02:00
Peter 'Pita' Martischka
69d2eba46e Improve the logging of Socket.IO Messages 2011-07-11 15:56:45 +02:00
Peter 'Pita' Martischka
e9d6000e01 Install socket.io via a tarball. This is the only way to get a socket.io version that runs properly behind a reverse proxy. This is a temporary fix until a new socket.io version is released 2011-07-11 14:05:29 +02:00
Peter 'Pita' Martischka
93ccbaef3a Read only access works 2011-07-08 18:33:01 +01:00
Peter 'Pita' Martischka
1c1e035bf1 Show a read only link on the pad 2011-07-08 17:42:07 +01:00
Peter 'Pita' Martischka
7915390b83 select the embed code when it drops down 2011-07-08 15:37:57 +01:00