Commit graph

453 commits

Author SHA1 Message Date
Peter 'Pita' Martischka
e24b8ac93a Merge branch 'master' of ../etherpad-lite.devmaster 2011-08-15 16:01:30 +01:00
John McLear
7d1dbae5e5 Add pad.css and custom/pad.css availability into the iFrame as a fix for issue 83 2011-08-15 15:49:09 +01:00
John McLear
37224f620f Fix issue 82, bullets not showing up in time slider, please note that the timeslider may have other css bugs such as indent etc and this needs testing 2011-08-15 15:48:49 +01:00
Peter 'Pita' Martischka
37a220fa87 fixed opera bug thx @johnyma22 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka
793ef42704 added a error message for invalid padIDs 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka
0229217baf updated socket.io 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka
936a9985e1 use the temp enviroment variable for windows 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka
b49123230d added the dirty db file to gitignore 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka
da6caedb45 fixed abiword on windows 2011-08-15 15:45:28 +01:00
John McLear
10c2497fcc Allow cross site export 2011-08-14 14:47:41 +01:00
John McLear
db3ee19ced Added support for monospace font to be passed as a parameter in the URL 2011-08-13 22:10:58 +01:00
John McLear
4b77dd8c7a Beginning of a show chat history function 2011-08-13 21:59:12 +01:00
Peter 'Pita' Martischka
4730c3b46e added a error message for invalid padIDs 2011-08-13 20:20:30 +01:00
Peter 'Pita' Martischka
2b266ee82a updated socket.io 2011-08-13 20:06:38 +01:00
Peter 'Pita' Martischka
0384f677b9 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-08-13 19:54:16 +01:00
John McLear
bba9cd515b Added support for changing username from the URL ie ?userName=JohnMcLear -- doesnt urldecode etc. needs checking for vulnerabilities too 2011-08-13 19:53:02 +01:00
Peter 'Pita' Martischka
fd4bdeccb3 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-08-13 19:05:20 +01:00
John McLear
7f28889660 Removed my cake commit that I used as a placemarker 2011-08-13 18:38:00 +01:00
John McLear
8db0c12bbe Add support for removing line numbers using the jQuery API and stopped it publishing that change back if the param is set 2011-08-13 18:37:44 +01:00
Peter 'Pita' Martischka
3a77d96c98 use the temp enviroment variable for windows 2011-08-13 13:11:48 +01:00
Peter 'Pita' Martischka
7ff8814fd7 added the dirty db file to gitignore 2011-08-13 13:03:07 +01:00
Peter 'Pita' Martischka
5252bee124 fixed abiword on windows 2011-08-13 13:02:27 +01:00
John McLear
fb593c1d5c Began adding support for passing parameters via the URL and removed a location redirect that was no longer needed 2011-08-12 16:00:09 +01:00
Peter 'Pita' Martischka
a5b84f1b6e fixed readme markdown 2011-08-12 15:08:27 +01:00
Peter 'Pita' Martischka
8deb853be6 updated node for windows to 0.5.4 2011-08-12 15:03:01 +01:00
Peter 'Pita' Martischka
f808135201 added Windows installation instructions 2011-08-12 14:57:24 +01:00
Peter 'Pita' Martischka
53cdd893af added a buildForWindows script 2011-08-11 22:00:52 +01:00
Peter 'Pita' Martischka
38801fa3b2 added a ugly favicon, to motivate people creating a better one ;) 2011-08-11 15:16:26 +01:00
Peter 'Pita' Martischka
4b892ae4ff check node and npm version on install 2011-08-11 15:09:05 +01:00
Peter 'Pita' Martischka
39bc588ae7 Improved the readme a bit 2011-08-11 14:46:25 +01:00
Peter 'Pita' Martischka
3c46cce341 some small design changes 2011-08-10 18:26:12 +01:00
Peter 'Pita' Martischka
13c10013b9 do the chat resize without hiding the pad text 2011-08-10 18:18:50 +01:00
Peter 'Pita' Martischka
d812557445 fixed #73 2011-08-10 18:06:22 +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
33ec98dd35 beauty 2011-08-10 17:24:59 +01:00
Peter 'Pita' Martischka
c4ac1babe8 removed unused images 2011-08-10 17:23:38 +01:00
Peter 'Pita' Martischka
ba9861382e fixed the design 2011-08-10 17:19:23 +01:00
Peter 'Pita' Martischka
d66675914c Merge branch 'newDesignTest' of /home/jose/etherpad-lite.io/ into johnslayout 2011-08-10 16:19:02 +01:00
Peter 'Pita' Martischka
70f51ae660 Merge pull request #75 from snarkyMcSnark/patch-1
a few spelling mistakes
2011-08-09 14:48:23 -07:00
snarkyMcSnark
ff15820bd7 a few spelling mistakes 2011-08-09 16:44:33 -05:00
Peter 'Pita' Martischka
f5b06b0d25 Ops, fixed the folder remove 2011-08-09 11:14:09 +01:00
Peter 'Pita' Martischka
04ec7658e1 remove node_modules folder when the installation fails, prevents from broken dependencies 2011-08-09 10:58:43 +01:00
Peter 'Pita' Martischka
30f00a530e replaced wget with curl 2011-08-09 10:54:55 +01:00
Peter 'Pita' Martischka
af9c09a93a updated dependencies, including socket.io and ueberDB 2011-08-08 20:19:16 +01:00
Peter 'Pita' Martischka
97382e365c Improved the README 2011-08-04 20:33:39 +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
5b5230b28c Merge pull request #65 from garrett/master
Fixing issue #64
2011-08-03 14:22:53 -07:00