Commit Graph

284 Commits (8c301d4fe86fd47cbafb2866e4190fedd36d4ad9)

Author SHA1 Message Date
Peter 'Pita' Martischka 578f8db311 improved test.html 2011-08-10 22:43:29 +01:00
Randy 9f530962ee Add js tests to assist with api development 2011-08-10 22:43:20 +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 d812557445 fixed #73 2011-08-10 18:06:22 +01:00
Peter 'Pita' Martischka 33ec98dd35 beauty 2011-08-10 17:24:59 +01:00
Peter 'Pita' Martischka c4ac1babe8 removed unused images 2011-08-10 17:23:38 +01:00
Peter 'Pita' Martischka ba9861382e fixed the design 2011-08-10 17:19:23 +01:00
Peter 'Pita' Martischka d66675914c Merge branch 'newDesignTest' of /home/jose/etherpad-lite.io/ into johnslayout 2011-08-10 16:19:02 +01:00
Peter 'Pita' Martischka 1a824bd130 Merge branch 'master' of .git into api 2011-08-09 11:08:27 +01:00
Peter 'Pita' Martischka 178b4a95ec added getMappedGroup4 and createGroup 2011-08-08 16:21:31 +01:00
Robin Buse 15bf4b9313 Edited static/index.html via GitHub 2011-08-02 15:06:09 +03:00
Robin Buse 17472a7270 Removed unnecessary comments, changed label class to id and moved the custom js to the appropriate place 2011-08-02 14:56:55 +03:00
John McLear 143369b387 Merge branch 'master' of git://github.com/Pita/etherpad-lite into newDesignTest 2011-08-01 23:13:51 +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
Peter 'Pita' Martischka 053e48c3f4 Secure the call of the costumStart function
Author: Peter 'Pita' Martischka <petermartischka@googlemail.com>
2011-08-01 12:09:33 +01:00
John McLear 03192c1b9a Fix the styling of the chat vdraggie 2011-07-31 20:16:59 +01:00
John McLear 4d4773c1f3 Fix CSS and HTML bugs with new sprites 2011-07-31 20:07:18 +01:00
John McLear 1d62de9acf Updated CSS for sprites 2011-07-31 19:41:54 +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 8101b7df92 Changed the gitignore so everything exept the template files are ignored 2011-07-31 19:39:14 +01:00
Peter 'Pita' Martischka c8d89e9147 added some forgotten ids 2011-07-31 19:32:35 +01:00
John McLear d4ffbdcc1c Add a new class for buttonicon which specifies the new backghround image, this is part of the single image thing Peter wants to reduce the number of images we need 2011-07-31 19:11:55 +01:00
John McLear 7b69f3d7ed New icons file, updated timeslider and resize image 2011-07-31 19:08:14 +01:00
John McLear 3a4c0ea254 Remvoed maximize button -- I never liked this.. 2011-07-31 18:53:03 +01:00
John McLear 20bb067743 removed old background image 2011-07-31 18:52:35 +01:00
John McLear 16c9bf6130 removed old pad top image that is no logner used 2011-07-31 18:52:17 +01:00
Peter 'Pita' Martischka de32503f8e improve including of custom js/css 2011-07-31 17:21:01 +01:00
Peter 'Pita' Martischka bcaadfa6eb Ensure the browser doesn't send socket.io message with the browser version 2011-07-31 16:13:56 +01:00
Peter 'Pita' Martischka aa5b1b85ae fixed all random string functions 2011-07-31 11:48:06 +01:00
Robin Buse 64b4ff3fb1 poor Y and j... :) 2011-07-31 01:58:46 +03:00
Peter 'Pita' Martischka a47b5ab458 added the ability to add costum js/css 2011-07-30 16:33:35 +01:00
Peter 'Pita' Martischka 115f7d6b51 Fixed the iframe problems 2011-07-27 15:11:30 +01:00
Peter 'Pita' Martischka e96595896c Fixed wordle export under https 2011-07-27 13:35:22 +01:00
Peter 'Pita' Martischka 6867d881b1 Hide import/export options that are not avaiable if abiword isn't configured 2011-07-26 18:54:42 +01:00
Peter 'Pita' Martischka 0d46d6f050 Merge git://github.com/0ip/etherpad-lite into newDesignTest 2011-07-26 18:15:18 +01:00
Robin Buse 1e54c41f60 Edited static/index.html via GitHub 2011-07-26 20:14:01 +03:00
Peter 'Pita' Martischka 87d24238a8 Merge git://github.com/0ip/etherpad-lite into newDesignTest 2011-07-26 18:10:38 +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
Peter 'Pita' Martischka 56ab112fa3 Timeslider Javascript is now minified too 2011-07-26 17:39:25 +01:00
root 3c493b2f50 Fix for IE erroring on chat window close 2011-07-26 17:35:00 +01:00
Robin Buse b987a23cd0 Edited static/index.html via GitHub 2011-07-26 19:32:41 +03:00
Peter 'Pita' Martischka 00824ae2d7 Ops, fixed a small bug at the timeslider 2011-07-26 16:46:28 +01:00
Peter 'Pita' Martischka b43c7e7c99 ensure non url chars are not used for pad names or pad links 2011-07-26 16:17:02 +01:00
Robin Buse 01483406ee pass w3c validator 2011-07-26 18:11:51 +03:00
Robin Buse e56ef9c26e Yeah, it was late... 2011-07-26 16:45:24 +03:00
Robin Buse e493516ecd removed animation 2011-07-26 16:40:59 +03:00
Robin Buse 705e83c410 reduced animation effects 2011-07-26 16:36:12 +03:00
Robin Buse a6dcc073b0 Edited static/index.html via GitHub 2011-07-26 16:19:29 +03:00
Robin Buse 2e6c99befd Edited static/index.html via GitHub 2011-07-26 16:19:01 +03:00
Robin Buse f755b4d916 Edited static/index.html via GitHub 2011-07-26 16:17:45 +03:00
Robin Buse 08aa416eb6 Edited static/index.html via GitHub 2011-07-26 16:13:26 +03:00
Robin Buse 88bac4d572 Edited static/index.html via GitHub 2011-07-26 16:11:39 +03:00
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