Commit graph

  • ae73b1101a improved handling of document.referrer in timeslider.html: if a referrer with a pad-url is given (/p/*) use this referrer for the Return to pad link, if not use a substring of document.location Kai Hermann 2011-08-30 16:47:16 +0200
  • 3ae5caab85 Merge 7d8844ce99 into 0d2036ba73 GitHub Merge Button 2011-08-30 03:10:56 -0700
  • 7d8844ce99 Capitalize monospace button tooltip to match others. Tapio Vierros 2011-08-30 10:08:21 +0300
  • ced79fe867 don't use document.referrer to return to the pad from the timeslider, this breaks if you reload the page. better: use a substring of document.location.href Kai Hermann 2011-08-30 01:51:47 +0200
  • cfc315a4a6 fix url escaping in timeslider Kai Hermann 2011-08-29 23:10:18 +0200
  • 95f1992e4d basic support for cloudfoundry. Andrew Liu 2011-08-24 21:59:50 +0800
  • 0d2036ba73 uploading new png...... Robin Buse 2011-08-27 13:50:13 +0200
  • a01b62a200 hopefully it works now Robin Buse 2011-08-27 13:48:02 +0200
  • 669ea67e08 Some new UI icons and a start for the settings menu Robin Buse 2011-08-27 13:45:43 +0200
  • 96b776384a fixed a translate bug Peter 'Pita' Martischka 2011-08-26 20:45:08 +0100
  • f647d597ad made the default pad text translatable Peter 'Pita' Martischka 2011-08-26 20:09:08 +0100
  • 3417dd1dd4 added the translation for the monospace button Peter 'Pita' Martischka 2011-08-26 19:48:15 +0100
  • 74153484aa Fixed english language Peter 'Pita' Martischka 2011-08-26 19:47:54 +0100
  • d23984f028 Merge git://github.com/themasch/etherpad-lite into develop Peter 'Pita' Martischka 2011-08-26 19:06:45 +0100
  • 839db813f6 Finished translation infrastructure Peter 'Pita' Martischka 2011-08-26 19:05:35 +0100
  • 419d2bbd93 added a button to toggle the font Mark Schmale 2011-08-26 16:19:23 +0200
  • 93f5ea141b Merge ded9825097 into 7e4bba0e31 GitHub Merge Button 2011-08-26 06:36:37 -0700
  • ded9825097 Removed try/catch/finally and idleWorkTimer Hans Pinckaers 2011-08-25 15:57:08 +0200
  • 1ad95263cd Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite Peter 'Pita' Martischka 2011-08-24 18:38:14 +0100
  • 8cceeefa05 Added basic support for translating, so far only on pad.html Peter 'Pita' Martischka 2011-08-24 18:37:22 +0100
  • 54d51c96d9 Fixed some problems with the database convertion Peter 'Pita' Martischka 2011-08-24 13:31:02 +0100
  • 66e616304d Selection bubble on iOS5 now doesn't hide anymore after a splitsecond. Hans Pinckaers 2011-08-23 22:39:18 +0200
  • 7e4bba0e31 started a changelog Peter 'Pita' Martischka 2011-08-23 18:59:32 +0100
  • 7b8d48467f added proper embed parameter support, fixes #116 Peter 'Pita' Martischka 2011-08-23 18:36:38 +0100
  • f571ed3554 updated ueberDB Peter 'Pita' Martischka 2011-08-23 18:15:03 +0100
  • 0523ffe3bd Improved the README Peter 'Pita' Martischka 2011-08-23 17:56:54 +0100
  • 335643a860 ODT Import works but wasn't mentioned yet Robin Buse 2011-08-24 05:22:46 +0300
  • fd97946619 fixed user drop down issue Robin Buse 2011-08-24 04:48:21 +0300
  • 8ec71a3225 updated version to 1.0.0 1.0 Peter 'Pita' Martischka 2011-08-22 13:25:42 +0100
  • 913c3c455d fixed merge conflicts Peter 'Pita' Martischka 2011-08-22 13:14:59 +0100
  • e771542961 added deleteGroup API function Peter 'Pita' Martischka 2011-08-22 13:11:34 +0100
  • e79f29f67d removed 'planed' from the database documentation Peter 'Pita' Martischka 2011-08-21 20:49:07 +0100
  • a231ff45e1 fixed fileupload field in Firefox Peter 'Pita' Martischka 2011-08-21 20:17:38 +0100
  • 124bc4be03 updated dependencies Peter 'Pita' Martischka 2011-08-21 20:13:53 +0100
  • 177abdd29e Don't show PDF Export on Windows Peter 'Pita' Martischka 2011-08-21 20:09:25 +0100
  • 8c301d4fe8 remove star buttons on timeslider Peter 'Pita' Martischka 2011-08-21 20:09:09 +0100
  • 8d12c3d7ee added a link to the bugtracker Peter 'Pita' Martischka 2011-08-21 19:52:24 +0100
  • d85eeee5f4 check pad access on read only Peter 'Pita' Martischka 2011-08-21 19:43:42 +0100
  • 4e592def7e fixed color chooser Peter 'Pita' Martischka 2011-08-21 19:27:02 +0100
  • c1272ed566 Fixed minor German effort at English ;) John McLear 2011-08-21 01:33:30 +0100
  • 307d0acdeb put expolorer canvas into minify Peter 'Pita' Martischka 2011-08-21 19:20:18 +0100
  • 1df9d04e04 Fix for farbtastic in IE9, I had to recreate the file because the original commit was so messy John McLear 2011-08-21 18:48:11 +0100
  • 0b18e46bc3 keep the userlist open while editing Peter 'Pita' Martischka 2011-08-21 19:07:35 +0100
  • 4f233d88f8 fixed the backward compatility to old colorIds Peter 'Pita' Martischka 2011-08-21 18:53:30 +0100
  • 6c354c6333 improved the design of the user icon Peter 'Pita' Martischka 2011-08-21 18:18:35 +0100
  • 354d8fa82d Improved the README Peter 'Pita' Martischka 2011-08-21 17:58:12 +0100
  • 0260a742bc Improved the README Peter 'Pita' Martischka 2011-08-21 17:23:04 +0100
  • e4af96e67b removed unnecessary stuff from convertSettings Peter 'Pita' Martischka 2011-08-21 16:51:08 +0100
  • 070b5f16f7 added the default embed parameters to the embed code Peter 'Pita' Martischka 2011-08-21 16:44:38 +0100
  • 6efaf69157 Merge pull request #108 from 0ip/patch-1 Peter 'Pita' Martischka 2011-08-20 12:48:04 -0700
  • e9eb37fb0f Merge 82e4d7fe7d into 4d7c8a2c7d GitHub Merge Button 2011-08-20 12:47:50 -0700
  • 82e4d7fe7d Edited static/css/pad.css via GitHub Robin Buse 2011-08-21 09:45:05 +0300
  • 4d7c8a2c7d added ability to set a custom favicon Peter 'Pita' Martischka 2011-08-20 19:27:41 +0100
  • fdeb2a45e7 Ops, forgot to replace two throws Peter 'Pita' Martischka 2011-08-20 18:56:38 +0100
  • b9f23fa208 handle bad changesets Peter 'Pita' Martischka 2011-08-20 18:51:43 +0100
  • 42662d73d0 Merge branch 'master' of /home/jose/etherpad-lite/ Peter 'Pita' Martischka 2011-08-20 18:23:58 +0100
  • 9d37d91ce1 added a colorPicker Peter 'Pita' Martischka 2011-08-20 18:22:10 +0100
  • c365bc9522 updated ueberDB Peter 'Pita' Martischka 2011-08-19 23:23:18 +0100
  • 3c6ca617f6 show git version on start Peter 'Pita' Martischka 2011-08-19 22:01:33 +0100
  • b9c1b45a8b added utf8 to content type of api responses, thx @0ip Peter 'Pita' Martischka 2011-08-19 21:57:15 +0100
  • 82dd4802d7 fixed a API Bug Peter 'Pita' Martischka 2011-08-19 21:35:31 +0100
  • fcecbbb5a2 Merge b96bff996d into caecfd3997 GitHub Merge Button 2011-08-18 16:53:22 -0700
  • b96bff996d send utf-8 charset @ api Robin Buse 2011-08-19 13:48:40 +0300
  • caecfd3997 PITA, Y U NO TEST? Peter 'Pita' Martischka 2011-08-18 21:29:34 +0100
  • 5fc2f95a9f looks like buildForWindows was not executable anymore, don't know how that happend Peter 'Pita' Martischka 2011-08-18 21:17:54 +0100
  • 8214e132b7 Merge branch 'patch-6' of git://github.com/0ip/etherpad-lite Peter 'Pita' Martischka 2011-08-18 21:05:44 +0100
  • ef6a75ca54 don't do a graceful shutdown on SIGINT on windows Peter 'Pita' Martischka 2011-08-18 21:02:54 +0100
  • dd4c8dc3aa added a convert script from old etherpad to etherpad lite, instructions will follow Peter 'Pita' Martischka 2011-08-18 20:58:56 +0100
  • ad1e8fb4f8 limit the graceful shutdown time to 3 seconds Peter 'Pita' Martischka 2011-08-18 20:54:04 +0100
  • 6de5dd3f3d Merge 80c9f8ae8f into cb23b140d6 GitHub Merge Button 2011-08-18 06:08:06 -0700
  • 80c9f8ae8f typo fix :) Robin Buse 2011-08-19 03:06:29 +0300
  • 2dd82f82de since we set a global lock level, we can log socket.io debug messages Peter 'Pita' Martischka 2011-08-18 13:40:30 +0100
  • 71c6e494d5 fixed the buttons, the now fully clickable (someone has to test that with IE) Peter 'Pita' Martischka 2011-08-18 12:16:00 +0100
  • cb23b140d6 Merge pull request #87 from 0ip/patch-1 Peter 'Pita' Martischka 2011-08-17 12:27:17 -0700
  • 3977f11e58 Merge d3a33024ec into 4554c32e64 GitHub Merge Button 2011-08-17 12:26:48 -0700
  • 4554c32e64 show the last 100 chat messages, instead of the last 20 Peter 'Pita' Martischka 2011-08-17 20:04:28 +0100
  • b02ee510ac Merge branch 'patch-3' of https://github.com/0ip/etherpad-lite Peter 'Pita' Martischka 2011-08-17 19:58:37 +0100
  • d3a33024ec reverted js functions but reduced if clause using ternary operation Robin Buse 2011-08-17 21:58:07 +0300
  • c8a0f946f2 Merge branch 'patch-4' of https://github.com/0ip/etherpad-lite Peter 'Pita' Martischka 2011-08-17 19:43:39 +0100
  • d2e9cf410e Merge 58ea0d0ed3 into 5da30a40bf GitHub Merge Button 2011-08-17 11:40:31 -0700
  • c7f3b3d9ec Merge branch 'patch-2' of https://github.com/0ip/etherpad-lite Peter 'Pita' Martischka 2011-08-17 19:36:56 +0100
  • dba9c4046d Merge 06037dcb8e into 5da30a40bf GitHub Merge Button 2011-08-17 11:32:24 -0700
  • a47ada46d7 forgot to change the default settings in Settings.js Peter 'Pita' Martischka 2011-08-17 19:26:56 +0100
  • c2457e06d8 send client side javascript errors to the server Peter 'Pita' Martischka 2011-08-17 19:24:44 +0100
  • b58bdb4e4d support jsonp api calls Peter 'Pita' Martischka 2011-08-17 18:24:14 +0100
  • 84f1baf972 fixed a small css bug at the disconnect message Peter 'Pita' Martischka 2011-08-17 18:11:36 +0100
  • a34e482a8a changed ep-lite etherpad-lite in package.json Peter 'Pita' Martischka 2011-08-17 17:49:38 +0100
  • 41883e688b moved require joose to the correct place Peter 'Pita' Martischka 2011-08-17 17:49:05 +0100
  • 3ec7dc224b added a loglevel setting Peter 'Pita' Martischka 2011-08-17 17:45:47 +0100
  • 77ba4e3e6c ensure wrong socketio messages doesn't kill the server Peter 'Pita' Martischka 2011-08-17 17:28:30 +0100
  • 58ea0d0ed3 changed .gif to .png Robin Buse 2011-08-17 19:14:43 +0300
  • 296777ab53 added a graceful shutdown Peter 'Pita' Martischka 2011-08-17 15:58:42 +0100
  • 4a803cc543 removed npmignore Peter 'Pita' Martischka 2011-08-17 12:30:52 +0100
  • 95b1ac9393 removed sqlite dependency and made dirty the default db Peter 'Pita' Martischka 2011-08-17 12:30:35 +0100
  • 06037dcb8e added transparent icons Robin Buse 2011-08-16 22:59:17 +0200
  • d4b713d236 colorized the return link and removed some odd stuff Robin Buse 2011-08-16 23:49:52 +0300
  • a3caa87252 Merge 47a16ddbe2 into 5da30a40bf GitHub Merge Button 2011-08-16 13:46:42 -0700
  • ac0dff0c2c height @ #editbar ul is redundant && removed some space Robin Buse 2011-08-16 23:44:43 +0300
  • 6f7a9ce77a Redesigned pad editbar + chatbox (bg color) Robin Buse 2011-08-16 23:40:07 +0300
  • 47a16ddbe2 QR code support (js) Robin Buse 2011-08-16 23:34:05 +0300