Commit graph

114 commits

Author SHA1 Message Date
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