Commit graph

  • 45b7cafca4 Don't let filenames be changed to Windows' backslash-notation. Chad Weider 2012-02-28 18:29:23 -08:00
  • 45ba5d60dc Windows does not like IP addresses of 0.0.0.0. Chad Weider 2012-02-28 18:13:10 -08:00
  • a7c009d0c9 Status code should not be assumed. Chad Weider 2012-02-28 18:09:33 -08:00
  • 118e7928b9 Headers should only be set after file is written. Chad Weider 2012-02-28 18:08:03 -08:00
  • 24a26953a7 Account for undefined argument. Chad Weider 2012-02-28 18:06:30 -08:00
  • 96ee77d85b Check error not stats. Chad Weider 2012-02-28 18:05:27 -08:00
  • 280e07d737 Merge pull request #519 from 0ip/cssfix2 0ip 2012-02-28 12:41:27 -08:00
  • cc5fb864e6 Merge b507f48a34 into af4bd5ca65 GitHub Merge Button 2012-02-28 12:41:22 -08:00
  • b507f48a34 typos 0ip 2012-02-28 21:37:10 +01:00
  • 5db8c5bda9 properly display number of users when more than 99 are on a pad + added ids + aligned chatlabel 0ip 2012-02-28 21:21:59 +01:00
  • a894fcd4f9 Removed CommonCode entierly Egil Moeller 2012-02-28 21:19:10 +01:00
  • cf191df0b8 So simple, yet so hard to find. Finally I found you, oh error caused by the new require usage... Egil Moeller 2012-02-28 21:14:31 +01:00
  • b20b86cdc8 Partial bugfix Egil Moeller 2012-02-28 17:52:30 +01:00
  • 051930e2c7 Added errorId to error message and shows error on screen when pad dies on loading Stefan 'Gared 2012-02-28 13:38:29 +00:00
  • af4bd5ca65 Add a hack to prevent redirect of requests for /static/js/pad to /static/js/pad.js. Chad Weider 2012-02-27 23:14:35 -08:00
  • 16f1b53044 Merge pull request #514 from 0ip/cssfix 0ip 2012-02-27 13:47:05 -08:00
  • 8e671c9db6 Merge a17a04182a into 599c8c7c12 GitHub Merge Button 2012-02-27 13:46:58 -08:00
  • a17a04182a fix weird looking input [IE7] 0ip 2012-02-27 22:40:47 +01:00
  • d8a0584768 more subtle ui feedback when pressing buttons 0ip 2012-02-27 22:29:21 +01:00
  • eddbc950dd combined css class 0ip 2012-02-27 22:06:46 +01:00
  • 5bfde917b0 revert viewport to fix #508 0ip 2012-02-27 22:04:03 +01:00
  • 599c8c7c12 update dependencies Peter 'Pita' Martischka 2012-02-27 19:46:30 +01:00
  • 5888f5ff7d @cweider, only Chuck Norris can compute in json files Peter 'Pita' Martischka 2012-02-27 19:13:25 +01:00
  • 611cfbd6fa Merge pull request #468 from cweider/minify-simplify Peter 'Pita' Martischka 2012-02-27 10:00:18 -08:00
  • 8ecf449d3c Merge b661ef5960 into bf42359669 GitHub Merge Button 2012-02-27 08:34:23 -08:00
  • 643ff84ccd Merge cfe095466f into bf42359669 GitHub Merge Button 2012-02-27 08:34:23 -08:00
  • bf42359669 Merge branch 'master' of github.com:Pita/etherpad-lite Peter 'Pita' Martischka 2012-02-27 17:34:11 +01:00
  • d00be5b817 Removed all window.unload event handlers. This kind of fixes #200 Peter 'Pita' Martischka 2012-02-27 17:33:27 +01:00
  • fec8f8a142 Merge pull request #511 from Gared/master John McLear 2012-02-27 07:35:11 -08:00
  • d24657db37 Merge c54d47e1c6 into 0c77052698 GitHub Merge Button 2012-02-27 07:32:06 -08:00
  • c54d47e1c6 Added cookie to save option showing author colors Stefan 'Gared 2012-02-27 15:24:36 +00:00
  • d2cd1213ec Merge branch 'master' of http://github.com/Pita/etherpad-lite Stefan 'Gared 2012-02-27 15:22:15 +00:00
  • 84e81b85b4 Merge 443dd4417b into 0c77052698 GitHub Merge Button 2012-02-27 05:38:56 -08:00
  • 0c77052698 Fixed #299 and #338 Peter 'Pita' Martischka 2012-02-27 14:20:33 +01:00
  • 973aad5c96 Fix doesPadExist check Peter 'Pita' Martischka 2012-02-27 14:13:47 +01:00
  • da2b456b5b Merge branch 'master' of github.com:Pita/etherpad-lite Peter 'Pita' Martischka 2012-02-27 00:23:14 +01:00
  • ed8aff22d4 restart abiword on crash and give the user feedback about bad import files Peter 'Pita' Martischka 2012-02-27 00:22:53 +01:00
  • 0336526a64 Merge branch 'master' of http://github.com/Pita/etherpad-lite Stefan 'Gared 2012-02-26 21:26:47 +00:00
  • 4fc57921f0 Merge branch 'master' of github.com:Pita/etherpad-lite John McLear 2012-02-26 21:27:06 +00:00
  • 4dc86f3382 fix #507 import showing when it shouldnt John McLear 2012-02-26 21:26:42 +00:00
  • 0a4a7f538d Merge branch 'temo' Egil Moeller 2012-02-26 22:02:02 +01:00
  • 2c7b84ca3e Minify now supports plugins Egil Moeller 2012-02-26 22:01:52 +01:00
  • 6706332e42 Merge branch 'master' of http://github.com/Pita/etherpad-lite Stefan 'Gared 2012-02-26 19:52:09 +00:00
  • 7d923277a6 Merge pull request #506 from jucovschi/changeset_docs John McLear 2012-02-26 11:14:40 -08:00
  • c2135a1364 Merge 9fe4318e77 into 00c3281a02 GitHub Merge Button 2012-02-26 11:14:18 -08:00
  • 9fe4318e77 more doc update Constantin Jucovschi 2012-02-26 18:59:11 +00:00
  • 00c3281a02 Forbid colons, this Fixes #301 Peter 'Pita' Martischka 2012-02-26 19:59:02 +01:00
  • 1b66a48eaf Merge branch 'master' of github.com:Pita/etherpad-lite John McLear 2012-02-26 18:17:23 +00:00
  • 763361a7c9 First stab at getting client side require(plugin/..) to work from within etherpad Egil Moeller 2012-02-26 17:48:17 +01:00
  • c3f728b2ed Revert "drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller" Peter 'Pita' Martischka 2012-02-26 16:13:07 +01:00
  • 21246711c1 Merge branch 'master' of github.com:Pita/etherpad-lite John McLear 2012-02-26 15:13:01 +00:00
  • aa78456ab9 Revert "drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller" John McLear 2012-02-26 14:49:13 +00:00
  • fd5b7c1080 require(ep_pluginname/static/blabla); now works both on client and server Egil Moeller 2012-02-26 15:34:03 +01:00
  • 43e72da0b9 I suck at md. John McLear 2012-02-26 14:24:21 +00:00
  • 59b414c826 Update README.md John McLear 2012-02-26 14:23:59 +00:00
  • 45d0d93d03 Update README.md John McLear 2012-02-26 14:23:07 +00:00
  • af40ea3181 added paypal donation point... John McLear 2012-02-26 14:22:32 +00:00
  • 979cfdf738 Added foundation flattr account. John McLear 2012-02-26 14:20:50 +00:00
  • ac7ad6b519 Bugfix for git version extraction code Egil Moeller 2012-02-26 14:14:54 +01:00
  • 9709589f87 Merge pull request #505 from jucovschi/changeset_docs Peter 'Pita' Martischka 2012-02-26 05:13:27 -08:00
  • 14f2188161 Merge e318e3d4cb into 8d764cad33 GitHub Merge Button 2012-02-26 05:10:18 -08:00
  • 8d764cad33 Perma fix for issue #485 and #327 John McLear 2012-02-26 13:07:09 +00:00
  • e318e3d4cb some new docs Constantin Jucovschi 2012-02-26 12:18:17 +00:00
  • ac86535cdf more docs Constantin Jucovschi 2012-02-26 11:34:06 +00:00
  • 3abdd34160 writing in jsdoc syntax Constantin Jucovschi 2012-02-26 11:22:46 +00:00
  • 1e8ef3bb6a commented general functions Constantin Jucovschi 2012-02-26 10:27:56 +00:00
  • da52353ba3 The big rename of pluginbs from pluginomatic to ep Egil Moeller 2012-02-26 13:54:32 +01:00
  • 681e8415b6 Fix issue #485 John McLear 2012-02-26 12:38:52 +00:00
  • 758666c3e1 Better startup & symlinking Egil Moeller 2012-02-26 13:31:47 +01:00
  • 1239ce7f28 The Big Renaming - etherpad is now an NPM module Egil Moeller 2012-02-26 13:07:51 +01:00
  • 1955bdec9a plugins.plugins is now defined while loading hook modules from plugins Egil Moeller 2012-02-26 00:59:05 +01:00
  • 2a58a62dcc Client side / server side require Egil Moeller 2012-02-26 00:45:06 +01:00
  • 443dd4417b addendum to last commit Dominik Rodler 2012-02-26 00:05:17 +01:00
  • f23e6a3f3b UI clean-up for pad and timeslider Dominik Rodler 2012-02-26 00:04:50 +01:00
  • 44ec2e148a Merge pull request #502 from drdla/master John McLear 2012-02-25 14:40:35 -08:00
  • 297a580683 Merge 4e54ebb0b8 into 7e3a3bb9ea GitHub Merge Button 2012-02-25 11:46:37 -08:00
  • 4e54ebb0b8 Added new favicon Dominik Rodler 2012-02-25 20:45:28 +01:00
  • 7e3a3bb9ea Merge branch 'master' of github.com:Pita/etherpad-lite John McLear 2012-02-25 19:37:29 +00:00
  • 2fd1702960 fix sticky chat... dont like where i put the call but it will have to do cause im tired. John McLear 2012-02-25 19:35:49 +00:00
  • 1b339a6a6d Merge pull request #486 from fourplusone/fix_redirect 0ip 2012-02-25 11:05:26 -08:00
  • 1ea7169418 Merge 048258ae15 into a449876f80 GitHub Merge Button 2012-02-25 11:02:15 -08:00
  • fa2aeb2923 Merge 048258ae15 into a449876f80 GitHub Merge Button 2012-02-25 10:45:11 -08:00
  • 261bbd460f test static files for plugins Egil Moeller 2012-02-25 19:43:39 +01:00
  • ce35f20988 Make plugins dict non-recursive Egil Moeller 2012-02-25 19:43:22 +01:00
  • e542199aab Serve plugin static files Egil Moeller 2012-02-25 19:43:00 +01:00
  • 048258ae15 New favicon Dominik Rodler 2012-02-25 19:38:49 +01:00
  • 9a4445a7ae created folder for Photoshop source files; Added draft for new favicon Dominik Rodler 2012-02-25 19:38:40 +01:00
  • 9138fc3268 Merge 9e82aab858 into a449876f80 GitHub Merge Button 2012-02-25 09:32:58 -08:00
  • a449876f80 Merge pull request #498 from eldiddio/master John McLear 2012-02-25 09:32:55 -08:00
  • ebd4b6120c Merge 164db7b074 into bbaa6bb7d2 GitHub Merge Button 2012-02-25 09:32:22 -08:00
  • 164db7b074 Added test for IE XML HTTP and added link to wiki article Mark Fisher 2012-02-25 17:30:59 +00:00
  • 1d86c828bc Bugfix for plugin listing Egil Moeller 2012-02-25 17:58:25 +01:00
  • bbaa6bb7d2 add stuff for how to do load testing John McLear 2012-02-25 16:54:27 +00:00
  • 7b42987407 Moved all the hooks into a hooks directory Egil Moeller 2012-02-25 17:23:44 +01:00
  • 6754eed9b4 Renamed functions to match hook names Egil Moeller 2012-02-25 16:53:15 +01:00
  • f2cfb4eee5 Removed some more junk Egil Moeller 2012-02-25 16:50:11 +01:00
  • cddf71f6fe Moved socketio Egil Moeller 2012-02-25 16:44:37 +01:00
  • 9790598381 fix for #491 + #415a (floating chat icon) & fixed hidden authorship colors button on iOS 0ip 2012-02-25 16:41:10 +01:00
  • db38a43fd7 Some code cleanup Egil Moeller 2012-02-25 16:24:39 +01:00
  • 6a6191f67e Moved errorhandling Egil Moeller 2012-02-25 16:20:40 +01:00