Commit Graph

93 Commits (ac41acd52b38929ee3ed221ca76ffe3a7533321f)

Author SHA1 Message Date
Peter 'Pita' Martischka 4d714cee94 Merge pull request #371 from cweider/page-initialization
Page initialization
2012-01-30 01:56:02 -08:00
Robin ddcaf0dad6 Moved inline css to pad.css and made popups even more dynamic 2012-01-29 16:57:06 +01:00
Chad Weider bdf0f203f9 Shift button styling specifics into CSS. 2012-01-28 15:12:21 -08:00
Chad Weider cd86ef5600 Shift pad initialization into JavaScript. 2012-01-28 14:48:53 -08:00
Chad Weider 3e9b56aa75 Give controller for pad.html a more appropriate name. 2012-01-28 14:48:53 -08:00
Robin d872b42e31 reverted John's commits, added labels and tweaked popups to act more dynamically 2012-01-28 17:38:52 +01:00
John McLear a53de45b32 Beautifying 0ips commit to give settings option, also add warning prior to altering everyones view and moved everyones view stuff into my view only that needed to be moved.. 2012-01-27 01:00:14 +00:00
Robin 57075d1545 Beautified html, sticky chat, dynamic inputs, beautified qr-code, fixed chat bug 2012-01-26 17:22:44 +01:00
Chad Weider 62e0a8f26c Use require-kernel for require functionality. 2012-01-22 09:54:28 -08:00
Chad Weider 1b89e7e290 Implement `require` in HTML pages. 2012-01-22 09:49:13 -08:00
Chad Weider da95016228 Add a fake `require` to go with the fake `exports`. 2012-01-22 09:49:13 -08:00
Robin 960a79b77b Added icon for ordered lists 2012-01-15 18:37:33 +01:00
John McLear f4dca37a93 Ordered list support 2012-01-15 17:20:20 +00:00
Robin 8787897f60 Changed position values 2012-01-13 23:58:47 +01:00
TimWolla 12fc8226f0 Made pad.html more valid
- & -> &
- Removed duplicate ID in one Tag
2012-01-08 13:55:34 +01:00
Peter 'Pita' Martischka c72cd49ede Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki 2011-12-11 18:09:51 +01:00
Adrian Lang 40c5e70aa7 Add DokuWiki export 2011-12-07 13:03:08 +01:00
0ip 89aac09c91 sorry for that, correct pad.html 2011-12-06 18:54:57 +01:00
0ip b615da194f Optimized index page for mobile devices 2011-12-06 18:45:16 +01:00
John McLear 990a559a09 When noColors is set hide the clearAuthorship colors button 2011-12-04 17:17:44 +01:00
0ip 499e780c88 added related div to work properly 2011-12-02 20:39:23 +01:00
John McLear 9e509677dc Merge pull request #231 from jtlebi/origin/shift-tab
(de)indent behaviour enhancement
2011-11-28 20:23:37 -08:00
John McLear 054af3da77 Change embe this pad to share and embed this pad 2011-11-28 02:42:30 +00:00
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
Jean-Tiare Le Bigot 9c14dcd498 updated menu bar labels 2011-11-25 11:19:22 +01: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