libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
719 commits 2 branches 0 tags 24 MiB
Commit graph

351 commits

Author SHA1 Message Date
John McLear
d5e303ec9f Follow Link in Pad - https://github.com/Pita/etherpad-lite/issues/143 -- Note that this only supports links beginning in www. We also support https:// etc. so we should encourage users to properly urls. For example: beta.etherpad.org would not be detected by this. 2011-11-19 19:19:33 +00:00
Lorenzo Gil Sanchez
fd056cf09c Adapt client code for its use in the server 2011-11-17 10:26:23 +01:00
Peter 'Pita' Martischka
fa9b36df0f Merge pull request #203 from andrehjr/issue187 
Fix issue # 187 Pad forgets usernames often
 2011-11-15 23:11:55 -08:00
andrehjr
8e7e74170e Extract getUrlVars() function calls to a local var 2011-11-15 21:36:26 -02:00
andrehjr
ce4d9df665 Fix issue #182: Pad forgets usernames 2011-11-15 21:33:43 -02:00
John McLear
dac828e8f6 Update static/index.html 2011-11-13 14:32:21 +00:00
John McLear
eecb45cbfd Focus on input box onLoad 2011-11-12 18:30:38 +00:00
John McLear
bf0fe9377d Input fix for Wikinaut 2011-11-06 12:06:16 +00:00
John McLear
1bfd0e4707 Allow authorship background colors to be disabled with a parameter 2011-09-04 13:48:53 +01:00
Jacob Chapel
a107f080a8 fix username being set in querystrings 2011-09-02 12:56:51 -07:00
Peter 'Pita' Martischka
7b8d48467f added proper embed parameter support, fixes #116 2011-08-23 18:36:38 +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
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
a231ff45e1 fixed fileupload field in Firefox 2011-08-21 20:17:38 +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
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
070b5f16f7 added the default embed parameters to the embed code 2011-08-21 16:44:38 +01:00
Robin Buse
82e4d7fe7d Edited static/css/pad.css via GitHub 2011-08-21 09:45:05 +03: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
8214e132b7 Merge branch 'patch-6' of git://github.com/0ip/etherpad-lite 2011-08-18 21:05:44 +01:00
Peter 'Pita' Martischka
71c6e494d5 fixed the buttons, the now fully clickable (someone has to test that with IE) 2011-08-18 12:16:00 +01:00
Peter 'Pita' Martischka
cb23b140d6 Merge pull request #87 from 0ip/patch-1 
Redesigned start page
 2011-08-17 12:27:17 -07:00
Peter 'Pita' Martischka
b02ee510ac Merge branch 'patch-3' of https://github.com/0ip/etherpad-lite 2011-08-17 19:58:37 +01:00
Robin Buse
d3a33024ec reverted js functions but reduced if clause using ternary operation 2011-08-17 21:58:07 +03:00
Peter 'Pita' Martischka
c8a0f946f2 Merge branch 'patch-4' of https://github.com/0ip/etherpad-lite 2011-08-17 19:43:39 +01:00
Peter 'Pita' Martischka
c7f3b3d9ec Merge branch 'patch-2' of https://github.com/0ip/etherpad-lite 2011-08-17 19:36:56 +01:00
Peter 'Pita' Martischka
c2457e06d8 send client side javascript errors to the server 2011-08-17 19:24:44 +01:00
Peter 'Pita' Martischka
84f1baf972 fixed a small css bug at the disconnect message 2011-08-17 18:11:36 +01:00
Robin Buse
58ea0d0ed3 changed .gif to .png 2011-08-17 19:14:43 +03:00
Robin Buse
06037dcb8e added transparent icons 2011-08-16 22:59:17 +02:00
Robin Buse
d4b713d236 colorized the return link and removed some odd stuff 2011-08-16 23:49:52 +03:00
Robin Buse
ac0dff0c2c height @ #editbar ul is redundant && removed some space 2011-08-16 23:44:43 +03:00
Robin Buse
6f7a9ce77a Redesigned pad editbar + chatbox (bg color) 2011-08-16 23:40:07 +03:00
Robin Buse
47a16ddbe2 QR code support (js) 2011-08-16 23:34:05 +03:00
Robin Buse
6d47a00f29 QR code support (html) 2011-08-16 23:31:41 +03:00
John McLear
5d30c8b4a5 Peter will hate this but I extended Etherpad to support 64 colors and removed the requirements for a background image on the colorpicker dialogue 2011-08-16 21:29:51 +01:00
Robin Buse
4aeb76cdac Reworked the start page (brighter, added top bar, font on Windows sharper), fixed some padding bugs (firefox) and compressed the js 2011-08-16 23:25:42 +03:00
Peter 'Pita' Martischka
d2c502e2be added deletePad API function 2011-08-16 20:02:30 +01:00
Peter 'Pita' Martischka
3ff34f50d1 added a security control at socketiorouter, pad security is now fully enforced 2011-08-16 15:53:09 +01:00
Peter 'Pita' Martischka
48980f9e19 Show permission messages on the browser side 2011-08-15 18:27:11 +01:00
Peter 'Pita' Martischka
255dc5a325 fixed merge conflicts 2011-08-15 16:58:22 +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
b300dc1d2c fixed merge conflicts 2011-08-13 22:18:42 +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
Peter 'Pita' Martischka
d0e378f63a added a security manager to control pad access on group pads 2011-08-13 22:07:21 +01:00
John McLear
4b77dd8c7a Beginning of a show chat history function 2011-08-13 21:59:12 +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
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
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
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
38801fa3b2 added a ugly favicon, to motivate people creating a better one ;) 2011-08-11 15:16:26 +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
ce1012438e added setPublicStatus, getPublicStatus, setPassword and isPasswordProtected 2011-08-10 22:44:16 +01:00
Peter 'Pita' Martischka
dc15682a27 changed name of getMapped*4 functions to create*IfNotExistsFor 2011-08-10 22:43:38 +01:00
Peter 'Pita' Martischka
578f8db311 improved test.html 2011-08-10 22:43:29 +01:00
Randy
9f530962ee Add js tests to assist with api development 2011-08-10 22:43:20 +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
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
1a824bd130 Merge branch 'master' of .git into api 2011-08-09 11:08:27 +01:00
Peter 'Pita' Martischka
178b4a95ec added getMappedGroup4 and createGroup 2011-08-08 16:21:31 +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
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
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
de32503f8e improve including of custom js/css 2011-07-31 17:21:01 +01:00
Peter 'Pita' Martischka
bcaadfa6eb Ensure the browser doesn't send socket.io message with the browser version 2011-07-31 16:13:56 +01:00
Peter 'Pita' Martischka
aa5b1b85ae fixed all random string functions 2011-07-31 11:48:06 +01:00
Robin Buse
64b4ff3fb1 poor Y and j... :) 2011-07-31 01:58:46 +03:00
Peter 'Pita' Martischka
a47b5ab458 added the ability to add costum js/css 2011-07-30 16:33:35 +01:00