Commit Graph

229 Commits (13c10013b9fb0276225d8b67bd9fae08e5a92155)

Author SHA1 Message Date
Robin Buse 4bcc415aea Edited static/index.html via GitHub 2011-07-26 15:07:23 +03:00
Robin Buse 3a64ee733b Cleanup 2011-07-25 17:09:24 -07:00
Robin d3e7906951 Removed dummy pad name and revision date 2011-07-25 16:16:00 -07: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
Robin d73d806022 1) Label color a bit darker than before 2) New smooth animation 3) Bugfix: form can be submitted within the text input instead of clicking the button 4) Added future gradients for Opera 2011-07-25 15:45:04 -07:00
Peter 'Pita' Martischka eb40c014b6 Fixed the NaN Bug on timeslider 2011-07-25 17:26:56 +01:00
Peter 'Pita' Martischka e9a389b0a6 improved minifying 2011-07-25 14:38:54 +01: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
Robin 81f261935d ie10 button:active fix + removed useless transition 2011-07-25 03:37:09 -07:00
Robin dcd6d4cc09 Removed branding, sorry 2011-07-24 13:54:49 -07:00
Peter 'Pita' Martischka fa607e5af8 Ops, forgot renaming pad.css in timeslider.html 2011-07-24 21:41:42 +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
Peter 'Pita' Martischka 646d300b24 removed blue lines from export links 2011-07-24 21:26:43 +01:00
Robin 90ac1e190d Edited static/index.html via GitHub 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 d7270d63d6 Revive the good old pointer... 2011-07-24 10:30:52 -07:00
Robin a6b18ff64a Edited static/index.html via GitHub 2011-07-24 09:47:04 -07:00
Robin 124f076656 Edited static/timeslider.html via GitHub 2011-07-24 09:34:38 -07:00
Robin e8f8f51850 Edited static/timeslider.html via GitHub 2011-07-24 09:33:46 -07:00
Robin 83f790af1c Edited static/pad.html via GitHub 2011-07-24 09:33:16 -07:00
Robin 520da9d521 Edited static/timeslider.html via GitHub 2011-07-24 09:32:32 -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 3ccdcec7e8 ensure we don't send a handshake on every reconnect 2011-07-22 14:17:58 +01: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 fba2c5ccb2 Hide the import/export by default 2011-07-20 17:33:40 +01:00
John McLear 2920c35c0f Now import/Export works 2011-07-20 17:33:27 +01:00
John McLear 1fca334704 fix literal paths, now they are relative 2011-07-20 17:26:50 +01:00
John McLear 43508a32a3 Ensure the last chat comment is always in focus after resize 2011-07-20 17:23:01 +01:00
John McLear 126dc4d0e8 Ensure cursor types are right for all icons and objects 2011-07-20 17:20:46 +01:00
John McLear 4f06d4688f Add wordle support, temporary, Pita to move 2011-07-20 16:38:03 +01:00
John McLear 802866a5da Open link in new window file 2011-07-20 16:01:26 +01:00
John McLear 1849adf9b8 Import CSS and open export in new window 2011-07-20 16:01:10 +01:00
John McLear 77dc7ede14 change end points to right export endpoint 2011-07-20 15:48:24 +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
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 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 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 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 29878e648e added a Chat 2011-07-14 16:15:38 +01: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 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
Peter 'Pita' Martischka 7915390b83 select the embed code when it drops down 2011-07-08 15:37:57 +01:00
Peter 'Pita' Martischka cbbb0a4ed1 cleaned the dropdown code a lot 2011-07-08 15:19:38 +01:00
Peter 'Pita' Martischka 271ee1776b beautified all static js files 2011-07-07 18:59:34 +01:00
Peter 'Pita' Martischka 6f59835474 reorder the buttons again 2011-07-06 22:56:08 +02:00
Peter 'Pita' Martischka ac1858f8ec Fixes a problem with the resource path of socket.io 2011-07-06 19:51:41 +02:00
Peter 'Pita' Martischka 068d174c58 Added icons for the new features 2011-07-06 18:35:27 +01:00
Peter 'Pita' Martischka 9db609ecc1 beautify the colorpicker 2011-07-06 14:08:20 +01:00
Peter 'Pita' Martischka b46c0e3b3c Let the embed code and the userbar slide down with an animation 2011-07-06 13:42:00 +01:00
Peter 'Pita' Martischka 654181b292 Set a height and width attribute for the images, beautifies loading 2011-07-06 12:53:24 +01:00
Peter 'Pita' Martischka 60f90e7165 reorder buttons 2011-07-06 12:48:18 +01:00
Peter 'Pita' Martischka 973d73ebee ensure all paths are relative 2011-07-05 20:16:45 +02:00
Pita Poison 7a10e1783a Merge branch 'master' of github.com:Pita/etherpad-lite into HEAD 2011-07-05 16:51:29 +02:00
Peter 'Pita' Martischka 95b47b4940 use a downloaded jQuery instead of using googles CDN, and fixed btw a bug that let pad.js fails randomly 2011-06-30 18:06:07 +01:00
Peter 'Pita' Martischka 7f17eb9903 create the link back to the pad while runtime instead of doing a javascript link 2011-06-30 12:16:04 +01:00
Peter 'Pita' Martischka 8d5770e44a create link to timeslider while runtime instead of doing a javascript link 2011-06-30 12:10:50 +01:00
Peter 'Pita' Martischka d547623e05 cleand the css of the timeslider 2011-06-28 13:57:27 +02:00
Peter 'Pita' Martischka 0d9b49a25f outcommented unused css. If no display errors happens we can remove the code completly 2011-06-28 13:52:15 +02:00
Peter 'Pita' Martischka af57413cfa Ops, forgot the static files 2011-06-23 14:09:41 +01:00
Peter 'Pita' Martischka fd5aafe17a update to socket.io 0.7.2 2011-06-23 12:33:31 +01:00
Peter 'Pita' Martischka 6e09517d55 Buttons to the timeslider and back are working now 2011-06-21 17:02:45 +01:00
Peter 'Pita' Martischka 247462e2f8 Merge branch 'timeslider' of git://github.com/Pita/etherpad-lite into timeslider 2011-06-21 15:11:44 +01:00
Peter 'Pita' Martischka 27ae8bb3fa John's CSS styling 2011-06-21 15:10:40 +01:00
Peter 'Pita' Martischka add35f16fd clean the code 2011-06-20 15:59:27 +01:00
Peter 'Pita' Martischka 867525945d Timeslider is working 2011-06-20 15:37:41 +01:00
Peter 'Pita' Martischka 44aa476ec0 A lot small changes that results in a timeslider that shows the latest text 2011-06-20 11:44:04 +01:00
Peter 'Pita' Martischka 182477af93 Removed the invite panel, didn't work too 2011-06-04 18:26:19 +01:00
Peter 'Pita' Martischka 33be56d958 Removed the save button, didn't work anyway 2011-06-04 18:23:20 +01:00
Peter 'Pita' Martischka b692ffec0b Changing behavior of the same user on a pad. Kick old sessions instead of refusing new 2011-06-04 18:02:22 +01:00
Peter 'Pita' Martischka 3b2a601beb Revert "Don't try to reconnect if we reset the connection on our own"
Don't think this is necassary, the problem might be caused by of a old socket.io version

This reverts commit a444e870e0.
2011-06-02 14:17:15 +01:00
Peter 'Pita' Martischka 82bb9e69ed Show 'loading...' while loading 2011-06-02 13:56:58 +01:00