Commit graph

  • 7b77f3d4b5 Toggle sticky chatf unction can be called very easily, 0ip to add to settings interface John McLear 2012-01-25 19:03:25 +00:00
  • 92e1ed80b5 Merge pull request #354 from cnelsonsic/patch-1 John McLear 2012-01-24 17:49:31 -08:00
  • e744df481f Merge b15b7fe4bd into 947d53e231 GitHub Merge Button 2012-01-24 16:52:42 -08:00
  • b15b7fe4bd Changing openssl dev package name for Fedora to what it actually is. C Nelson 2012-01-24 18:52:09 -06:00
  • 228543a30e Text color changes based on author color Marcel Klehr 2012-01-23 18:40:54 +01:00
  • 2fd4789013 Merge branch 'master' of ../etherpad-lite calcnerd256 2012-01-22 19:08:00 -06:00
  • 43af5cfe00 separated the server module from the serve script which instantiates an instance of it calcnerd256 2012-01-22 18:51:42 -06:00
  • 2d0c3b867a added a hook in server setup for extra initialization calcnerd256 2012-01-22 18:42:29 -06:00
  • 947d53e231 Merge pull request #343 from cweider/modulize Peter 'Pita' Martischka 2012-01-22 10:22:40 -08:00
  • 6508a1674f Merge 9253f9993d into 351b516359 GitHub Merge Button 2012-01-22 10:22:25 -08:00
  • 351b516359 Merge pull request #344 from cweider/misc-fixins Peter 'Pita' Martischka 2012-01-22 10:22:23 -08:00
  • b2ea1d6680 Merge 003c2a59aa into 04d48e8592 GitHub Merge Button 2012-01-22 10:00:51 -08:00
  • 9253f9993d Remove guards surrounding export steps. Chad Weider 2012-01-16 00:47:10 -08:00
  • 62e0a8f26c Use require-kernel for require functionality. Chad Weider 2012-01-15 22:07:45 -08:00
  • 71dfced06d Provide filename to isolation function. Chad Weider 2012-01-15 22:56:41 -08:00
  • 8bf0e7c2aa Allow dashes in included file names. Chad Weider 2012-01-15 22:53:44 -08:00
  • 1b89e7e290 Implement require in HTML pages. Chad Weider 2012-01-16 02:10:34 -08:00
  • 86f31c752d Implement require for for plugin module. Chad Weider 2012-01-15 21:52:03 -08:00
  • fa2a6e9ee6 Implement require of dependencies for all pad_* modules. Chad Weider 2012-01-15 21:37:47 -08:00
  • 7f98116a43 Implement require for most modules. Chad Weider 2012-01-15 20:16:11 -08:00
  • 72d29b1c62 Inject the pad dependency into chat. Chad Weider 2012-01-15 21:05:19 -08:00
  • 8a0d6c6636 Add missing dependency for timeslider.js. Chad Weider 2012-01-16 00:37:48 -08:00
  • da95016228 Add a fake require to go with the fake exports. Chad Weider 2012-01-15 19:46:50 -08:00
  • fc68a25b21 Isolate all files in a closure. Chad Weider 2012-01-15 17:23:48 -08:00
  • ab02135643 Factor out taring process. Chad Weider 2012-01-16 23:26:30 -08:00
  • 9e16b9a575 Always use the JS assets processed by Minify. Chad Weider 2012-01-17 01:22:23 -08:00
  • 2b5d7a0048 All files export their public interface if exports is available. Chad Weider 2012-01-15 17:23:48 -08:00
  • 003c2a59aa Remove dependency on a global socket and address pad.socket instead. Chad Weider 2012-01-17 00:43:11 -08:00
  • 6bbc32a19f Default plugin should not fail if clientVars is not defined. Chad Weider 2012-01-18 00:28:55 -08:00
  • 0f7e6feda1 Remove individual settings in pad2.js from global. Chad Weider 2012-01-15 18:22:28 -08:00
  • 50d304022d Change calculation of userAgent. Chad Weider 2012-01-15 19:03:03 -08:00
  • 548c527aaf Move exposure of Ace2Editor closer to the code that requires it. Chad Weider 2012-01-16 00:31:28 -08:00
  • b175ad562a Use uncompressed jQuery. Chad Weider 2012-01-15 17:33:53 -08:00
  • 53549b7422 Use constants and CWD-independent paths for resource directories. Chad Weider 2012-01-17 02:16:25 -08:00
  • c3acdbe329 Minify uses the stardard middleware interface. Chad Weider 2012-01-17 00:57:59 -08:00
  • 1c0a74d7c6 Use middleware to specify Server name in header. Chad Weider 2012-01-17 01:42:06 -08:00
  • 04d48e8592 Added a getting started developing Etherpad Lite video to readme.md.. John McLear 2012-01-22 16:29:51 +00:00
  • ca68196c32 Added a getting started developing Etherpad Lite video to readme.md John McLear 2012-01-22 16:24:06 +00:00
  • 7a3e800fca Merge branch 'master' of git://github.com/marcelklehr/etherpad-lite Peter 'Pita' Martischka 2012-01-22 15:41:24 +01:00
  • cf47153769 Merge branch 'master' of github.com:Pita/etherpad-lite Peter 'Pita' Martischka 2012-01-22 15:25:50 +01:00
  • a5c1c2acdf Merge 1e71d41b5f into 165f26947d GitHub Merge Button 2012-01-22 06:25:39 -08:00
  • 09f5a57106 Merge 95d98f0cd0 into 165f26947d GitHub Merge Button 2012-01-22 06:25:38 -08:00
  • 165f26947d Merge pull request #341 from azul/race_condition Peter 'Pita' Martischka 2012-01-22 06:25:35 -08:00
  • cece2c858e Merge branch 'master' of github.com:Pita/etherpad-lite Peter 'Pita' Martischka 2012-01-22 15:24:02 +01:00
  • d391dab558 fixed merge conflict Peter 'Pita' Martischka 2012-01-22 15:23:50 +01:00
  • 4f0a4caf73 Merge c4f9268cfa into 6b19ffeaf6 GitHub Merge Button 2012-01-22 06:22:49 -08:00
  • 6b19ffeaf6 Merge pull request #348 from 0ip/fixforfixforfix Peter 'Pita' Martischka 2012-01-22 06:22:46 -08:00
  • e2a348057d Merge branch 'master' of github.com:Pita/etherpad-lite Peter 'Pita' Martischka 2012-01-22 14:58:38 +01:00
  • 859249a37b Merge c0a0687fe9 into 7720c312ca GitHub Merge Button 2012-01-22 05:57:56 -08:00
  • 7720c312ca README: add notice about jshint booo 2011-12-22 04:32:17 +08:00
  • ada09f3e6b Added a jshint binary Peter 'Pita' Martischka 2012-01-22 14:56:08 +01:00
  • 49061175c9 Text color changes based on author color Marcel Klehr 2012-01-22 13:30:25 +01:00
  • c0a0687fe9 It was definetely too late Robin 2012-01-22 13:09:10 +01:00
  • d881cefbc9 Merge pull request #347 from 0ip/patch-2 John McLear 2012-01-21 18:44:39 -08:00
  • 4269cbadbc Merge 3f8b03a900 into a1081d47ba GitHub Merge Button 2012-01-21 17:15:14 -08:00
  • 3f8b03a900 Typo again 0ip 2012-01-22 02:15:02 +01:00
  • a1081d47ba Merge pull request #346 from 0ip/ua_dupl John McLear 2012-01-21 16:11:35 -08:00
  • 710627db6d Merge 3c85a9cc6c into 9f0ca7cc44 GitHub Merge Button 2012-01-21 15:18:33 -08:00
  • 3c85a9cc6c Typo Robin 2012-01-22 00:13:00 +01:00
  • 300886da34 Removed duplicates Robin 2012-01-22 00:10:06 +01:00
  • 1e71d41b5f minify helper isnt needed anymore Patrick Pfeiffer 2012-01-21 11:46:51 +01:00
  • dce5227e42 write settings upon mount Patrick Pfeiffer 2012-01-21 11:37:51 +01:00
  • 2874e1b904 optional settings-file Patrick Pfeiffer 2012-01-21 10:30:23 +01:00
  • 6188c88e4a make the app mountable Patrick Pfeiffer 2012-01-21 09:41:56 +01:00
  • 95d98f0cd0 forgot to edit other scripts Montana Scott Rowe 2012-01-19 17:51:44 -06:00
  • 57908fcb16 forgot to modify other scripts Montana Scott Rowe 2012-01-19 17:51:26 -06:00
  • 2b8af11405 moved server into a module and actual invocation out of it Montana Scott Rowe 2012-01-19 17:46:55 -06:00
  • a7d9e6b9a3 checked to make sure init is passed a function Montana Scott Rowe 2012-01-19 17:36:56 -06:00
  • 7e522eaf85 put POSTs into an object literal Montana Scott Rowe 2012-01-19 17:28:45 -06:00
  • c16d3a0f67 moved GETs into an object literal Montana Scott Rowe 2012-01-19 17:20:26 -06:00
  • c7d4a5cf33 moved GET functions into an object Montana Scott Rowe 2012-01-19 17:04:17 -06:00
  • 1b03e1991a placed additionalSetup hook Montana Scott Rowe 2012-01-19 16:55:39 -06:00
  • a45dd74b31 factored out goToPad as a combinator Montana Scott Rowe 2012-01-19 16:48:24 -06:00
  • 772925f285 pulled configure and basic_auth into global scope Montana Scott Rowe 2012-01-19 16:29:04 -06:00
  • b0d23cb952 factored out API caller and client feedback combinators Montana Scott Rowe 2012-01-19 14:42:40 -06:00
  • e703fd1ba0 factored out pad import Montana Scott Rowe 2012-01-19 14:26:05 -06:00
  • b38d88e454 factored out pad export POST combinator in the least interesting way Montana Scott Rowe 2012-01-19 14:07:19 -06:00
  • fdcf1d4153 factored out static serve on goToPad Montana Scott Rowe 2012-01-19 13:36:50 -06:00
  • a4795eb88d factored out read only pad getter Montana Scott Rowe 2012-01-19 13:17:42 -06:00
  • c5c548db11 refactored out readonly pad render combinators Montana Scott Rowe 2012-01-19 12:52:52 -06:00
  • b0a58b0b3e finished a step I'd accidentally left half-completed in the refactoring of a higher-order function Montana Scott Rowe 2012-01-19 11:56:50 -06:00
  • c109af52e1 for read-only pads, turned async series into waterfall to reduce state and factored out translation combinator Montana Scott Rowe 2012-01-19 11:55:59 -06:00
  • 7b96bb7f8e factored out static sendfile Montana Scott Rowe 2012-01-19 10:44:38 -06:00
  • c4f9268cfa make PadMessageHandler more robust against timing issues Azul 2012-01-19 13:02:46 +01:00
  • e1159f0ee0 factored out shutdown setup Montana Scott Rowe 2012-01-19 10:14:14 -06:00
  • 98f11bea6d factored out socket.io setup Montana Scott Rowe 2012-01-19 10:11:51 -06:00
  • 08040e7444 factored out static serve and pad name check combinators Montana Scott Rowe 2012-01-19 09:46:06 -06:00
  • fcb3b11c0e factored out pad access as a combinator Montana Scott Rowe 2012-01-19 09:42:56 -06:00
  • 9f0ca7cc44 Remove alt key from Z to stop Polish people feeling sad John McLear 2012-01-17 16:50:35 +00:00
  • 9788f89127 Revert "handler/PadMessageHandler: add stub for unimplemented MESSAGE type padoptions" booo 2012-01-16 00:25:43 +01:00
  • 8f887262b0 Merge pull request #335 from johnyma22/importInstructions Peter 'Pita' Martischka 2012-01-15 12:50:55 -08:00
  • 02547a91ac Merge eec22c4b70 into a313c2570e GitHub Merge Button 2012-01-15 12:50:10 -08:00
  • a313c2570e Merge pull request #331 from cweider/packaging-improvement Peter 'Pita' Martischka 2012-01-15 12:48:41 -08:00
  • eec22c4b70 Added a string to let people know to install abiword to enable import John McLear 2012-01-15 20:48:29 +00:00
  • c80fb50387 Merge 71a7c00abc into 5f46ac2b01 GitHub Merge Button 2012-01-15 12:10:53 -08:00
  • 71a7c00abc Merge adjacent scripts. Chad Weider 2012-01-15 00:05:26 -08:00
  • a7bea30d83 Remove unnecessary quoting approach. Chad Weider 2012-01-14 23:31:23 -08:00
  • 9c91f16c71 Improve inlining of editor content. Chad Weider 2012-01-14 21:42:47 -08:00
  • 5f46ac2b01 Temporary fix that was breaking clicks inside of embedded pads John McLear 2012-01-15 18:24:18 +00:00
  • 6b49a56e01 Merge branch 'master' of github.com:Pita/etherpad-lite John McLear 2012-01-15 17:59:42 +00:00