Commit graph

  • 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
  • e14fd22284 fix large left padding John McLear 2012-01-15 17:59:19 +00:00
  • d392083db3 Merge pull request #334 from 0ip/patch-1 John McLear 2012-01-15 09:57:32 -08:00
  • 41b6d83c4e Merge 1767e0f6e8 into 5b807b4d86 GitHub Merge Button 2012-01-15 09:55:50 -08:00
  • 1767e0f6e8 Update static/css/pad.css 0ip 2012-01-15 18:55:33 +01:00
  • 5b807b4d86 Merge pull request #333 from 0ip/iconfix John McLear 2012-01-15 09:43:27 -08:00
  • c73b1b75f7 Merge 960a79b77b into f4dca37a93 GitHub Merge Button 2012-01-15 09:39:02 -08:00
  • 960a79b77b Added icon for ordered lists Robin 2012-01-15 18:37:33 +01:00
  • f4dca37a93 Ordered list support John McLear 2012-01-15 17:20:20 +00:00
  • 77804673d7 Move packaging info into its own file. Chad Weider 2012-01-14 16:12:03 -08:00
  • c45932c6b8 Merge pull request #329 from cweider/security Peter 'Pita' Martischka 2012-01-14 15:22:12 -08:00
  • 2667f3e2e5 Merge 387dd4a48b into ba180452e7 GitHub Merge Button 2012-01-14 15:10:30 -08:00
  • ba180452e7 Merge pull request #328 from 0ip/widthfix John McLear 2012-01-14 15:02:04 -08:00
  • 387dd4a48b The value of all href attributes is escaped. Chad Weider 2012-01-14 14:50:23 -08:00
  • 6e36b59a59 All escaping functions replace HTML reserved characters. Chad Weider 2012-01-14 14:46:15 -08:00
  • f8ff296d12 Merge f08e68c8f9 into 30da7357e5 GitHub Merge Button 2012-01-14 12:44:48 -08:00
  • f08e68c8f9 Addition for 720px phones (forgot index.html) Robin 2012-01-14 21:41:41 +01:00
  • 30da7357e5 Merge pull request #326 from 0ip/fileinputfix John McLear 2012-01-14 07:24:34 -08:00
  • d1dc24a252 Merge 42eee71295 into f9b0b10709 GitHub Merge Button 2012-01-14 07:16:41 -08:00
  • f9b0b10709 made 0ip images so that Pita likes them Peter 'Pita' Martischka 2012-01-14 16:16:35 +01:00
  • 8c0e1d7def Merge pull request #325 from 0ip/iconcleanup Peter 'Pita' Martischka 2012-01-14 07:11:54 -08:00
  • 23057306ac Merge 8787897f60 into 642b716553 GitHub Merge Button 2012-01-14 07:11:41 -08:00
  • 42eee71295 Fixed file input readability in Chrome Robin 2012-01-14 15:07:11 +01:00
  • 8787897f60 Changed position values Robin 2012-01-13 23:58:47 +01:00
  • 20b63f1fa7 Merged and optimized icons Robin 2012-01-13 23:58:01 +01:00
  • 254046454d merge with upstream. Fixed confict in pad.html Jean-Tiare Le Bigot 2012-01-08 19:32:06 +01:00
  • 1840ca4fd8 Added Twitpic and Imgur support, removed YT/V support temporarily 0ip 2012-01-08 18:49:05 +01:00
  • f6ffb384a6 Merge 8649be0e56 into 642b716553 GitHub Merge Button 2012-01-08 07:30:12 -08:00
  • 642b716553 Merge pull request #289 from jhollinger/no_spaces John McLear 2012-01-08 07:30:07 -08:00
  • 24e04f2a29 Merge e8ef99fb72 into 86902c2c0b GitHub Merge Button 2012-01-08 07:06:16 -08:00
  • 86902c2c0b Merge pull request #291 from jhollinger/export_revisions John McLear 2012-01-08 07:06:13 -08:00
  • 9462f90516 Merge 7dcc7be8e0 into 7232dff6db GitHub Merge Button 2012-01-08 06:50:00 -08:00
  • a617f12c9a Merge 2a86d57e46 into 7232dff6db GitHub Merge Button 2012-01-08 06:49:59 -08:00
  • f60a9cce17 Merge f05fc7ba31 into 7232dff6db GitHub Merge Button 2012-01-08 06:49:59 -08:00
  • 7232dff6db Merge pull request #306 from 0ip/patch-7 John McLear 2012-01-08 06:49:56 -08:00
  • 0e186c8d58 Merge 9203ac2362 into dc2448d0e1 GitHub Merge Button 2012-01-08 06:43:42 -08:00
  • dc2448d0e1 Merge pull request #313 from jhollinger/fix_ie_cursor John McLear 2012-01-08 06:43:38 -08:00
  • 99db4ed0ca Merge ca70a7772a into 9443525b88 GitHub Merge Button 2012-01-08 06:04:35 -08:00
  • 9443525b88 Merge pull request #318 from TimWolla/htmlValidity John McLear 2012-01-08 06:04:33 -08:00
  • 618bac1ce3 Merge 12fc8226f0 into d73f053b5a GitHub Merge Button 2012-01-08 04:57:51 -08:00
  • 12fc8226f0 Made pad.html more valid TimWolla 2012-01-08 13:55:34 +01:00
  • 8649be0e56 fix misspelling from Headline Nils Rokita 2012-01-07 14:23:01 +01:00
  • 7dcc7be8e0 get the proper git revision even when not started from node dir Azul 2012-01-05 11:35:40 +01:00
  • b1faa8e0f8 Make sure Minify.js finds its files Azul 2012-01-05 11:31:39 +01:00
  • 33ffda19b1 Load the settings even when not starting in node path Azul 2012-01-05 11:24:33 +01:00
  • f4ee2bac03 fix linehieght in haedings Nils Rokita 2012-01-04 16:21:19 +01:00
  • 9944dfc821 fix little error Nils Rokita 2012-01-04 15:38:03 +01:00
  • ca70a7772a Fix cursor jump in IE when clicking edit buttons Jordan 2012-01-02 20:45:31 -05:00
  • 5e0befce3a Merge 3248ca4cbb into d73f053b5a GitHub Merge Button 2012-01-02 06:48:03 -08:00
  • d73f053b5a Merge pull request #296 from jhollinger/api_fix Peter 'Pita' Martischka 2012-01-02 06:47:58 -08:00
  • 715c080d5d Merge 7c84d8cc74 into 4162f088a6 GitHub Merge Button 2012-01-02 06:47:22 -08:00
  • 4162f088a6 Merge pull request #302 from curiosity/master Peter 'Pita' Martischka 2012-01-02 06:47:18 -08:00
  • 9203ac2362 (1) Support for x*720px phones (like Galaxy Nexus) (2) Fix for user popup 0ip 2011-12-31 18:16:50 +01:00
  • 2481c1cb4f removed hackish code 0ip 2011-12-31 17:47:34 +01:00
  • a9a17e7360 properly disables line numbers on mobile devices (fix for #304 and #305) 0ip 2011-12-31 17:46:10 +01:00
  • 35824d2b8c Merge b841ad02a2 into ddf1cd345c GitHub Merge Button 2011-12-30 19:22:10 -08:00
  • b841ad02a2 cleaned up css Ben Scott 2011-12-31 13:18:14 +10:00
  • f6eb1d478a css for users popup on mobile Ben Scott 2011-12-31 13:17:18 +10:00
  • deec476a85 Merge 50f67a57ad into ddf1cd345c GitHub Merge Button 2011-12-26 22:11:42 -08:00
  • 50f67a57ad Fix the url for nodejs installation Sankar P 2011-12-27 11:39:40 +05:30
  • f05fc7ba31 refactor Pad.js; remove joose dependency booo 2011-12-23 22:06:04 +01:00
  • 8ac872bea8 handler/PadMessageHandler: fix minor bug I introduced booo 2011-12-22 23:30:07 +01:00
  • 095ab1ced0 utils/Abiword: use function after definition booo 2011-12-22 23:20:09 +01:00
  • 6a4f8f2b63 bin/jshint: add simple script for jshint booo 2011-12-22 14:52:09 +01:00
  • 3406ccc207 utils/contentcollector: use jshint booo 2011-12-22 14:42:46 +01:00
  • 73504e22f5 utils/Minitfy: use jshint booo 2011-12-22 14:17:42 +01:00
  • aa5933a7d5 utils/ExportDokuWiki: use jshint booo 2011-12-22 14:11:39 +01:00
  • 325ab65055 utils/ExportHtml: nearly jshint compatible booo 2011-12-22 14:06:30 +01:00
  • ef1baf9510 package.json: update log4js booo 2011-12-22 13:45:01 +01:00
  • 0f0a3b7e29 package.json: add jshint as devDependency booo 2011-12-22 13:42:49 +01:00
  • acbb75c147 handler/ExportHandler: use jshint booo 2011-12-22 13:40:46 +01:00
  • c26c45309a utils/Changeset: use jshint booo 2011-12-22 13:36:01 +01:00
  • 6985b93013 utils/contentcollector: use jshint booo 2011-12-22 13:34:16 +01:00
  • 554ed186e9 utils/AttributePoolFactory: remove white spaces booo 2011-12-22 13:33:15 +01:00
  • 2a05f2d3df utils/Abiword: use jshint booo 2011-12-22 13:32:36 +01:00
  • 11568b1278 handler/TimesliderMessageHandler: use jshint booo 2011-12-22 13:30:56 +01:00
  • e7b2a2b3b9 handler/SocketIORouter: use jshint booo 2011-12-22 13:21:45 +01:00
  • 9c126674b3 handler/PadMessageHandler: add stub for unimplemented MESSAGE type padoptions booo 2011-12-22 13:17:22 +01:00
  • 4fe4afe1b3 handler/PadMessageHandler: use jshint booo 2011-12-22 13:02:27 +01:00
  • 8e42192f2f handler/ImportHandler: use jshint booo 2011-12-22 12:28:25 +01:00
  • da7098168e handler/APIHandler: use jshint booo 2011-12-22 12:26:56 +01:00
  • 1f41ef3365 db/SessionManager: use jshint booo 2011-12-22 12:02:28 +01:00
  • 8f208ca444 db/SecurityManager: use jshint booo 2011-12-22 12:01:32 +01:00
  • d63b7cf188 db/ReadOnlyManager: use jshint booo 2011-12-22 12:00:47 +01:00
  • 928dfcb384 db/PadManager: use jshint booo 2011-12-22 12:00:04 +01:00
  • ac74ba10d0 use jshint booo 2011-12-22 11:59:04 +01:00
  • a07563b922 db/GroupManager: use jshint booo 2011-12-22 11:57:23 +01:00
  • a505503e2f db/AuthorManager: use jshint booo 2011-12-22 11:56:13 +01:00
  • 2584f023d2 db/DB: removed white spaces booo 2011-12-22 11:55:21 +01:00
  • 07626170d4 db/API: use jshint booo 2011-12-22 11:54:32 +01:00