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
|
070b5f16f7
|
added the default embed parameters to the embed code
|
2011-08-21 16:44:38 +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
|
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 |
|
Robin Buse
|
47a16ddbe2
|
QR code support (js)
|
2011-08-16 23:34:05 +03:00 |
|
Peter 'Pita' Martischka
|
d2c502e2be
|
added deletePad API function
|
2011-08-16 20:02:30 +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 |
|
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
|
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
|
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
|
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 |
|
Peter 'Pita' Martischka
|
115f7d6b51
|
Fixed the iframe problems
|
2011-07-27 15:11:30 +01:00 |
|
Peter 'Pita' Martischka
|
e96595896c
|
Fixed wordle export under https
|
2011-07-27 13:35:22 +01:00 |
|
Peter 'Pita' Martischka
|
6867d881b1
|
Hide import/export options that are not avaiable if abiword isn't configured
|
2011-07-26 18:54:42 +01:00 |
|
Peter 'Pita' Martischka
|
b43c7e7c99
|
ensure non url chars are not used for pad names or pad links
|
2011-07-26 16:17:02 +01:00 |
|
Peter 'Pita' Martischka
|
eb40c014b6
|
Fixed the NaN Bug on timeslider
|
2011-07-25 17:26:56 +01:00 |
|
Peter 'Pita' Martischka
|
e9a389b0a6
|
improved minifying
|
2011-07-25 14:38:54 +01:00 |
|
Peter 'Pita' Martischka
|
3ccdcec7e8
|
ensure we don't send a handshake on every reconnect
|
2011-07-22 14:17:58 +01:00 |
|
Peter 'Pita' Martischka
|
a717e07531
|
Moved John's code to the correct place
|
2011-07-22 14:07:13 +01:00 |
|
Peter 'Pita' Martischka
|
b13fbbfd73
|
Import works now on the server side
|
2011-07-21 20:13:58 +01:00 |
|
John McLear
|
4b268f9579
|
Make a pulsating chat notification and remove the throb from the tab
|
2011-07-20 21:50:58 +01:00 |
|
John McLear
|
2920c35c0f
|
Now import/Export works
|
2011-07-20 17:33:27 +01:00 |
|
John McLear
|
43508a32a3
|
Ensure the last chat comment is always in focus after resize
|
2011-07-20 17:23:01 +01:00 |
|
John McLear
|
4f06d4688f
|
Add wordle support, temporary, Pita to move
|
2011-07-20 16:38:03 +01:00 |
|
John McLear
|
802866a5da
|
Open link in new window file
|
2011-07-20 16:01:26 +01:00 |
|
John McLear
|
77dc7ede14
|
change end points to right export endpoint
|
2011-07-20 15:48:24 +01:00 |
|
John McLear
|
50c6b9de00
|
Temporary code that brings in some export support
|
2011-07-20 15:42:47 +01:00 |
|
John McLear
|
a07bd76625
|
Final major add for working buttons in IE
|
2011-07-19 20:04:36 +01:00 |
|
John McLear
|
e7b690c7fc
|
Make the chat work in IE
|
2011-07-19 20:04:24 +01:00 |
|
John McLear
|
9f966e0035
|
Make CSS more comprehendable by mear mortals.
|
2011-07-19 20:03:40 +01:00 |