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

4085 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter 'Pita' Martischka
3c6ca617f6 show git version on start 2011-08-19 22:01:33 +01:00
Peter 'Pita' Martischka
b9c1b45a8b added utf8 to content type of api responses, thx @0ip 2011-08-19 21:57:15 +01:00
Peter 'Pita' Martischka
82dd4802d7 fixed a API Bug 2011-08-19 21:35:31 +01:00
Peter 'Pita' Martischka
caecfd3997 PITA, Y U NO TEST? 2011-08-18 21:29:34 +01:00
Peter 'Pita' Martischka
5fc2f95a9f looks like buildForWindows was not executable anymore, don't know how that happend 2011-08-18 21:17:54 +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
Robin Buse
80c9f8ae8f typo fix :) 2011-08-19 03:06:29 +03:00
Peter 'Pita' Martischka
ef6a75ca54 don't do a graceful shutdown on SIGINT on windows 2011-08-18 21:02:54 +01:00
Peter 'Pita' Martischka
dd4c8dc3aa added a convert script from old etherpad to etherpad lite, instructions will follow 2011-08-18 20:58:56 +01:00
Peter 'Pita' Martischka
ad1e8fb4f8 limit the graceful shutdown time to 3 seconds 2011-08-18 20:54:04 +01:00
Peter 'Pita' Martischka
2dd82f82de since we set a global lock level, we can log socket.io debug messages 2011-08-18 13:40:30 +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
4554c32e64 show the last 100 chat messages, instead of the last 20 2011-08-17 20:04:28 +01: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
a47ada46d7 forgot to change the default settings in Settings.js 2011-08-17 19:26: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
b58bdb4e4d support jsonp api calls 2011-08-17 18:24:14 +01:00
Peter 'Pita' Martischka
84f1baf972 fixed a small css bug at the disconnect message 2011-08-17 18:11:36 +01:00
Peter 'Pita' Martischka
a34e482a8a changed ep-lite etherpad-lite in package.json 2011-08-17 17:49:38 +01:00
Peter 'Pita' Martischka
41883e688b moved require joose to the correct place 2011-08-17 17:49:05 +01:00
Peter 'Pita' Martischka
3ec7dc224b added a loglevel setting 2011-08-17 17:45:47 +01:00
Peter 'Pita' Martischka
77ba4e3e6c ensure wrong socketio messages doesn't kill the server 2011-08-17 17:28:30 +01:00
Robin Buse
58ea0d0ed3 changed .gif to .png 2011-08-17 19:14:43 +03:00
Peter 'Pita' Martischka
296777ab53 added a graceful shutdown 2011-08-17 15:58:42 +01:00
Peter 'Pita' Martischka
4a803cc543 removed npmignore 2011-08-17 12:30:52 +01:00
Peter 'Pita' Martischka
95b1ac9393 removed sqlite dependency and made dirty the default db 2011-08-17 12:30:35 +01: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
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