Peter 'Pita' Martischka
|
42662d73d0
|
Merge branch 'master' of /home/jose/etherpad-lite/
|
2011-08-20 18:23:58 +01:00 |
|
Peter 'Pita' Martischka
|
9d37d91ce1
|
added a colorPicker
|
2011-08-20 18:22:10 +01:00 |
|
Peter 'Pita' Martischka
|
a47ada46d7
|
forgot to change the default settings in Settings.js
|
2011-08-17 19:26:56 +01:00 |
|
Peter 'Pita' Martischka
|
3ec7dc224b
|
added a loglevel setting
|
2011-08-17 17:45:47 +01:00 |
|
Peter 'Pita' Martischka
|
1151ec3278
|
Merge branch 'api' of ../etherpad-lite.dev/
|
2011-08-16 17:22:15 +01:00 |
|
Peter 'Pita' Martischka
|
da7ddfb5d7
|
fixed #84 Import bug
|
2011-08-16 13:40:01 +01:00 |
|
Peter 'Pita' Martischka
|
b300dc1d2c
|
fixed merge conflicts
|
2011-08-13 22:18:42 +01:00 |
|
Peter 'Pita' Martischka
|
5252bee124
|
fixed abiword on windows
|
2011-08-13 13:02:27 +01:00 |
|
Peter 'Pita' Martischka
|
0e05e58c76
|
changed copyright from Peter 'Pita' Martischka to Peter 'Pita' Martischka (Primary Technology Ltd)
|
2011-08-11 15:27:16 +01:00 |
|
Peter 'Pita' Martischka
|
9cc3b543cc
|
Merge branch 'master' of git://github.com/Pita/etherpad-lite into api
|
2011-08-10 22:47:50 +01:00 |
|
Peter 'Pita' Martischka
|
0e4a54328a
|
fixed #61
|
2011-08-10 17:48:36 +01:00 |
|
Peter 'Pita' Martischka
|
dc10985ba3
|
beautify exporthtml
|
2011-08-10 17:31:20 +01:00 |
|
Peter 'Pita' Martischka
|
1a824bd130
|
Merge branch 'master' of .git into api
|
2011-08-09 11:08:27 +01:00 |
|
Peter 'Pita' Martischka
|
ce725ba6fc
|
Do not try to spawn a gzip process on windows
|
2011-08-04 13:42:02 +01:00 |
|
Peter 'Pita' Martischka
|
53242d4660
|
use abiword with abicommand under unix, spawn abiword processes under windows
|
2011-08-04 13:35:42 +01:00 |
|
Randy
|
e8d84b6058
|
Use abiword --to parameter instead of abicommand for document conversions.
|
2011-08-03 15:57:11 -07:00 |
|
Peter 'Pita' Martischka
|
39b5f57d4e
|
Let settings warnings output as warnings, not as an error
|
2011-08-03 19:30:45 +01:00 |
|
Peter 'Pita' Martischka
|
b30849c2f2
|
Installed log4js as logging framework
|
2011-07-31 18:25:51 +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
|
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 |