libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
800 commits 2 branches 0 tags 24 MiB
Commit graph

396 commits

Author SHA1 Message Date
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
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
Peter 'Pita' Martischka
cc7cc8d884 Add a proper double connect Message 2011-06-02 01:55:09 +01:00
Peter 'Pita' Martischka
a444e870e0 Don't try to reconnect if we reset the connection on our own 2011-06-02 01:03:35 +01:00
Peter 'Pita' Martischka
6122929461 Removed 404 links and some other unused images 2011-06-02 00:28:08 +01:00
Peter 'Pita' Martischka
18ec4dab87 Let client Socket.IO set the options on its own, I think this solves some proxy problems 2011-05-30 21:57:56 +01:00
Peter 'Pita' Martischka
b38b755c68 Updated JQuery to 1.6.1 2011-05-28 22:10:19 +01:00
Peter 'Pita' Martischka
aac1e25c9e Change all absolute paths to relative paths, fixed #13 2011-05-28 21:05:43 +01:00
Peter 'Pita' Martischka
2dc3e34951 Remove link to /ep/support, fixed #18 2011-05-28 20:45:14 +01:00
Peter 'Pita' Martischka
0c3f0e981a Minify and compress JS & CSS before sending it 2011-05-28 18:09:17 +01:00
Peter 'Pita' Martischka
80e4f9f5ff Removed this > next to the embed code 2011-05-23 23:02:10 +01:00
Peter 'Pita' Martischka
110dc5c1d0 Removed unused CSS 2011-05-23 22:50:58 +01:00
Peter 'Pita' Martischka
a800e8d4dc Removed unused JS 2011-05-23 22:48:41 +01:00
Peter 'Pita' Martischka
50a9018eb3 Revert "add viewfontmenu" 
This reverts commit 35cd5945f9.
 2011-05-23 22:33:00 +01:00
Peter 'Pita' Martischka
8feee0995f Revert "make viewfontmenu smaller" 
This reverts commit 4e56438093.
 2011-05-23 22:32:30 +01:00
Peter 'Pita' Martischka
0335e48e35 Show the padname in the html title 2011-05-23 22:30:49 +01:00
Peter 'Pita' Martischka
509498f141 Removed unused images and move them all in one folder 2011-05-23 22:24:49 +01:00
Peter 'Pita' Martischka
6a94c5de94 Create random pad name on the client side, this makes it possible to use it with ep-lite with https 2011-05-23 19:58:54 +01:00
Peter 'Pita' Martischka
3cef5e4b23 Detect connection type before etablishing the socket connection, should solve a problem with a https proxy in front 2011-05-23 19:29:39 +01:00
Peter 'Pita' Martischka
a72d68a4fe 'Reconnect Now' does now a proper reconnect 2011-05-19 22:27:17 +01:00
Peter 'Pita' Martischka
eadc8fcf3b Added a index.html 2011-05-19 22:17:41 +01:00
Peter 'Pita' Martischka
62e17b8dea Added a robots.txt 2011-05-19 17:55:47 +01:00
Peter 'Pita' Martischka
9db2f18b5e Use Express to serve static Files 2011-05-19 17:40:44 +01:00
Hans Pinckaers
7fb631b922 fixed color picker for firefox 4. 2011-05-16 14:15:06 +02:00
Peter 'Pita' Martischka
036417d549 Merge git://github.com/HansPinckaers/etherpad-lite 2011-05-08 18:17:10 +01:00
Patrick Pfeiffer
4e56438093 make viewfontmenu smaller 2011-04-29 05:54:09 +02:00
Patrick Pfeiffer
35cd5945f9 add viewfontmenu 2011-04-27 09:50:48 +02:00
HansPinckaers
f5cd43b5a7 made background white while loading, needs a fancy ajax loader gif 2011-04-10 13:13:01 +02:00
HansPinckaers
89e78ed9be IE scrollbar and disappearing editor fixed. Still no background beneave userlist and embed though 2011-04-08 12:20:26 +02:00
HansPinckaers
dc15daaa40 broke ie/ff working again 2011-04-07 21:34:06 +02:00
HansPinckaers
ad86901f0b online counter now working 2011-04-07 21:18:49 +02:00
HansPinckaers
efdb3b8963 fixed userlist css 2011-04-07 21:08:41 +02:00
HansPinckaers
d53f155c56 removed logging 2011-04-07 20:59:18 +02:00
HansPinckaers
0b8b380d2b userlist/embed working again 2011-04-07 20:45:28 +02:00
HansPinckaers
540156735c forgot italic-button 2011-04-07 18:09:13 +02:00
HansPinckaers
d828eeefa0 small redesign. refactored html/css, broke things, but looks a lot better. 2011-04-07 17:56:33 +02:00
HansPinckaers
effc043025 Every browser working again, but FF has scrollbar 2011-04-07 15:16:38 +02:00
HansPinckaers
8bb02f4074 trying to fix ie 2011-04-07 14:07:53 +02:00
HansPinckaers
cb5b818f33 editor now always showing up on internet explorer 6 2011-04-07 13:41:07 +02:00
HansPinckaers
5dc72234ab fixed html (with whitespace realigned), color choosing is now working. Still needs work. 2011-04-06 22:36:20 +02:00
HansPinckaers
9eb1fecfa7 Merge remote branch 'johns/master' 2011-04-06 19:31:23 +02:00
Peter 'Pita' Martischka
b7c58a5e09 Added client side logging on handshake 2011-03-28 14:12:33 +01:00
Peter 'Pita' Martischka
f28a5c18c6 Some improvements on message handling, on client and serverside 2011-03-27 12:49:04 +01:00
John McLear
9a6fe31419 Removed trailing , that broke IE7 2011-03-27 10:46:45 +00:00
John McLear
9e70313c0d Added simple Json.js to support old versions of IE 2011-03-27 10:28:55 +00:00
John McLear
c9ab5aae19 Remove overlay2.png as it contained HTML 2011-03-27 10:13:22 +00:00
John McLear
51798f3862 Removed docbarstates.png as it included HTML 2011-03-27 10:08:08 +00:00
John McLear
78d8e18634 Remove overlay.png as it included HTML 2011-03-27 10:06:16 +00:00
John McLear
750c75e1dc Fix bug where it displayed users when showing embed div 2011-03-26 19:57:17 +00:00
John McLear
b26b1ebf15 Fix iFrame issue where console is set to top. and change to window. 2011-03-26 19:47:31 +00:00
John McLear
3b029b638d more css for users stuff 2011-03-26 18:45:35 +00:00
John McLear
5558e23107 Commented out pad_chat.js 2011-03-26 18:44:30 +00:00
John McLear
fc4ef5b430 Nice looking user demo css 2011-03-26 17:42:36 +00:00
John McLear
5050491018 nice looking user demo 2011-03-26 17:42:19 +00:00
John McLear
2c8a5987e4 Removed some uservoice and feedback chuf 2011-03-26 17:41:56 +00:00
John McLear
c66bce6461 Remove old css for displaying users and chat and add new css for new view 2011-03-26 17:17:13 +00:00
John McLear
86eea91c22 Beginning of Users view 2011-03-26 17:16:43 +00:00
John McLear
5170c29e18 Fix css href 2011-03-26 17:16:19 +00:00
John McLear
1afc41d606 Fix minor css bug in embed part 2 2011-03-26 16:04:07 +00:00
John McLear
10417db768 Fix minor css bug in embed 2011-03-26 16:03:05 +00:00
John McLear
8117834010 Embed JS 2011-03-26 16:00:04 +00:00
John McLear
c055fc387c Embed CSS changes 2011-03-26 15:56:40 +00:00
John McLear
be4a470f67 Add first bits of embed support 2011-03-26 15:37:35 +00:00
John McLear
9aff551655 temporary embed image 2011-03-26 15:23:18 +00:00
John McLear
46f1eb4139 Add toggle functionality for users 2011-03-26 15:08:39 +00:00
John McLear
6d0e50b048 Updated icon 2011-03-26 14:58:45 +00:00
John McLear
6d2bfc647b Added some animation for user bar 2011-03-26 14:50:13 +00:00
John McLear
407fdb0486 New showusers icon 2011-03-26 14:38:06 +00:00
John McLear
baf952d908 Add Icon for users dropdown to html 2011-03-26 14:36:11 +00:00
John McLear
64ac99add8 Icon for users dropdown 2011-03-26 14:34:50 +00:00
John McLear
10abf3b087 Removed bottom border 2011-03-26 14:18:36 +00:00
John McLear
9b2ecbee56 Removed bottom margin 2011-03-26 14:17:30 +00:00
John McLear
cd2fe7d66c Removed feedback code 2011-03-26 14:15:36 +00:00
John McLear
c66a09e8d4 Changed jquery to latest Google CDN 2011-03-26 14:13:56 +00:00
John McLear
2bf5c333fb Changed Linepad references to Etherpad Lite 2011-03-26 14:04:32 +00:00
John McLear
4c9dca7ffc Changed margin right on the right sidebar items 2011-03-26 14:03:25 +00:00
John McLear
e68f0dd4b1 Changed it to a lite interface by stripping out a load of code 2011-03-26 14:01:13 +00:00
John McLear
946b9b8657 Added new .css file 2011-03-26 13:54:03 +00:00
Peter 'Pita' Martischka
437cd90b90 Removing unused files 2011-03-26 13:49:01 +00:00
Peter 'Pita' Martischka
6c05ef8746 outcomment the message recieve on the client side ;) 2011-03-26 13:31:19 +00:00
Peter 'Pita' Martischka
325c322a27 first-commit 2011-03-26 13:10:41 +00:00