Commit Graph

1374 Commits

Author SHA1 Message Date
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 a72d68a4fe 'Reconnect Now' does now a proper reconnect 2011-05-19 22:27:17 +01:00
Peter 'Pita' Martischka 42dfb31cf8 Restored the errorlog function, fixes a bug 2011-05-19 22:22:12 +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
Peter 'Pita' Martischka b0a937d8de Allow comments in the settings file 2011-05-19 14:30:08 +01:00
Peter 'Pita' Martischka 9849e81e08 Added a .npmignore for smaller npm packages 2011-05-19 13:17:24 +01:00
Peter 'Pita' Martischka b18cd7bb10 Update UeberDB dependency to the next version 2011-05-19 13:15:33 +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 18d598fcd4 Add Joose to package.json 2011-05-16 16:36: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
Hans Pinckaers 7fb631b922 fixed color picker for firefox 4. 2011-05-16 14:15:06 +02:00
Peter 'Pita' Martischka b1997a11c9 Authordata is now saved to the database 2011-05-16 13:10:53 +01:00
Peter 'Pita' Martischka fa6641a368 Update ueberDB dependency 2011-05-14 21:57:30 +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 0c6296c516 Added a var folder for the sqlite db 2011-05-14 17:49:47 +01:00
Peter 'Pita' Martischka 6de78d6b40 Add ueberDB to dependencies 2011-05-14 17:45:15 +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 7c4502951a Remind users to install it globaly 2011-05-13 15:57:27 +01:00
Peter 'Pita' Martischka d0da998299 removed debug message 2011-05-13 15:53:20 +01:00
Peter 'Pita' Martischka b4ca337020 Change in the project directory before starting server.js, solves a problem with npm 2011-05-13 15:52:07 +01:00
Peter 'Pita' Martischka 8233d6381b update README, installation instructions are now with npm 2011-05-08 19:24:23 +01:00
Peter 'Pita' Martischka 6e7b0b0a9c Added a package.json, now installable via 'npm ep-lite' and startable via 'ep-lite'. Fixed #6 2011-05-08 19:10:42 +01:00
Peter 'Pita' Martischka d003aaad44 remove test file 2011-05-08 18:48:24 +01:00
Peter 'Pita' Martischka 16442e8202 testcommit 2011-05-08 18:35:10 +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 036417d549 Merge git://github.com/HansPinckaers/etherpad-lite 2011-05-08 18:17:10 +01:00
Peter 'Pita' Martischka fc1111b097 Add mailinglist and irc channel info to the readme 2011-05-08 17:44:12 +01:00
Pita e9b3a17699 Merge pull request #8 from guybrush/master.
add viewfontmenu
2011-04-30 06:38:29 -07: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
Peter 'Pita' Martischka 312a923a28 Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite 2011-04-08 12:48:21 +01: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 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
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
Lukas Martini debbced185 Fixing scripts to run from both bin/ and /. 2011-04-07 19:54:41 +02:00
Lukas Martini de967c1cd5 Revert "Adding Makefile for easier execution"
This reverts commit fed33e76fa.
2011-04-07 19:51:18 +02:00
Lukas Martini 81e13700ed Merge branch 'master' of github.com:lutoma/etherpad-lite 2011-04-07 19:43:19 +02:00