Peter 'Pita' Martischka
|
5da30a40bf
|
changed content type of api responses to application/json
|
2011-08-16 20:06:59 +01:00 |
|
Peter 'Pita' Martischka
|
d2c502e2be
|
added deletePad API function
|
2011-08-16 20:02:30 +01:00 |
|
Peter 'Pita' Martischka
|
783c192726
|
ensure password and publicStatus functions are only used with group pads
|
2011-08-16 18:17:46 +01:00 |
|
Peter 'Pita' Martischka
|
1151ec3278
|
Merge branch 'api' of ../etherpad-lite.dev/
|
2011-08-16 17:22:15 +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
|
da7ddfb5d7
|
fixed #84 Import bug
|
2011-08-16 13:40:01 +01:00 |
|
Peter 'Pita' Martischka
|
317370da2c
|
restricted access to pad import and export
|
2011-08-15 22:20:37 +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 |
|
Peter 'Pita' Martischka
|
e24b8ac93a
|
Merge branch 'master' of ../etherpad-lite.devmaster
|
2011-08-15 16:01:30 +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
|
793ef42704
|
added a error message for invalid padIDs
|
2011-08-15 15:45:28 +01:00 |
|
Peter 'Pita' Martischka
|
0229217baf
|
updated socket.io
|
2011-08-15 15:45:28 +01:00 |
|
Peter 'Pita' Martischka
|
936a9985e1
|
use the temp enviroment variable for windows
|
2011-08-15 15:45:28 +01:00 |
|
Peter 'Pita' Martischka
|
b49123230d
|
added the dirty db file to gitignore
|
2011-08-15 15:45:28 +01:00 |
|
Peter 'Pita' Martischka
|
da6caedb45
|
fixed abiword on windows
|
2011-08-15 15:45:28 +01:00 |
|
John McLear
|
10c2497fcc
|
Allow cross site export
|
2011-08-14 14:47:41 +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 |
|
Peter 'Pita' Martischka
|
4730c3b46e
|
added a error message for invalid padIDs
|
2011-08-13 20:20:30 +01:00 |
|
Peter 'Pita' Martischka
|
2b266ee82a
|
updated socket.io
|
2011-08-13 20:06:38 +01:00 |
|
Peter 'Pita' Martischka
|
0384f677b9
|
Merge branch 'master' of /home/jose/etherpad-lite/
|
2011-08-13 19:54:16 +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 |
|
Peter 'Pita' Martischka
|
fd4bdeccb3
|
Merge branch 'master' of /home/jose/etherpad-lite/
|
2011-08-13 19:05:20 +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 |
|
Peter 'Pita' Martischka
|
3c99e07030
|
fixed regular expression PadID check
|
2011-08-13 17:48:36 +01:00 |
|
Peter 'Pita' Martischka
|
3a77d96c98
|
use the temp enviroment variable for windows
|
2011-08-13 13:11:48 +01:00 |
|
Peter 'Pita' Martischka
|
7ff8814fd7
|
added the dirty db file to gitignore
|
2011-08-13 13:03:07 +01:00 |
|
Peter 'Pita' Martischka
|
5252bee124
|
fixed abiword on windows
|
2011-08-13 13:02:27 +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
|
a5b84f1b6e
|
fixed readme markdown
|
2011-08-12 15:08:27 +01:00 |
|
Peter 'Pita' Martischka
|
8deb853be6
|
updated node for windows to 0.5.4
|
2011-08-12 15:03:01 +01:00 |
|
Peter 'Pita' Martischka
|
f808135201
|
added Windows installation instructions
|
2011-08-12 14:57:24 +01:00 |
|
Peter 'Pita' Martischka
|
53cdd893af
|
added a buildForWindows script
|
2011-08-11 22:00:52 +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
|
4b892ae4ff
|
check node and npm version on install
|
2011-08-11 15:09:05 +01:00 |
|
Peter 'Pita' Martischka
|
39bc588ae7
|
Improved the readme a bit
|
2011-08-11 14:46:25 +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
|
292c68a0a5
|
harmonize different ID types, improved the prefixes
|
2011-08-10 22:44:08 +01:00 |
|
Peter 'Pita' Martischka
|
f6b87daa27
|
added deleteSession
|
2011-08-10 22:43:58 +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 |