Commit graph

  • eb24404d3d automatic prefixfree.js dl Robin 2012-02-04 18:37:36 +01:00
  • adc58cdcaf add missing slash Robin 2012-02-04 18:11:41 +01:00
  • 7075ff6731 get rid of vendor prefixes Robin 2012-02-04 18:08:04 +01:00
  • 28c9a422ff Merge pull request #395 from 0ip/patch-4 John McLear 2012-02-04 08:49:47 -08:00
  • 56c0e964e2 Merge 3d108d6dce into 894ff56611 GitHub Merge Button 2012-02-03 17:22:49 -08:00
  • 894ff56611 Merge pull request #396 from 0ip/ui_dialog_hl John McLear 2012-02-03 17:22:44 -08:00
  • 1d1b46fe34 Merge a8cc61545c into 3599ea258a GitHub Merge Button 2012-02-03 17:21:02 -08:00
  • 3599ea258a Merge pull request #397 from 0ip/removejqui John McLear 2012-02-03 17:20:59 -08:00
  • f05411e270 Merge 28386adbbb into 8d7ec7d24a GitHub Merge Button 2012-02-03 13:53:11 -08:00
  • 28386adbbb Scroll down Robin 2012-02-03 22:52:57 +01:00
  • a8cc61545c Prevent that li.sepereator gets .selected 0ip 2012-02-03 22:29:43 +01:00
  • 79794c0572 remove unnecessary module Robin 2012-02-03 21:45:25 +01:00
  • f3531f3f63 fix css Robin 2012-02-03 21:32:36 +01:00
  • 1c826da1d1 rem jQ-UI from pad.js too Robin 2012-02-03 21:28:19 +01:00
  • bb808d11ac remove jquery ui Robin 2012-02-03 21:20:02 +01:00
  • 82b04df085 overwrite existing bg Robin 2012-02-03 20:48:47 +01:00
  • 2adda472fc Highlight button for currently opened dialog Robin 2012-02-03 20:43:09 +01:00
  • 3d108d6dce Update jQuery, removes "event.layerX/layerY are broken and deprecated in WebKit" message 0ip 2012-02-03 19:20:32 +01:00
  • d3e18ad3c6 Merge c16d6eefdf into 8d7ec7d24a GitHub Merge Button 2012-02-02 18:38:12 -08:00
  • 9dace7ab71 Merge 618082c35e into 8d7ec7d24a GitHub Merge Button 2012-02-02 14:31:46 -08:00
  • b1132940c1 socket.io patch for IE8 Wikinaut 2012-02-02 20:58:28 +01:00
  • fa1531ad1f Merge remote branch 'upstream/master' into nice-pad-url Wikinaut 2012-02-02 20:51:56 +01:00
  • 618082c35e Added a prompt to users to type in the box to start chatting and also a button to always enable chat.. @0ip will need to re-style this if it gets merged John McLear 2012-02-02 18:58:43 +00:00
  • f0d7314837 slight css polish John McLear 2012-02-02 18:47:31 +00:00
  • c16d6eefdf remove callbacks to speed things up John McLear 2012-02-02 18:44:43 +00:00
  • a7d7295116 Remove jQuery UI John McLear 2012-02-02 18:42:34 +00:00
  • 8d7ec7d24a Merge pull request #390 from booo/master Peter 'Pita' Martischka 2012-02-02 04:17:33 -08:00
  • 6da3b62aa3 Merge 3f3bb95073 into fc0cbdb55c GitHub Merge Button 2012-02-02 03:24:16 -08:00
  • fc0cbdb55c Updated uglify-js, that might fixes #389 Peter 'Pita' Martischka 2012-02-02 12:24:13 +01:00
  • 3f3bb95073 Revert "Optimize javascript minification, slight increase of file size, but massive performance improvement" booo 2012-02-02 11:26:36 +01:00
  • 1a87ffacea new branch from master nice-pad-url Wikinaut 2012-02-01 15:07:09 +01:00
  • dfa106df03 Merge branch 'master' of github.com:Pita/etherpad-lite John McLear 2012-01-31 14:16:01 +00:00
  • 9d72ddfbc7 Solves first part of #377 -- Swap order of title and pad name John McLear 2012-01-31 14:15:36 +00:00
  • be1bd1d12d Merge pull request #381 from booo/master Peter 'Pita' Martischka 2012-01-31 05:51:55 -08:00
  • d640c73533 Merge 0c723c2686 into b32f883a9d GitHub Merge Button 2012-01-31 04:27:55 -08:00
  • b32f883a9d Optimize javascript minification, slight increase of file size, but massive performance improvement Peter 'Pita' Martischka 2012-01-31 13:27:46 +01:00
  • 9ed42ac801 Merge pull request #382 from cweider/fixes John McLear 2012-01-30 15:29:11 -08:00
  • 8a12fe1aff Merge 23a166ca99 into cd36849dc3 GitHub Merge Button 2012-01-30 15:28:40 -08:00
  • 23a166ca99 JSON exports itself. This fixes issue #376. Chad Weider 2012-01-30 13:27:43 -08:00
  • f83e619fd9 Null-out the padeditor's reference to ace once it has been distroyed. Chad Weider 2012-01-28 17:25:24 -08:00
  • 16735fe4fa Merge branch 'master' into serverModule calcnerd256 2012-01-30 11:17:16 -06:00
  • 23d6369746 added some comments to the server setup to explain what additionalSetup does and why calcnerd256 2012-01-30 10:47:06 -06:00
  • cd36849dc3 Merge pull request #380 from jhollinger/master John McLear 2012-01-30 07:56:28 -08:00
  • 0c723c2686 remove joose dependency booo 2012-01-30 15:59:13 +01:00
  • c797d0e5cd Merge f69a2cca3c into aeea061f69 GitHub Merge Button 2012-01-30 05:22:27 -08:00
  • f69a2cca3c CSS bugfix to two-column popups - the right column was too wide and was being pushed below the left column Jordan 2012-01-30 08:20:02 -05:00
  • ac41acd52b CSS bugfix to export popup in timeslider Jordan 2012-01-30 08:12:14 -05:00
  • a13ff6eabf Merge branch 'master' of https://github.com/Pita/etherpad-lite booo 2012-01-30 13:47:28 +01:00
  • aeea061f69 Merge pull request #366 from booo/master Peter 'Pita' Martischka 2012-01-30 01:58:28 -08:00
  • 8b1a44cd06 Merge a300bb6e92 into 4d714cee94 GitHub Merge Button 2012-01-30 01:56:05 -08:00
  • 4d714cee94 Merge pull request #371 from cweider/page-initialization Peter 'Pita' Martischka 2012-01-30 01:56:02 -08:00
  • 1c8419a7a0 Merge a408557a0e into 2aba2db937 GitHub Merge Button 2012-01-30 01:45:39 -08:00
  • 2aba2db937 Merge pull request #373 from jhollinger/master Peter 'Pita' Martischka 2012-01-30 01:45:36 -08:00
  • d4e677cc00 Merge branch 'master' of https://github.com/Pita/etherpad-lite booo 2012-01-30 01:04:29 +01:00
  • c36f25feda Merge 01cacff008 into 7096ce7f1e GitHub Merge Button 2012-01-29 10:41:53 -08:00
  • 7096ce7f1e Fix #171 IE9 edit issue and #361 IE URL Last Letter issue John McLear 2012-01-29 18:41:33 +00:00
  • 3287a0000a Merge pull request #349 from marcelklehr/master John McLear 2012-01-29 08:39:54 -08:00
  • 1f3a7795d5 Merge 228543a30e into fdc44e65c8 GitHub Merge Button 2012-01-29 08:39:31 -08:00
  • fdc44e65c8 Merge pull request #375 from 0ip/cssfix John McLear 2012-01-29 08:39:29 -08:00
  • 5025b9e2fc Merge 62acab961f into 30e644ee0f GitHub Merge Button 2012-01-29 08:06:19 -08:00
  • 62acab961f added missing class for settings button Robin 2012-01-29 17:03:33 +01:00
  • ddcaf0dad6 Moved inline css to pad.css and made popups even more dynamic Robin 2012-01-29 16:57:06 +01:00
  • 30e644ee0f Merge pull request #372 from cweider/button-styling John McLear 2012-01-29 07:15:51 -08:00
  • a408557a0e Make implicit loading of modules unnecessary. Chad Weider 2012-01-28 15:26:39 -08:00
  • 6a4c025e08 Global exception handler is not registered until the page's controller adds it. Chad Weider 2012-01-28 18:12:01 -08:00
  • 01cacff008 Convert goToPad to middleware Jordan 2012-01-28 21:51:25 -05:00
  • c12e1aff07 Place script at bottom. Chad Weider 2012-01-26 21:25:02 -08:00
  • 67e6f9fa5a Move timeslider code into JS. Chad Weider 2012-01-18 21:39:38 -08:00
  • d934fd6107 Remove all global dependencies from broadcast modules. Chad Weider 2012-01-26 21:20:26 -08:00
  • 7acb658733 Merge bdf0f203f9 into e68643b67e GitHub Merge Button 2012-01-28 15:50:28 -08:00
  • bdf0f203f9 Shift button styling specifics into CSS. Chad Weider 2012-01-21 23:12:13 -08:00
  • cd86ef5600 Shift pad initialization into JavaScript. Chad Weider 2012-01-26 21:10:41 -08:00
  • 3e9b56aa75 Give controller for pad.html a more appropriate name. Chad Weider 2012-01-26 20:37:18 -08:00
  • 514698162f Inject pad dependencies into most pad submodules. Chad Weider 2012-01-26 21:02:58 -08:00
  • 56c07e484a Expose settings on pad object. Chad Weider 2012-01-26 21:40:13 -08:00
  • e68643b67e Comment out some of the sidebar code that is no longer used and add a cookie set and get for sticky chat view John McLear 2012-01-28 22:24:14 +00:00
  • ebf39ba2a8 Merge branch 'master' of https://github.com/Pita/etherpad-lite booo 2012-01-28 18:33:08 +01:00
  • 3ca5a0877b Merge pull request #370 from 0ip/patch-3 John McLear 2012-01-28 08:55:51 -08:00
  • 246c55cc70 Merge 41dea6f591 into 364aab2dfa GitHub Merge Button 2012-01-28 08:53:59 -08:00
  • 41dea6f591 abc 0ip 2012-01-28 17:53:55 +01:00
  • 364aab2dfa Merge pull request #369 from 0ip/popup_label_fix_2 John McLear 2012-01-28 08:46:41 -08:00
  • e7d968e4a6 Merge d872b42e31 into 158fd6c281 GitHub Merge Button 2012-01-28 08:46:22 -08:00
  • d872b42e31 reverted John's commits, added labels and tweaked popups to act more dynamically Robin 2012-01-28 17:38:52 +01:00
  • a300bb6e92 move randomString function into module booo 2012-01-28 13:24:58 +01:00
  • 158fd6c281 Merge pull request #365 from booo/master Peter 'Pita' Martischka 2012-01-28 04:03:28 -08:00
  • 781547979d Merge f7089bba20 into 2a6e4ba194 GitHub Merge Button 2012-01-28 04:00:42 -08:00
  • f7089bba20 package.json: update log4js version (0.4.1) booo 2012-01-28 12:55:11 +01:00
  • 2a6e4ba194 Fix tiny css bug and make warning text not selectable John McLear 2012-01-27 01:02:12 +00:00
  • a53de45b32 Beautifying 0ips commit to give settings option, also add warning prior to altering everyones view and moved everyones view stuff into my view only that needed to be moved.. John McLear 2012-01-27 01:00:14 +00:00
  • 47ee0ec383 Fix minor styling isue where focus chat box would try to show up even if chat was stuck to screen John McLear 2012-01-27 00:43:00 +00:00
  • 7a726f86ec Merge pull request #362 from 0ip/nf John McLear 2012-01-26 14:20:03 -08:00
  • 044d852beb Merge 57075d1545 into 622068183a GitHub Merge Button 2012-01-26 08:24:17 -08:00
  • 57075d1545 Beautified html, sticky chat, dynamic inputs, beautified qr-code, fixed chat bug Robin 2012-01-26 17:22:44 +01:00
  • 622068183a Revert "Text color changes based on author color" Peter 'Pita' Martischka 2012-01-26 12:57:57 +01:00
  • d370a5b76f Improved npm and node version checks Peter 'Pita' Martischka 2012-01-26 12:55:54 +01:00
  • 9f9eb6e928 Merge branch 'master' of github.com:Pita/etherpad-lite Peter 'Pita' Martischka 2012-01-26 12:40:23 +01:00
  • a408a2d43b Merge pull request #359 from booo/master Peter 'Pita' Martischka 2012-01-25 13:58:03 -08:00
  • c6dfcbe5c8 Merge 87b11045e1 into 917732422d GitHub Merge Button 2012-01-25 13:02:27 -08:00
  • 87b11045e1 fix issue #281? booo 2012-01-25 22:00:08 +01:00
  • 917732422d fix minor bug where chat would overlay document scroll bar and also ensure rounded edges John McLear 2012-01-25 19:06:41 +00:00