mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-04 14:19:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
518 commits 219 branches 107 tags 76 MiB
Commit graph

518 commits

This branch
This branch
All branches
Author SHA1 Message Date
GitHub Merge Button
e05ec2fbf7 Merge e88805ee62 into 1151ec3278 2011-08-16 09:36:46 -07:00
Peter 'Pita' Martischka
1151ec3278 Merge branch 'api' of ../etherpad-lite.dev/ 2011-08-16 17:22:15 +01: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
Peter 'Pita' Martischka
da7ddfb5d7 fixed #84 Import bug 2011-08-16 13:40:01 +01: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
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