Commit graph

883 commits

Author SHA1 Message Date
Thomas Frössman
8223f84714 Kind of a hack but makes issue #158 go away.
There is probably a deeper error somewhere in either log4js or express, I don't have the time to investigate that atm.
2011-10-17 23:31:39 +02:00
John McLear
fb158d2eb8 Merge pull request #155 from johnyma22/master
Can pass a parameter to disable author Colors.
2011-09-30 05:20:34 -07:00
Peter 'Pita' Martischka
b6211ee6a5 Merge pull request #174 from rspeer/master
Fix to globalPads -- resolves issue #160
2011-09-30 01:50:20 -07:00
Rob Speer
2d3272e3b6 make globalPads into an ad-hoc Object that can store values with arbitrary names. Fixes issue #160. 2011-09-30 00:41:46 -04:00
Peter 'Pita' Martischka
7e05b55156 Merge pull request #170 from dsmedia/patch-1
added "build-essential" to list of Ubuntu package dependencies for instal
2011-09-23 11:23:32 -07:00
dsmedia
46d85a1247 added "build-essential" to list of Ubuntu package dependencies for installing. 2011-09-23 13:20:05 -05:00
John McLear
1bfd0e4707 Allow authorship background colors to be disabled with a parameter 2011-09-04 13:48:53 +01:00
John McLear
ecd486e440 Merge pull request #152 from chapel/main
fix username being set in querystrings
2011-09-02 15:45:35 -07:00
Jacob Chapel
a107f080a8 fix username being set in querystrings 2011-09-02 12:56:51 -07:00
Peter 'Pita' Martischka
4d76ccde06 Merge pull request #149 from adrianlang/master
Fix RegExp
2011-09-01 14:51:59 -07:00
Adrian Lang
7557af3db7 Fix directory traversal fixing RegExp 2011-09-01 23:49:52 +02:00
Peter 'Pita' Martischka
a1a1017bfe Merge pull request #148 from adrianlang/master
Fix directory traversal
2011-09-01 14:36:23 -07:00
Adrian Lang
86d3b2ba81 Fix directory traversal
See https://ada.adrianlang.de/etherpad-lite-directory-traversal
2011-09-01 23:27:18 +02:00
Peter 'Pita' Martischka
7e4bba0e31 started a changelog 2011-08-23 18:59:32 +01:00
Peter 'Pita' Martischka
7b8d48467f added proper embed parameter support, fixes #116 2011-08-23 18:36:38 +01:00
Peter 'Pita' Martischka
f571ed3554 updated ueberDB 2011-08-23 18:15:03 +01:00
Peter 'Pita' Martischka
0523ffe3bd Improved the README 2011-08-23 17:56:54 +01:00
Robin Buse
335643a860 ODT Import works but wasn't mentioned yet 2011-08-24 05:22:46 +03:00
Robin Buse
fd97946619 fixed user drop down issue 2011-08-24 04:48:21 +03:00
Peter 'Pita' Martischka
8ec71a3225 updated version to 1.0.0 2011-08-22 13:25:42 +01:00
Peter 'Pita' Martischka
913c3c455d fixed merge conflicts 2011-08-22 13:14:59 +01:00
Peter 'Pita' Martischka
e771542961 added deleteGroup API function 2011-08-22 13:11:34 +01:00
Peter 'Pita' Martischka
e79f29f67d removed 'planed' from the database documentation 2011-08-21 20:49:07 +01:00
Peter 'Pita' Martischka
a231ff45e1 fixed fileupload field in Firefox 2011-08-21 20:17:38 +01:00
Peter 'Pita' Martischka
124bc4be03 updated dependencies 2011-08-21 20:13:53 +01:00
Peter 'Pita' Martischka
177abdd29e Don't show PDF Export on Windows 2011-08-21 20:09:25 +01:00
Peter 'Pita' Martischka
8c301d4fe8 remove star buttons on timeslider 2011-08-21 20:09:09 +01:00
Peter 'Pita' Martischka
8d12c3d7ee added a link to the bugtracker 2011-08-21 19:52:24 +01:00
Peter 'Pita' Martischka
d85eeee5f4 check pad access on read only 2011-08-21 19:43:42 +01:00
Peter 'Pita' Martischka
4e592def7e fixed color chooser 2011-08-21 19:27:02 +01:00
John McLear
c1272ed566 Fixed minor German effort at English ;) 2011-08-21 19:21:23 +01:00
Peter 'Pita' Martischka
307d0acdeb put expolorer canvas into minify 2011-08-21 19:20:18 +01:00
John McLear
1df9d04e04 Fix for farbtastic in IE9, I had to recreate the file because the original commit was so messy 2011-08-21 19:08:19 +01:00
Peter 'Pita' Martischka
0b18e46bc3 keep the userlist open while editing 2011-08-21 19:07:35 +01:00
Peter 'Pita' Martischka
4f233d88f8 fixed the backward compatility to old colorIds 2011-08-21 18:53:30 +01:00
Peter 'Pita' Martischka
6c354c6333 improved the design of the user icon 2011-08-21 18:18:35 +01:00
Peter 'Pita' Martischka
354d8fa82d Improved the README 2011-08-21 17:58:12 +01:00
Peter 'Pita' Martischka
0260a742bc Improved the README 2011-08-21 17:23:04 +01:00
Peter 'Pita' Martischka
e4af96e67b removed unnecessary stuff from convertSettings 2011-08-21 16:51:08 +01:00
Peter 'Pita' Martischka
070b5f16f7 added the default embed parameters to the embed code 2011-08-21 16:44:38 +01:00
Peter 'Pita' Martischka
6efaf69157 Merge pull request #108 from 0ip/patch-1
Adjusted recent colorPicker changes to fit our design guidelines
2011-08-20 12:48:04 -07:00
Robin Buse
82e4d7fe7d Edited static/css/pad.css via GitHub 2011-08-21 09:45:05 +03:00
Peter 'Pita' Martischka
4d7c8a2c7d added ability to set a custom favicon 2011-08-20 19:27:41 +01:00
Peter 'Pita' Martischka
fdeb2a45e7 Ops, forgot to replace two throws 2011-08-20 18:56:38 +01:00
Peter 'Pita' Martischka
b9f23fa208 handle bad changesets 2011-08-20 18:51:43 +01:00
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
c365bc9522 updated ueberDB 2011-08-19 23:23:18 +01:00
Peter 'Pita' Martischka
3c6ca617f6 show git version on start 2011-08-19 22:01:33 +01:00
Peter 'Pita' Martischka
b9c1b45a8b added utf8 to content type of api responses, thx @0ip 2011-08-19 21:57:15 +01:00