GitHub Merge Button
|
e05ec2fbf7
|
Merge e88805ee62 into 1151ec3278
|
2011-08-16 09:36:46 -07:00 |
|
Robin Buse
|
e88805ee62
|
Edited static/css/pad.css via GitHub
|
2011-08-16 18:57:18 +03:00 |
|
Robin Buse
|
0c6dc02bd0
|
Edited static/css/pad.css via GitHub
|
2011-08-16 18:55:32 +03:00 |
|
Robin Buse
|
35cc74df27
|
Combined border-radius and styled the webkit scrollbar
|
2011-08-16 18:50:03 +03: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 |
|
Robin Buse
|
4f4c15bb07
|
fixed QR code content
|
2011-08-16 16:28:21 +03:00 |
|
Robin Buse
|
563d2cae20
|
fixed QR code API url
|
2011-08-16 16:24:30 +03:00 |
|
Robin Buse
|
904838ca3a
|
QR code position fixed
|
2011-08-16 16:23:58 +03:00 |
|
Robin Buse
|
8d0230bed5
|
Edited static/js/pad_editbar.js via GitHub
|
2011-08-16 16:15:36 +03:00 |
|
Robin Buse
|
1b4e4bc48f
|
Edited static/pad.html via GitHub
|
2011-08-16 16:12:01 +03:00 |
|
Robin Buse
|
0c95d4a751
|
added qr code placeholder
|
2011-08-16 16:05:36 +03:00 |
|
Robin Buse
|
f6490d7153
|
added export qr code (js)
|
2011-08-16 16:03:30 +03:00 |
|
Robin Buse
|
30a49b2151
|
Edited static/css/pad.css via GitHub
|
2011-08-16 15:10:46 +03:00 |
|
Robin Buse
|
485003f31e
|
hover > active...
|
2011-08-16 14:59:41 +03:00 |
|
Robin Buse
|
8c0b4bd43a
|
button hover effect
|
2011-08-16 14:57:55 +03:00 |
|
Robin Buse
|
7a8c3a31ea
|
typo
|
2011-08-16 14:52:45 +03:00 |
|
Robin Buse
|
3ffd2025a5
|
Edited static/index.html via GitHub
|
2011-08-16 14:50:17 +03:00 |
|
Robin Buse
|
183185f702
|
Edited static/index.html via GitHub
|
2011-08-16 14:39:55 +03:00 |
|
Robin Buse
|
21c0335737
|
compatibility fix
|
2011-08-16 14:31:37 +03:00 |
|
Robin Buse
|
a9f1d27267
|
forgot to change css file..
|
2011-08-16 02:15:03 +03:00 |
|
ether
|
0c5e4d89e5
|
transparent png css
|
2011-08-16 01:12:57 +02:00 |
|
ether
|
7af1aa99c8
|
transparent png
|
2011-08-16 01:08:56 +02:00 |
|
Robin Buse
|
e433926d2f
|
beautified code, removed unnecessary stuff and changed the color scheme a bit
|
2011-08-16 01:54:45 +03:00 |
|
Robin Buse
|
9bc5764720
|
changed 'return to pad' color
|
2011-08-16 01:47:30 +03:00 |
|
Robin Buse
|
f8c5db6fc4
|
compressed js, redesigned custom pad form and added top bar
|
2011-08-16 01:45:01 +03: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 |
|