Commit graph

  • 1f596c6d77 Merge fa3020dffd into dae0cbfb53 Marcel Klehr 2012-07-23 05:25:17 -07:00
  • fa3020dffd Display errors occuring on page load to the user. Marcel Klehr 2012-07-23 14:12:36 +02:00
  • c9e8f7e7af Merge pull request #894 from cweider/remove-loopback John McLear 2012-07-23 03:49:29 -07:00
  • 9d25dcc1f9 Merge branch 'develop' into feature/connectivity-toolbar Marcel Klehr 2012-07-23 11:26:15 +02:00
  • 27eb866602 Add loadSettings hook. Marcel Klehr 2012-07-23 11:13:20 +02:00
  • a41cbdbd30 Merge cd11717b99 into 4f79f74be5 Chad Weider 2012-07-23 00:00:15 -07:00
  • cd11717b99 Eliminate the loopback that has been causing so much trouble. Chad Weider 2012-07-22 23:54:38 -07:00
  • 4f79f74be5 Merge pull request #892 from ulikoehler/develop Matthias Bartelmeß 2012-07-22 11:59:31 -07:00
  • f707015856 Merge 14582d1eba into 76933f2b1d Uli Köhler 2012-07-22 10:07:23 -07:00
  • 14582d1eba Escaped title using Security.escapeHTML() Uli Köhler 2012-07-22 19:07:14 +02:00
  • 8630de66bf Added missing newline after closing title tag Uli Köhler 2012-07-22 18:37:38 +02:00
  • 90357e0cdc Added <title> tag to make exported HTML valid Uli Köhler 2012-07-21 21:19:44 +02:00
  • 76933f2b1d Merge pull request #888 from marcelklehr/feature/noscript-notification Matthias Bartelmeß 2012-07-19 04:10:47 -07:00
  • 4628e11364 Merge c3ddff3fa0 into 9aed433ad5 GitHub Merge Button 2012-07-19 02:37:18 -07:00
  • c3ddff3fa0 Notify the user, if JavaScript is disabled. Marcel Klehr 2012-07-19 11:34:14 +02:00
  • c0daf1aaaf adding basic numbered list support to dokuwiki export Jordan Wiens 2012-07-19 00:59:15 -04:00
  • 9aed433ad5 Fix #880 Remove call to padsavedrevs.handleIsFullyConnected Marcel Klehr 2012-07-18 15:54:53 +02:00
  • 6b429b2ca1 Merge pull request #851 from marcelklehr/fix-settings.json Matthias Bartelmeß 2012-07-17 10:27:18 -07:00
  • f9f929295a Merge dc09323d8f into 87908bd1cf GitHub Merge Button 2012-07-17 10:23:59 -07:00
  • 87908bd1cf Merge pull request #881 from MarkTraceur/add-userhook John McLear 2012-07-17 10:14:13 -07:00
  • 00d0b396f5 Merge 9bd23acb3d into b1123d11b6 GitHub Merge Button 2012-07-17 10:13:56 -07:00
  • 9bd23acb3d Add userJoinOrUpdate hook Mark Holmquist 2012-07-17 10:12:10 -07:00
  • 457374c17d Merge 7852bf99fd into b1123d11b6 GitHub Merge Button 2012-07-15 07:57:58 -07:00
  • eb6be84150 Fix html/css Marcel Klehr 2012-07-15 16:03:12 +02:00
  • 4d02b6fe15 Merge 7852bf99fd into dae0cbfb53 GitHub Merge Button 2012-07-14 21:45:51 -07:00
  • 7852bf99fd vim eated spaces and pooped tabs Jordan Wiens 2012-07-15 00:43:35 -04:00
  • a435a77183 Adding basic numbered list support to dokuwiki export Jordan Wiens 2012-07-15 00:37:34 -04:00
  • b1123d11b6 Correct path 0ip 2012-07-14 20:35:26 +03:00
  • 4901adeac7 Fix timeslider. Marcel Klehr 2012-07-14 15:54:44 +02:00
  • 1466fa03a4 Fix some minor mistakes. Marcel Klehr 2012-07-14 15:54:20 +02:00
  • 2d0cf156af Fix showModal animation. Marcel Klehr 2012-07-14 15:14:46 +02:00
  • 4220d6bedd Put loading git back in. Marcel Klehr 2012-07-14 15:12:21 +02:00
  • 9a3cb2c727 Sort the toolbar buttons correctly. Marcel Klehr 2012-07-14 14:54:25 +02:00
  • 444467bef2 Remove connectivity tollbar button. Marcel Klehr 2012-07-14 14:50:52 +02:00
  • 8ab12ee69e Only disable toolbar. Marcel Klehr 2012-07-14 14:46:02 +02:00
  • 84cf741acf Merge pull request #871 from marcelklehr/feature/nice-chat-bubble John McLear 2012-07-13 05:10:25 -07:00
  • 6bda1f8e4d Fix padeditbar.toggleDropDown Marcel Klehr 2012-07-13 09:13:22 +02:00
  • e39235deb2 Merge dc9eda9364 into ead379cf66 GitHub Merge Button 2012-07-12 23:29:24 -07:00
  • 9e9cbd5ffa Fix typo. Marcel Klehr 2012-07-13 08:24:02 +02:00
  • 6da6a7f0d8 Use nice editbar popups for connection status instead of srceen-blocking modals. Marcel Klehr 2012-07-13 08:23:22 +02:00
  • dc9eda9364 Use Tinycon to display chat mentions in favicon. Marcel Klehr 2012-07-12 20:18:33 +02:00
  • ead379cf66 Merge pull request #853 from fourplusone/feature/async_handleMessage Marcel Klehr 2012-07-12 03:50:37 -07:00
  • 2c5e7201b4 Merge 975171a86b into 8882bbff6a GitHub Merge Button 2012-07-12 03:29:38 -07:00
  • 8882bbff6a Merge pull request #865 from marcelklehr/fix/chat-autoscroll Matthias Bartelmeß 2012-07-12 03:26:12 -07:00
  • 4bfb9041c8 Merge f12cb0dd58 into 6726ea6632 GitHub Merge Button 2012-07-12 01:34:46 -07:00
  • f12cb0dd58 Don't screw up, if chat is empty. Marcel Klehr 2012-07-12 10:34:11 +02:00
  • 7653db36fe Revert "option to stop autoscroll" Marcel Klehr 2012-07-12 10:23:55 +02:00
  • a6b22609e4 Merge 2fd7a44c86 into 6726ea6632 GitHub Merge Button 2012-07-11 14:29:57 -07:00
  • 8a471e590a Fix #581 Don't scroll chat automatically if user is not at the bottom Marcel Klehr 2012-07-11 22:30:03 +02:00
  • 6726ea6632 option to stop autoscroll John McLear 2012-07-11 17:42:59 +01:00
  • dc09323d8f Don't exit if no settings file was found. Marcel Klehr 2012-07-11 15:36:41 +02:00
  • f09dd0f3fb Put toString() back in. Marcel Klehr 2012-07-11 15:34:33 +02:00
  • beb6378656 Merge pull request #850 from fourplusone/feature/remove_opt Marcel Klehr 2012-07-10 13:03:44 -07:00
  • 87f26334d1 Fix typo. Marcel Klehr 2012-07-10 21:55:35 +02:00
  • 8858446678 Exit on error. Marcel Klehr 2012-07-10 21:38:14 +02:00
  • eef9cee032 Merge 3a0015c357 into 72532fadc9 GitHub Merge Button 2012-07-10 11:53:41 -07:00
  • dae0cbfb53 Merge pull request #864 from Pita/develop John McLear 2012-07-10 07:59:05 -07:00
  • 4bdabf1c4f Merge 72532fadc9 into 4ca01ba344 GitHub Merge Button 2012-07-10 07:58:49 -07:00
  • 72532fadc9 Merge pull request #863 from jhollinger/develop John McLear 2012-07-10 07:58:23 -07:00
  • 24b5aa5470 Merge a7dd620b9f into 9617ace809 GitHub Merge Button 2012-07-10 07:56:07 -07:00
  • a7dd620b9f Don't crash if setText isn't passed any text. issue #861 Jordan Hollinger 2012-07-10 00:53:55 -04:00
  • 2fd7a44c86 misc indention+newline corrections Matthias Bartelmeß 2012-07-09 16:19:25 +02:00
  • 7dba42c4c9 tabs -> spaces Matthias Bartelmeß 2012-07-09 16:14:05 +02:00
  • 796552edbf more meaningful error message on parse errors Matthias Bartelmeß 2012-07-09 16:13:47 +02:00
  • 732a152f77 added settings2yml Matthias Bartelmeß 2012-07-09 14:21:11 +02:00
  • 1e14b310bf replace settings.json with settings.yml Matthias Bartelmeß 2012-07-09 14:18:20 +02:00
  • 975171a86b Make handleMessage async Matthias Bartelmeß 2012-07-08 21:06:19 +02:00
  • 9617ace809 Merge pull request #849 from marcelklehr/fix-git-version-receiver John McLear 2012-07-08 10:44:55 -07:00
  • 4c8f69b7c5 Use v8 to parse settings.json Marcel Klehr 2012-07-08 18:59:46 +02:00
  • 3a0015c357 remove unused _opt in favor of code size/readability Matthias Bartelmeß 2012-07-08 11:51:04 +02:00
  • df094697db Merge af3c57a120 into 9ff3aa0ee0 GitHub Merge Button 2012-07-08 02:39:38 -07:00
  • af3c57a120 Load npm to enable server to see the git revision. Marcel Klehr 2012-07-08 11:37:24 +02:00
  • 9ff3aa0ee0 make /static/tests.html functional again, added getLastEdited Matthias Bartelmeß 2012-07-07 20:41:26 +02:00
  • 4ca01ba344 Merge pull request #846 from jhollinger/master Matthias Bartelmeß 2012-07-07 11:20:13 -07:00
  • 8db6544119 Merge 6d5fe459f0 into 34fdfcb253 GitHub Merge Button 2012-07-07 10:27:06 -07:00
  • 78f13fd0cb Merge bcc48214ea into f95e2793d7 GitHub Merge Button 2012-07-07 10:24:28 -07:00
  • bcc48214ea Bugfix to getLastEdited API method, issue #845 Jordan Hollinger 2012-07-07 13:23:33 -04:00
  • 6d5fe459f0 Bugfix to getLastEdited API method, issue #845 Jordan Hollinger 2012-07-07 13:22:27 -04:00
  • f95e2793d7 Merge pull request #841 from Pita/releases-1.1.1 1.1.1 John McLear 2012-07-05 10:56:00 -07:00
  • cd2584008b Merge 34fdfcb253 into 4195e11a41 GitHub Merge Button 2012-07-05 10:55:32 -07:00
  • 802537f25a Merge 34fdfcb253 into 4195e11a41 GitHub Merge Button 2012-07-05 10:34:59 -07:00
  • 34fdfcb253 Merge pull request #840 from redhog/master John McLear 2012-07-05 10:34:55 -07:00
  • 56571f9feb Merge 17b6103a3d into d18bb81aad GitHub Merge Button 2012-07-05 10:34:27 -07:00
  • 17b6103a3d Bugfix for broken readonly timeslider Egil Moeller 2012-07-05 19:33:20 +02:00
  • d18bb81aad Correct casing John McLear 2012-07-05 20:33:11 +03:00
  • f9805102f1 actually fix run script ;) johnyma22 2012-07-05 18:30:59 +01:00
  • 4c928a8aac Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-07-05 18:12:35 +01:00
  • 84ee5c901d Merge pull request #839 from marcelklehr/fix-run.sh John McLear 2012-07-05 10:12:16 -07:00
  • 7aa47b8086 Merge 5195f685e2 into bc15ea5c15 GitHub Merge Button 2012-07-05 10:08:38 -07:00
  • 5195f685e2 Correct error message. Marcel Klehr 2012-07-05 19:08:20 +02:00
  • f15ffbb5e4 Allow v0.6.0 on UNIX Marcel Klehr 2012-07-05 19:02:20 +02:00
  • 35bf5d17c0 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-07-05 17:55:30 +01:00
  • bc15ea5c15 Merge pull request #829 from marcelklehr/support-node-0.8 John McLear 2012-07-05 09:54:25 -07:00
  • 56a5c86e73 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-07-05 17:53:50 +01:00
  • 8897febcde Merge 42bbbd426f into 071ddefc39 GitHub Merge Button 2012-07-05 09:53:31 -07:00
  • 071ddefc39 Merge pull request #838 from redhog/master John McLear 2012-07-05 09:53:17 -07:00
  • c4468db0f3 Merge 799a5768c7 into 31ef973c33 GitHub Merge Button 2012-07-05 09:14:31 -07:00
  • 799a5768c7 Quick hack to hide ep_etherpad-lite in plugin list Egil Moeller 2012-07-05 18:13:29 +02:00
  • 42bbbd426f Add latest versions of async, express and connect. Marcel Klehr 2012-07-05 18:11:18 +02:00
  • c01aaeefc1 Allow node v0.6.x and 0.8.x Marcel Klehr 2012-07-05 17:34:23 +02:00