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

253 commits

Author SHA1 Message Date
Peter 'Pita' Martischka
9a71cc4729 replaced tabs with spaces 2011-08-01 18:45:28 +01:00
Peter 'Pita' Martischka
38fd56a877 bugfix bugfix 2011-07-31 20:32:46 +01:00
Peter 'Pita' Martischka
b30849c2f2 Installed log4js as logging framework 2011-07-31 18:25:51 +01:00
Peter 'Pita' Martischka
340fbf4d44 Don't send user timestamps with the clientVars message 2011-07-31 16:16:59 +01:00
Peter 'Pita' Martischka
73b49e9c25 Do not send the real client ip in the clientVars Message 2011-07-31 16:14:55 +01:00
Peter 'Pita' Martischka
783203b865 Improved chat message managing 2011-07-31 16:03:53 +01:00
Peter 'Pita' Martischka
ec0d9c9452 Made the author management more stable 2011-07-31 15:18:55 +01:00
Peter 'Pita' Martischka
86e81a1648 made a if statement more secure 2011-07-31 15:05:04 +01:00
Peter 'Pita' Martischka
5306a88214 added the ability to listen at a specific ip 2011-07-30 16:39:53 +01:00
Peter 'Pita' Martischka
325839f9fd Handle Changeset missmatch gracefully 2011-07-30 13:33:16 +01:00
Peter 'Pita' Martischka
29dc8fdc31 change if author really exist, before we set the author timestamp 2011-07-30 12:50:29 +01:00
Peter 'Pita' Martischka
fbcfd44fe2 Added a README that explains the folder structure 2011-07-27 20:18:55 +01:00
Peter 'Pita' Martischka
fd329c189a Ops, forgot to fix one require 2011-07-27 19:29:44 +01:00
Peter 'Pita' Martischka
2aafcc1027 Fixed all requires 2011-07-27 18:52:23 +01:00
Peter 'Pita' Martischka
8736b945c3 created a folder structure in node 2011-07-27 17:55:52 +01:00
Peter 'Pita' Martischka
f4e04be9da Let socket.io minify its javascript 2011-07-27 14:46:45 +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
56ab112fa3 Timeslider Javascript is now minified too 2011-07-26 17:39:25 +01:00
Robin Buse
2bd2348cc0 Removed outdated backslashes and strange newlines within elements 2011-07-25 16:47:25 -07:00
Robin Buse
6eb0080ac5 Forgot a newline... 2011-07-25 16:42:27 -07:00
Robin Buse
a8e676ea7c HTML5 Exporter Upgrade 2011-07-25 16:29:32 -07:00
Peter 'Pita' Martischka
eb40c014b6 Fixed the NaN Bug on timeslider 2011-07-25 17:26:56 +01:00
Peter 'Pita' Martischka
1067d17381 Log the disconnect diagnostic info that etherpad still sends. Maybe thats usefull 2011-07-25 16:31:41 +01:00
Peter 'Pita' Martischka
e9a389b0a6 improved minifying 2011-07-25 14:38:54 +01:00
Peter 'Pita' Martischka
08d835187c now, we're able to import code files 2011-07-24 21:26:43 +01:00
Peter 'Pita' Martischka
358046fd5b Improve handling of abiword errors 2011-07-24 21:26:43 +01:00
Peter 'Pita' Martischka
1c8f70fae9 Disabling minify creates now one big js file, instead of loading js files dynamicly. This solves problems we had with random loading of the js files 2011-07-24 21:26:43 +01:00
Peter 'Pita' Martischka
b13fbbfd73 Import works now on the server side 2011-07-21 20:13:58 +01:00
Peter 'Pita' Martischka
8b6be1b014 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-07-19 20:06:44 +01:00
John McLear
322a66aab1 Change order of JS, hope to load utils early on, im not sure this is a proper fix though 2011-07-19 20:04:16 +01:00
John McLear
bc9aa8579e Change it to use jquery ui instwead of the jquery ui slide file 2011-07-19 20:02:43 +01:00
Peter 'Pita' Martischka
eeddf1348f Added support for document export, no link from the pad so far 2011-07-19 19:48:11 +01:00
Peter 'Pita' Martischka
83829759e9 Minifying can be disabled for debugging now 2011-07-14 20:11:03 +01:00
Peter 'Pita' Martischka
29878e648e added a Chat 2011-07-14 16:15:38 +01:00
Peter 'Pita' Martischka
69d2eba46e Improve the logging of Socket.IO Messages 2011-07-11 15:56:45 +02:00
Peter 'Pita' Martischka
93ccbaef3a Read only access works 2011-07-08 18:33:01 +01:00
Peter 'Pita' Martischka
1c1e035bf1 Show a read only link on the pad 2011-07-08 17:42:07 +01:00
Peter 'Pita' Martischka
87afca060a reduce the log level of socket.io 2011-07-07 18:15:39 +01:00
Peter 'Pita' Martischka
822d854882 reverts the changes I didn't like/understand 2011-07-07 18:09:08 +01:00
Erlend Halvorsen
7cf1a50fff Added support for exporting html 2011-07-07 18:02:57 +01:00
Peter 'Pita' Martischka
41f0feab91 Fixes 2 API Problems 2011-07-06 22:43:28 +02:00
Peter 'Pita' Martischka
5ee60b0b35 Fixed a Socket.IO API Problem 2011-07-06 18:34:39 +01: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
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
a4627a4b6d Fixed the author color Bug 2011-06-30 12:03:20 +01: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
80a478fd55 Change everything to the new Socket.IO API 2011-06-23 14:08:18 +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
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
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
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
37490524d9 Fixes jsdoc types 2011-06-02 13:11:46 +01:00
Peter 'Pita' Martischka
f7b46f6e69 Documentation 2011-05-30 15:53:11 +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
4eccf72baa Allow caching up to a week 2011-05-28 20:43:00 +01:00
Peter 'Pita' Martischka
537fca9ca4 Remove the unused compress require 2011-05-28 18:33:49 +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
254762eb8a Fixed #9 2011-05-23 20:11:57 +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
309d594a9a The pad default text is now configurable in the settings file 2011-05-19 22:46:19 +01:00
Peter 'Pita' Martischka
42dfb31cf8 Restored the errorlog function, fixes a bug 2011-05-19 22:22:12 +01:00
Peter 'Pita' Martischka
9db2f18b5e Use Express to serve static Files 2011-05-19 17:40:44 +01:00
Peter 'Pita' Martischka
b0a937d8de Allow comments in the settings file 2011-05-19 14:30:08 +01:00
Peter 'Pita' Martischka
e14cb5c2b7 Fixed the Attribute Pool Bug :) 2011-05-18 23:04:11 +01:00
Peter 'Pita' Martischka
08b8568f7b Pads are now saved to the database, but some weird Bugs with the Attribute Pool 2011-05-17 16:33:54 +01:00
Peter 'Pita' Martischka
73efbf216d Removed Debug Code 2011-05-16 19:01:19 +01:00
Peter 'Pita' Martischka
89fdd0a9b9 fixed merge conflicts. 2011-05-16 16:35:02 +01:00
Hans Pinckaers
499c560abd added Pad model via Joose, PadManager is a lot cleaner now. 2011-05-16 16:30:21 +02:00
Peter 'Pita' Martischka
b1997a11c9 Authordata is now saved to the database 2011-05-16 13:10:53 +01:00
Peter 'Pita' Martischka
08adbb5bdb Removed DB testcode 2011-05-14 19:06:20 +01:00
Peter 'Pita' Martischka
68dfff5a21 Installed ueberDB 2011-05-14 18:57:07 +01:00
Peter 'Pita' Martischka
e855b09463 Add License info 2011-05-14 17:42:04 +01:00
Peter 'Pita' Martischka
8da3c04b41 Add a settings file 2011-05-14 17:22:25 +01:00
Peter 'Pita' Martischka
7949d494b3 Added a small notifcation about which port we are listening to 2011-05-08 18:22:02 +01:00
Peter 'Pita' Martischka
312a923a28 Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite 2011-04-08 12:48:21 +01:00
HansPinckaers
e3e2a7c562 Names working correctly now 2011-04-07 21:05:55 +02:00
Peter 'Pita' Martischka
89adffed74 Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite 2011-04-07 20:04:52 +01:00
Peter 'Pita' Martischka
2d0dc5aab6 Improve the Error Messages 2011-04-06 22:53:07 +01:00
HansPinckaers
45cccef3e7 fixed connection=null error 2011-04-06 22:59:57 +02:00
HansPinckaers
9eb1fecfa7 Merge remote branch 'johns/master' 2011-04-06 19:31:23 +02:00
Peter 'Pita' Martischka
255a1b94f2 Don't add a anonymous author to the attribute pool, this prevents some wired bugs 2011-03-28 23:08:25 +01:00
Peter 'Pita' Martischka
92257cd0af Add a USER_LEAVE message 2011-03-28 23:07:35 +01:00
Peter 'Pita' Martischka
82e7fda80e Fixed the AttributePool Bug 2011-03-28 14:15:00 +01:00
Peter 'Pita' Martischka
328e7f1aa4 Let the Server Handle USERINFO_UPATE correctly 2011-03-27 13:13:46 +01:00
Peter 'Pita' Martischka
f28a5c18c6 Some improvements on message handling, on client and serverside 2011-03-27 12:49:04 +01:00
Peter 'Pita' Martischka
c563faf431 Add Comments to Message Handler 2011-03-26 21:29:33 +00:00
John McLear
82f427422a Updated welcome to text to read something more friendly and useful 2011-03-26 18:48:38 +00:00
Peter 'Pita' Martischka
e21b15c39c Add License to server.js and soround onmessage with a try-catch 2011-03-26 14:52:56 +00:00
John McLear
e174359b45 Changed listening TCP port to 9001 2011-03-26 13:44:47 +00:00
Peter 'Pita' Martischka
325c322a27 first-commit 2011-03-26 13:10:41 +00:00