Commit graph

7610 commits

Author SHA1 Message Date
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
Peter 'Pita' Martischka
ee2c8f4524 Fixing another new API Problem 2011-07-05 20:05:06 +02:00
Peter 'Pita' Martischka
fb0968d020 Use only xhr polling 2011-07-05 19:27:00 +02:00
Peter 'Pita' Martischka
58c50302f1 Fixes some problems with the new API 2011-07-05 17:07:23 +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
880d82d76d Show git version in server header 2011-06-30 20:03:09 +01:00
Peter 'Pita' Martischka
0d41b4b445 Improved the README 2011-06-30 18:43:27 +01: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
c98db5a4c1 Enable suggest user name 2011-06-30 14:19:30 +01:00
Peter 'Pita' Martischka
60c6e5ea83 A cache of 6 hours should be a good middle 2011-06-30 12:43:11 +01:00
Peter 'Pita' Martischka
946568d3a3 Revert "Remove caching, creates more problems than it solves"
This reverts commit a4b9427896.
2011-06-30 12:40:37 +01:00
Peter 'Pita' Martischka
5c7d96b469 check pad urls before serving it 2011-06-30 12:40:31 +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
a4627a4b6d Fixed the author color Bug 2011-06-30 12:03:20 +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
b8c1d0b8bd Check only Protocolversion of messages that have one 2011-06-27 23:12:46 +02:00
Peter 'Pita' Martischka
a4b9427896 Remove caching, creates more problems than it solves 2011-06-27 23:10:18 +02:00
Peter 'Pita' Martischka
75dd468f50 Prevent crashing when getting messages of the old protocolversion 2011-06-27 23:06:05 +02:00
Peter 'Pita' Martischka
af57413cfa Ops, forgot the static files 2011-06-23 14:09:41 +01:00
Peter 'Pita' Martischka
80a478fd55 Change everything to the new Socket.IO API 2011-06-23 14:08:18 +01:00
Peter 'Pita' Martischka
fd5aafe17a update to socket.io 0.7.2 2011-06-23 12:33:31 +01:00
Peter 'Pita' Martischka
84b0521c85 It looks like there is a Bug in the new Version Revert "Update Socket.IO to 0.7.2"
This reverts commit ed9bf47303.
2011-06-23 12:29:14 +01:00
Peter 'Pita' Martischka
37fe514154 Reduce Cache from 1 week to 1 day to reduce update problems 2011-06-23 11:36:25 +01:00
Peter 'Pita' Martischka
1f0353d680 Change 'npm link' to 'npm install'. It does the same but doesn't need root permissions and it's able to check which dependencies are already installed 2011-06-23 11:34:57 +01:00
Peter 'Pita' Martischka
cc7ce0ca4c Update express 2011-06-23 11:26:09 +01:00
Peter 'Pita' Martischka
ed9bf47303 Update Socket.IO to 0.7.2 2011-06-23 11:24:36 +01:00
Peter 'Pita' Martischka
48f28e9515 Fix indent 2011-06-23 11:17:51 +01:00
Hans Pinckaers
74b96aa774 Made the router a little safer. 2011-06-21 21:19:48 +02: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
92b8e2ea9e Removed npm link from run.sh 2011-06-04 18:05:47 +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
bf32c18d8d Update ueberDB to 0.0.6 2011-06-04 16:15:18 +01:00
Peter 'Pita' Martischka
43712c4cef run.sh is startable from any location again 2011-06-04 15:57:39 +01:00
Peter 'Pita' Martischka
4e0cf8a0c3 Fixed typo 2011-06-02 14:36:12 +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
8693f317ac Improve run.sh in many points 2011-06-02 13:43:34 +01:00
Peter 'Pita' Martischka
37490524d9 Fixes jsdoc types 2011-06-02 13:11:46 +01:00
Peter 'Pita' Martischka
890d1a4e05 update package.json 2011-06-02 12:46:10 +01:00