Commit graph

  • a72d68a4fe 'Reconnect Now' does now a proper reconnect Peter 'Pita' Martischka 2011-05-19 22:27:17 +0100
  • 42dfb31cf8 Restored the errorlog function, fixes a bug Peter 'Pita' Martischka 2011-05-19 22:22:12 +0100
  • eadc8fcf3b Added a index.html Peter 'Pita' Martischka 2011-05-19 22:17:41 +0100
  • 62e17b8dea Added a robots.txt Peter 'Pita' Martischka 2011-05-19 17:55:47 +0100
  • 9db2f18b5e Use Express to serve static Files Peter 'Pita' Martischka 2011-05-19 17:36:26 +0100
  • b0a937d8de Allow comments in the settings file Peter 'Pita' Martischka 2011-05-19 14:30:08 +0100
  • 9849e81e08 Added a .npmignore for smaller npm packages Peter 'Pita' Martischka 2011-05-19 13:17:24 +0100
  • b18cd7bb10 Update UeberDB dependency to the next version Peter 'Pita' Martischka 2011-05-19 13:15:33 +0100
  • e14cb5c2b7 Fixed the Attribute Pool Bug :) Peter 'Pita' Martischka 2011-05-18 23:04:11 +0100
  • 08b8568f7b Pads are now saved to the database, but some weird Bugs with the Attribute Pool Peter 'Pita' Martischka 2011-05-17 16:33:54 +0100
  • 73efbf216d Removed Debug Code Peter 'Pita' Martischka 2011-05-16 19:01:19 +0100
  • 18d598fcd4 Add Joose to package.json Peter 'Pita' Martischka 2011-05-16 16:36:19 +0100
  • 89fdd0a9b9 fixed merge conflicts. Peter 'Pita' Martischka 2011-05-16 16:28:58 +0100
  • 499c560abd added Pad model via Joose, PadManager is a lot cleaner now. Hans Pinckaers 2011-05-16 16:30:21 +0200
  • 7fb631b922 fixed color picker for firefox 4. Hans Pinckaers 2011-05-16 14:15:06 +0200
  • b1997a11c9 Authordata is now saved to the database Peter 'Pita' Martischka 2011-05-16 13:10:53 +0100
  • fa6641a368 Update ueberDB dependency Peter 'Pita' Martischka 2011-05-14 21:57:30 +0100
  • 08adbb5bdb Removed DB testcode Peter 'Pita' Martischka 2011-05-14 19:06:20 +0100
  • 68dfff5a21 Installed ueberDB Peter 'Pita' Martischka 2011-05-14 18:57:07 +0100
  • 0c6296c516 Added a var folder for the sqlite db Peter 'Pita' Martischka 2011-05-14 17:49:47 +0100
  • 6de78d6b40 Add ueberDB to dependencies Peter 'Pita' Martischka 2011-05-14 17:45:15 +0100
  • e855b09463 Add License info Peter 'Pita' Martischka 2011-05-14 17:42:04 +0100
  • 8da3c04b41 Add a settings file Peter 'Pita' Martischka 2011-05-14 17:22:25 +0100
  • 7c4502951a Remind users to install it globaly Peter 'Pita' Martischka 2011-05-13 15:57:27 +0100
  • d0da998299 removed debug message Peter 'Pita' Martischka 2011-05-13 15:53:20 +0100
  • b4ca337020 Change in the project directory before starting server.js, solves a problem with npm Peter 'Pita' Martischka 2011-05-13 15:52:07 +0100
  • 8233d6381b update README, installation instructions are now with npm Peter 'Pita' Martischka 2011-05-08 19:24:23 +0100
  • 6e7b0b0a9c Added a package.json, now installable via 'npm ep-lite' and startable via 'ep-lite'. Fixed #6 Peter 'Pita' Martischka 2011-05-08 19:10:42 +0100
  • d003aaad44 remove test file Peter 'Pita' Martischka 2011-05-08 18:48:24 +0100
  • 16442e8202 testcommit Peter 'Pita' Martischka 2011-05-08 18:35:10 +0100
  • 7949d494b3 Added a small notifcation about which port we are listening to Peter 'Pita' Martischka 2011-05-08 18:22:02 +0100
  • 036417d549 Merge git://github.com/HansPinckaers/etherpad-lite Peter 'Pita' Martischka 2011-05-08 18:17:10 +0100
  • fc1111b097 Add mailinglist and irc channel info to the readme Peter 'Pita' Martischka 2011-05-08 17:44:12 +0100
  • e9b3a17699 Merge pull request #8 from guybrush/master. Pita 2011-04-30 06:38:29 -0700
  • 958f795322 Merged 4e56438093 into 312a923a28 GitHub Merge Button 2011-04-29 08:36:32 -0700
  • 4e56438093 make viewfontmenu smaller Patrick Pfeiffer 2011-04-29 05:54:09 +0200
  • 35cd5945f9 add viewfontmenu Patrick Pfeiffer 2011-04-27 09:50:48 +0200
  • f5cd43b5a7 made background white while loading, needs a fancy ajax loader gif HansPinckaers 2011-04-10 13:13:01 +0200
  • 312a923a28 Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite Peter 'Pita' Martischka 2011-04-08 12:48:21 +0100
  • 89e78ed9be IE scrollbar and disappearing editor fixed. Still no background beneave userlist and embed though HansPinckaers 2011-04-08 12:20:26 +0200
  • dc15daaa40 broke ie/ff working again HansPinckaers 2011-04-07 21:34:06 +0200
  • ad86901f0b online counter now working HansPinckaers 2011-04-07 21:18:49 +0200
  • efdb3b8963 fixed userlist css HansPinckaers 2011-04-07 21:08:41 +0200
  • e3e2a7c562 Names working correctly now HansPinckaers 2011-04-07 21:05:55 +0200
  • 89adffed74 Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite Peter 'Pita' Martischka 2011-04-07 20:04:52 +0100
  • d53f155c56 removed logging HansPinckaers 2011-04-07 20:59:18 +0200
  • 0b8b380d2b userlist/embed working again HansPinckaers 2011-04-07 20:45:28 +0200
  • debbced185 Fixing scripts to run from both bin/ and /. Lukas Martini 2011-04-07 19:54:41 +0200
  • de967c1cd5 Revert "Adding Makefile for easier execution" Lukas Martini 2011-04-07 19:51:18 +0200
  • 81e13700ed Merge branch 'master' of github.com:lutoma/etherpad-lite Lukas Martini 2011-04-07 19:43:19 +0200
  • 204e89cd70 Add a comment to the readme that encourage to compile node.js from source Peter 'Pita' Martischka 2011-04-07 18:51:57 +0100
  • fed33e76fa Adding Makefile for easier execution Lukas Martini 2011-04-07 19:42:50 +0200
  • 540156735c forgot italic-button HansPinckaers 2011-04-07 18:09:13 +0200
  • d828eeefa0 small redesign. refactored html/css, broke things, but looks a lot better. HansPinckaers 2011-04-07 17:56:33 +0200
  • a15f3426d4 beautify readme Peter 'Pita' Martischka 2011-04-07 15:17:40 +0100
  • 4b99fec6ae Improve run.sh Peter 'Pita' Martischka 2011-04-07 14:51:46 +0100
  • e2ce9dcc02 reorganize Joes PDF's Peter 'Pita' Martischka 2011-04-07 14:45:19 +0100
  • a8b91b9b40 improve the README Peter 'Pita' Martischka 2011-04-07 14:35:13 +0100
  • effc043025 Every browser working again, but FF has scrollbar HansPinckaers 2011-04-07 15:16:38 +0200
  • 8bb02f4074 trying to fix ie HansPinckaers 2011-04-07 14:07:53 +0200
  • cb5b818f33 editor now always showing up on internet explorer 6 HansPinckaers 2011-04-07 13:41:07 +0200
  • 2d0dc5aab6 Improve the Error Messages Peter 'Pita' Martischka 2011-04-06 22:53:07 +0100
  • 45cccef3e7 fixed connection=null error HansPinckaers 2011-04-06 22:59:57 +0200
  • 5dc72234ab fixed html (with whitespace realigned), color choosing is now working. Still needs work. HansPinckaers 2011-04-06 22:36:20 +0200
  • 9eb1fecfa7 Merge remote branch 'johns/master' HansPinckaers 2011-04-06 19:31:23 +0200
  • 255a1b94f2 Don't add a anonymous author to the attribute pool, this prevents some wired bugs Peter 'Pita' Martischka 2011-03-28 23:08:25 +0100
  • 92257cd0af Add a USER_LEAVE message Peter 'Pita' Martischka 2011-03-28 23:07:35 +0100
  • 7d3c7bec15 Removed docs.html, was only for testing Peter 'Pita' Martischka 2011-03-28 20:13:03 +0100
  • 82e7fda80e Fixed the AttributePool Bug Peter 'Pita' Martischka 2011-03-28 14:15:00 +0100
  • b7c58a5e09 Added client side logging on handshake Peter 'Pita' Martischka 2011-03-28 14:12:33 +0100
  • 31952532c2 Uploaded improved documentation about easysync, thx @Joe Corneli Peter 'Pita' Martischka 2011-03-28 13:30:42 +0100
  • 7f851b6376 Add a runDebug Script Peter 'Pita' Martischka 2011-03-28 13:27:09 +0100
  • 328e7f1aa4 Let the Server Handle USERINFO_UPATE correctly Peter 'Pita' Martischka 2011-03-27 13:13:46 +0100
  • 9360814242 Created a JSDoc, first try Peter 'Pita' Martischka 2011-03-27 12:49:56 +0100
  • f28a5c18c6 Some improvements on message handling, on client and serverside Peter 'Pita' Martischka 2011-03-27 12:49:04 +0100
  • 9a6fe31419 Removed trailing , that broke IE7 John McLear 2011-03-27 10:46:45 +0000
  • 9e70313c0d Added simple Json.js to support old versions of IE John McLear 2011-03-27 10:28:55 +0000
  • c9ab5aae19 Remove overlay2.png as it contained HTML John McLear 2011-03-27 10:13:22 +0000
  • 51798f3862 Removed docbarstates.png as it included HTML John McLear 2011-03-27 10:08:08 +0000
  • 78d8e18634 Remove overlay.png as it included HTML John McLear 2011-03-27 10:06:16 +0000
  • c563faf431 Add Comments to Message Handler Peter 'Pita' Martischka 2011-03-26 21:29:33 +0000
  • 750c75e1dc Fix bug where it displayed users when showing embed div John McLear 2011-03-26 19:57:17 +0000
  • b26b1ebf15 Fix iFrame issue where console is set to top. and change to window. John McLear 2011-03-26 19:47:31 +0000
  • 82f427422a Updated welcome to text to read something more friendly and useful John McLear 2011-03-26 18:48:38 +0000
  • 3b029b638d more css for users stuff John McLear 2011-03-26 18:45:35 +0000
  • 5558e23107 Commented out pad_chat.js John McLear 2011-03-26 18:44:30 +0000
  • 843a45f120 yet another readme update John McLear 2011-03-26 17:50:23 +0000
  • fc4ef5b430 Nice looking user demo css John McLear 2011-03-26 17:42:36 +0000
  • 5050491018 nice looking user demo John McLear 2011-03-26 17:42:19 +0000
  • 2c8a5987e4 Removed some uservoice and feedback chuf John McLear 2011-03-26 17:41:56 +0000
  • c66bce6461 Remove old css for displaying users and chat and add new css for new view John McLear 2011-03-26 17:17:13 +0000
  • 86eea91c22 Beginning of Users view John McLear 2011-03-26 17:16:43 +0000
  • 5170c29e18 Fix css href John McLear 2011-03-26 17:16:19 +0000
  • 1afc41d606 Fix minor css bug in embed part 2 John McLear 2011-03-26 16:04:07 +0000
  • 10417db768 Fix minor css bug in embed John McLear 2011-03-26 16:03:05 +0000
  • 8117834010 Embed JS John McLear 2011-03-26 16:00:04 +0000
  • c055fc387c Embed CSS changes John McLear 2011-03-26 15:56:40 +0000
  • be4a470f67 Add first bits of embed support John McLear 2011-03-26 15:37:35 +0000
  • bf15ebe073 Adding some documentation about easysync - Thx to Joe Corneli Peter 'Pita' Martischka 2011-03-26 15:32:25 +0000
  • 9aff551655 temporary embed image John McLear 2011-03-26 15:23:18 +0000