Commit graph

69 commits

Author SHA1 Message Date
John McLear
90d36471b1 Remove read only link and place all functionality into embed option sorts issue #246 2011-11-27 21:04:11 +00:00
John McLear
dd2d0d45f0 First part of https://github.com/Pita/etherpad-lite/issues/233 2011-11-26 19:15:43 +00:00
Alexandre Girard
7a7b3391fb add checkbox to limit number of inputs 2011-11-24 16:34:28 +01:00
John McLear
dedd604125 Add support for embedding read only etc. 2011-11-23 15:46:34 +00:00
Peter 'Pita' Martischka
7b8d48467f added proper embed parameter support, fixes #116 2011-08-23 18:36:38 +01:00
Robin Buse
335643a860 ODT Import works but wasn't mentioned yet 2011-08-24 05:22:46 +03:00
Peter 'Pita' Martischka
913c3c455d fixed merge conflicts 2011-08-22 13:14:59 +01:00
Peter 'Pita' Martischka
a231ff45e1 fixed fileupload field in Firefox 2011-08-21 20:17:38 +01:00
Peter 'Pita' Martischka
42662d73d0 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-08-20 18:23:58 +01:00
Peter 'Pita' Martischka
9d37d91ce1 added a colorPicker 2011-08-20 18:22:10 +01:00
Peter 'Pita' Martischka
71c6e494d5 fixed the buttons, the now fully clickable (someone has to test that with IE) 2011-08-18 12:16:00 +01:00
Robin Buse
6d47a00f29 QR code support (html) 2011-08-16 23:31:41 +03:00
John McLear
5d30c8b4a5 Peter will hate this but I extended Etherpad to support 64 colors and removed the requirements for a background image on the colorpicker dialogue 2011-08-16 21:29:51 +01:00
Peter 'Pita' Martischka
d2c502e2be added deletePad API function 2011-08-16 20:02:30 +01:00
John McLear
4b77dd8c7a Beginning of a show chat history function 2011-08-13 21:59:12 +01:00
Peter 'Pita' Martischka
3c46cce341 some small design changes 2011-08-10 18:26:12 +01:00
Peter 'Pita' Martischka
13c10013b9 do the chat resize without hiding the pad text 2011-08-10 18:18:50 +01:00
Peter 'Pita' Martischka
ba9861382e fixed the design 2011-08-10 17:19:23 +01:00
John McLear
ab2c8fadf1 Fix button alignment issues making the butotns prettier after I made them 1px out in places 2011-08-01 20:01:41 +01:00
John McLear
9911fb95b9 fixed merge confilcts in pad.html 2011-08-01 13:20:05 +01:00
John McLear
4d4773c1f3 Fix CSS and HTML bugs with new sprites 2011-07-31 20:07:18 +01:00
John McLear
92377613d7 First version of working sprites -- Still some work to do such as changing export icons to use the latest .gif but this is good start 2011-07-31 19:41:42 +01:00
Peter 'Pita' Martischka
c8d89e9147 added some forgotten ids 2011-07-31 19:32:35 +01:00
Peter 'Pita' Martischka
a47b5ab458 added the ability to add costum js/css 2011-07-30 16:33:35 +01:00
Peter 'Pita' Martischka
6e2f3a5f7f Merge /home/jose/etherpad-lite.io/ into newDesignTest 2011-07-26 18:08:43 +01:00
Peter 'Pita' Martischka
1a43731a06 Ops, looks like I broke the wordle export at some point, now I fixed it 2011-07-26 18:02:23 +01:00
root
3c493b2f50 Fix for IE erroring on chat window close 2011-07-26 17:35:00 +01:00
Robin Buse
e56ef9c26e Yeah, it was late... 2011-07-26 16:45:24 +03:00
Robin
6823c13001 Fixed import animations 2011-07-25 16:07:34 -07:00
Robin
d1d8ab9e35 Edited static/pad.html via GitHub 2011-07-25 15:45:49 -07:00
Peter 'Pita' Martischka
ba677c6e30 Fixed merge conflicts + changed the design of the front page a bit 2011-07-25 12:35:38 +01:00
Peter 'Pita' Martischka
8138c7d15e rename pad_lite.css to pad.css, its just a better name 2011-07-24 21:26:43 +01:00
Robin
fe93a7a9d8 + removed IE7 css link since it doesn't exist anymore
+ some cleanup
2011-07-24 10:34:33 -07:00
Robin
83f790af1c Edited static/pad.html via GitHub 2011-07-24 09:33:16 -07:00
Robin
3eec9a935d Edited static/pad.html via GitHub 2011-07-24 09:31:39 -07:00
Robin
e0b60acaef Edited static/pad.html via GitHub 2011-07-24 09:31:01 -07:00
Peter 'Pita' Martischka
a717e07531 Moved John's code to the correct place 2011-07-22 14:07:13 +01:00
Peter 'Pita' Martischka
b13fbbfd73 Import works now on the server side 2011-07-21 20:13:58 +01:00
John McLear
4b268f9579 Make a pulsating chat notification and remove the throb from the tab 2011-07-20 21:50:58 +01:00
John McLear
2920c35c0f Now import/Export works 2011-07-20 17:33:27 +01:00
John McLear
4f06d4688f Add wordle support, temporary, Pita to move 2011-07-20 16:38:03 +01:00
John McLear
1849adf9b8 Import CSS and open export in new window 2011-07-20 16:01:10 +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
cf255b2979 Make the pad calls work properly in IE 2011-07-19 20:04:30 +01:00
Peter 'Pita' Martischka
83829759e9 Minifying can be disabled for debugging now 2011-07-14 20:11:03 +01:00
Peter 'Pita' Martischka
29878e648e added a Chat 2011-07-14 16:15:38 +01:00
Peter 'Pita' Martischka
652f97aef0 Mark the placeholder 2011-07-11 22:52:45 +02:00
Peter 'Pita' Martischka
1c1e035bf1 Show a read only link on the pad 2011-07-08 17:42:07 +01:00