Commit graph

421 commits

Author SHA1 Message Date
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
Garrett LeSage
d0addfddb3 spelling fixes in the shell scripts 2011-08-03 23:18:12 +02:00
Garrett LeSage
c984f496c2 fixed issue # 64, making the shell scripts more portable (for OS X) 2011-08-03 23:08:27 +02:00
Peter 'Pita' Martischka
e510f567b9 Merge pull request #57 from 0ip/patch-3
Removed unnecessary comments, etc.
2011-08-02 14:30:12 -07:00
Peter 'Pita' Martischka
051589ed47 Allow starting as root after input a silly prompt 2011-08-02 22:28:17 +01:00
Peter 'Pita' Martischka
fe5bcabddf Improved the README 2011-08-02 22:15:59 +01:00
Peter 'Pita' Martischka
33b5dcff2b updated ueberDB to 0.0.13 2011-08-02 17:17:02 +01:00
Robin Buse
15bf4b9313 Edited static/index.html via GitHub 2011-08-02 15:06:09 +03:00
Robin Buse
17472a7270 Removed unnecessary comments, changed label class to id and moved the custom js to the appropriate place 2011-08-02 14:56:55 +03:00
John McLear
143369b387 Merge branch 'master' of git://github.com/Pita/etherpad-lite into newDesignTest 2011-08-01 23:13:51 +01:00
John McLear
ab2c8fadf1 Fix button alignment issues making the butotns prettier after I made them 1px out in places 2011-08-01 20:01:41 +01:00
Peter 'Pita' Martischka
8ca57ffde4 Added READMEs to explain the doc folders 2011-08-01 19:29:22 +01:00
Peter 'Pita' Martischka
91347a3528 Improved the README 2011-08-01 19:24:11 +01:00
Peter 'Pita' Martischka
9a71cc4729 replaced tabs with spaces 2011-08-01 18:45:28 +01:00
John McLear
9911fb95b9 fixed merge confilcts in pad.html 2011-08-01 13:20:05 +01:00
Peter 'Pita' Martischka
053e48c3f4 Secure the call of the costumStart function
Author: Peter 'Pita' Martischka <petermartischka@googlemail.com>
2011-08-01 12:09:33 +01:00
Peter 'Pita' Martischka
38fd56a877 bugfix bugfix 2011-07-31 20:32:46 +01:00
John McLear
03192c1b9a Fix the styling of the chat vdraggie 2011-07-31 20:16:59 +01:00
John McLear
4d4773c1f3 Fix CSS and HTML bugs with new sprites 2011-07-31 20:07:18 +01:00
John McLear
1d62de9acf Updated CSS for sprites 2011-07-31 19:41:54 +01:00
John McLear
92377613d7 First version of working sprites -- Still some work to do such as changing export icons to use the latest .gif but this is good start 2011-07-31 19:41:42 +01:00
Peter 'Pita' Martischka
8101b7df92 Changed the gitignore so everything exept the template files are ignored 2011-07-31 19:39:14 +01:00
Peter 'Pita' Martischka
c8d89e9147 added some forgotten ids 2011-07-31 19:32:35 +01:00
John McLear
d4ffbdcc1c Add a new class for buttonicon which specifies the new backghround image, this is part of the single image thing Peter wants to reduce the number of images we need 2011-07-31 19:11:55 +01:00
John McLear
7b69f3d7ed New icons file, updated timeslider and resize image 2011-07-31 19:08:14 +01:00
John McLear
3a4c0ea254 Remvoed maximize button -- I never liked this.. 2011-07-31 18:53:03 +01:00
John McLear
20bb067743 removed old background image 2011-07-31 18:52:35 +01:00
John McLear
16c9bf6130 removed old pad top image that is no logner used 2011-07-31 18:52:17 +01:00
Peter 'Pita' Martischka
b30849c2f2 Installed log4js as logging framework 2011-07-31 18:25:51 +01:00
Peter 'Pita' Martischka
22b00264d8 Ops, looks like I messed up installDeps.sh 2011-07-31 17:37:50 +01:00
Peter 'Pita' Martischka
de32503f8e improve including of custom js/css 2011-07-31 17:21:01 +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