public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
177 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

89 Commits (247462e2f8406b55abe459c36759de440de82506)

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