Commit graph

  • e552e74feb Merge pull request #1486 from ether/please-wait-msg John McLear 2013-02-10 07:19:46 -08:00
  • c8e8a72889 Merge 6aeed1268e into 6d2b1488d6 John McLear 2013-02-10 07:19:30 -08:00
  • 6aeed1268e change message John McLear 2013-02-10 15:19:28 +00:00
  • 6d2b1488d6 Reformat access log messages to improve readability Marcel Klehr 2013-02-10 16:14:48 +01:00
  • 3760b97170 Merge pull request #1489 from marcelklehr/feature/log-client-ips John McLear 2013-02-10 07:09:56 -08:00
  • bce4da3402 Merge ee89696c4d into 2634e8120a Marcel Klehr 2013-02-10 07:08:31 -08:00
  • ee89696c4d Log the client ip on pad access with logger 'access' Marcel Klehr 2013-02-10 16:03:49 +01:00
  • 2634e8120a Merge pull request #1485 from ether/readme-placeholder John McLear 2013-02-10 05:59:33 -08:00
  • c92fbf2cc7 Merge 8f2025067b into 6191b01633 John McLear 2013-02-10 05:35:53 -08:00
  • 6191b01633 Merge pull request #1477 from ether/fix-opera-double-enter Marcel Klehr 2013-02-10 05:10:38 -08:00
  • c10728afe7 Merge a45a8a837d into 98d45af0f9 John McLear 2013-02-10 05:10:13 -08:00
  • 85f18d1f92 no longer dep on npm as it's native John McLear 2013-02-10 03:39:20 +00:00
  • f617cefe54 no need for jshint and update wd John McLear 2013-02-10 03:30:08 +00:00
  • 3a73aa2f48 please wait msg John McLear 2013-02-10 03:17:04 +00:00
  • 8f2025067b remove one less warning during install by having a readme placeholder John McLear 2013-02-10 03:04:08 +00:00
  • 98d45af0f9 Merge pull request #1484 from disy-mk/develop John McLear 2013-02-09 18:18:40 -08:00
  • 0bbbabe775 Merge 98a9b1e222 into cd77f3e637 Manuel Knitza 2013-02-09 17:57:38 -08:00
  • 98a9b1e222 update jquery 1.7.1 -> 1.9.1 Manuel Knitza 2013-02-10 02:55:50 +01:00
  • 7b3d567d0c .browser() support Manuel Knitza 2013-02-10 02:53:07 +01:00
  • cd77f3e637 Merge pull request #1483 from 0ip/ua John McLear 2013-02-09 17:47:34 -08:00
  • 7389e90cd0 update jquery 1.7.1 -> 1.9.1 Manuel Knitza 2013-02-10 02:37:17 +01:00
  • 97111baebb Merge 57adcc2dd6 into 56de6937e2 Manuel Knitza 2013-02-09 17:33:54 -08:00
  • d4eb7f14e2 Merge c3a29d1480 into 56de6937e2 0ip 2013-02-09 13:35:12 -08:00
  • c3a29d1480 Add missing export entry for the browser object 0ip 2013-02-09 22:35:10 +01:00
  • 7ddfdc3935 Add UA functions 0ip 2013-02-09 22:26:47 +01:00
  • 56de6937e2 Merge pull request #1480 from 0ip/admin-ui John McLear 2013-02-09 12:43:49 -08:00
  • a0afcab56f Merge 8a6b3c90e2 into 43b2971a54 0ip 2013-02-09 12:36:02 -08:00
  • 8a6b3c90e2 Fix loader styling 0ip 2013-02-09 21:29:11 +01:00
  • 8fb8f0d3b6 Change settings layout 0ip 2013-02-09 21:22:23 +01:00
  • 60158a71cd Merge a93ff37879 into 43b2971a54 John McLear 2013-02-09 12:20:45 -08:00
  • 40734e6776 Fix table CSS 0ip 2013-02-09 20:58:57 +01:00
  • ad54369bf1 Add doctype 0ip 2013-02-09 20:57:41 +01:00
  • a45a8a837d stop opera doing stupid things John McLear 2013-02-09 19:44:13 +00:00
  • 21e1422be6 Drop 'lite' occurrences in /admin/* 0ip 2013-02-09 20:42:47 +01:00
  • 52ff28dea0 Fix data attribute 0ip 2013-02-09 20:34:12 +01:00
  • d2409288be Add data-title for responsive tables 0ip 2013-02-09 20:15:41 +01:00
  • 43b2971a54 Merge pull request #1476 from ether/enable-timeslider-tests Marcel Klehr 2013-02-09 09:28:58 -08:00
  • fbb1903b39 Merge 6651ed0b7a into 0bd86f1fe3 John McLear 2013-02-09 09:19:23 -08:00
  • 6651ed0b7a allow all timeslider tests to run John McLear 2013-02-09 17:18:13 +00:00
  • 0bd86f1fe3 Merge pull request #1475 from ether/doc-fix-2 John McLear 2013-02-09 09:03:59 -08:00
  • f6cc2891f5 Merge 280b3a404c into ab04a4e511 John McLear 2013-02-09 09:03:46 -08:00
  • 280b3a404c doh, doc fix John McLear 2013-02-09 17:02:54 +00:00
  • 34fd7726bd Fix :admin/index links 0ip 2013-02-09 17:55:11 +01:00
  • d001a7e040 it's time to move on John McLear 2013-02-09 16:54:44 +00:00
  • b04e99bddc Tweak admin-UI 0ip 2013-02-09 17:54:39 +01:00
  • 6516ad0fc4 begin dropping Lite John McLear 2013-02-09 16:52:27 +00:00
  • dd29096ad7 Normalize view-ports 0ip 2013-02-09 17:47:52 +01:00
  • a93ff37879 fix opera by recreating a scheduler object John McLear 2013-02-09 16:42:47 +00:00
  • ef0a6ce5ff Remove top-border 0ip 2013-02-09 17:39:08 +01:00
  • 519d0b9c1b Merge fa289cfd4a into ab04a4e511 Chad Weider 2013-02-09 08:31:47 -08:00
  • ab04a4e511 Merge pull request #1472 from ether/plugin-test-dcs Marcel Klehr 2013-02-09 07:57:33 -08:00
  • 95e2da3fe6 Merge bb1d462612 into 5f79546c2a John McLear 2013-02-09 07:45:44 -08:00
  • bb1d462612 plugin test docs John McLear 2013-02-09 15:45:00 +00:00
  • 5f79546c2a Merge pull request #1465 from mluto/kill-ep-stuff Marcel Klehr 2013-02-08 13:21:57 -08:00
  • 2066fc0a29 Merge f2cd9e3adc into af022c8427 mluto 2013-02-08 13:12:38 -08:00
  • f2cd9e3adc Removed sidebar-code since the sidebar got removed in EPL, there is only the stickychat which is not affected by this. mluto 2013-02-08 22:06:28 +01:00
  • e6454af5ed Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP mluto 2013-02-08 22:00:17 +01:00
  • 89bef4cd76 Merge 7002a6cd42 into 7a0ad3235a davd Weir 2013-02-07 13:31:28 -08:00
  • 7002a6cd42 Update LICENSE davd Weir 2013-02-07 21:28:03 +00:00
  • af022c8427 Merge pull request #1468 from mluto/fix-timeslider-test John McLear 2013-02-07 08:38:36 -08:00
  • 7e79068e8c Merge ae6a9c25ae into f65ad93fb9 mluto 2013-02-07 08:35:45 -08:00
  • ae6a9c25ae Fixed "jumps to a revision given in the url" test mluto 2013-02-07 17:34:31 +01:00
  • f65ad93fb9 Merge pull request #1467 from ether/fix-timeslider-tests John McLear 2013-02-07 07:52:13 -08:00
  • 4ec78ea6bf Merge 8c0fb090eb into ea04e9c997 John McLear 2013-02-07 07:51:41 -08:00
  • 8c0fb090eb works in all 3 major browsers John McLear 2013-02-07 15:50:59 +00:00
  • 52afe86377 Merge branch 'develop' of github.com:ether/etherpad-lite into fix-timeslider-tests John McLear 2013-02-07 15:27:43 +00:00
  • f42d3820a5 fix timeslider tests John McLear 2013-02-07 15:24:30 +00:00
  • ea04e9c997 Merge pull request #1466 from mluto/timeslider-remove-debugging John McLear 2013-02-07 06:36:30 -08:00
  • 708745a279 Merge fc60ab24fa into 889cec8f7c mluto 2013-02-07 06:35:48 -08:00
  • fc60ab24fa Removed debug code, moved hash-setting after the param-checking mluto 2013-02-07 15:34:10 +01:00
  • 0d5b98a338 Removed isProPad, since all pads are public except for group-pads mluto 2013-02-07 14:30:09 +01:00
  • 0cbd4034b1 Killed pad_docbar.js as it's from the old etherpad and not used mluto 2013-02-07 13:59:41 +01:00
  • 889cec8f7c Merge pull request #1464 from mluto/old-chat-code John McLear 2013-02-07 04:12:46 -08:00
  • 5280b92ea4 Merge 6e8dcee650 into e78879c300 mluto 2013-02-07 02:19:31 -08:00
  • 6e8dcee650 Removed old chat-code mluto 2013-02-07 11:15:16 +01:00
  • e78879c300 Merge pull request #1461 from ether/slider-nan John McLear 2013-02-06 15:45:39 -08:00
  • bf22020cbf Merge 284748adb7 into 7bf8dad6f9 John McLear 2013-02-06 15:45:37 -08:00
  • 7bf8dad6f9 Merge pull request #1460 from ether/timeslider-labels John McLear 2013-02-06 15:43:54 -08:00
  • 3aed487e86 Merge e4032f4d74 into 488ebc20a4 John McLear 2013-02-06 15:43:46 -08:00
  • 488ebc20a4 Merge pull request #1446 from ether/allow-plugins-to-specify-specs John McLear 2013-02-06 15:43:39 -08:00
  • 30ee8a494a Merge de07d5a3e1 into a9436f290a John McLear 2013-02-06 15:43:24 -08:00
  • a9436f290a Merge pull request #1457 from ether/fix-IE8-error John McLear 2013-02-06 15:43:18 -08:00
  • fdbb351a56 Merge 284748adb7 into 8186cc59d8 John McLear 2013-02-06 15:37:36 -08:00
  • 8186cc59d8 Merge pull request #1459 from ether/timeslider-labels John McLear 2013-02-06 15:37:31 -08:00
  • a8bc88f8d4 Merge e4032f4d74 into 7a0ad3235a John McLear 2013-02-06 15:37:02 -08:00
  • 284748adb7 stop slider showing NaN on tiny pads John McLear 2013-02-06 23:35:58 +00:00
  • e4032f4d74 timeslider label tests John McLear 2013-02-06 23:28:46 +00:00
  • 324a6290ba Merge adaded343d into 5b31030958 John McLear 2013-02-06 12:10:09 -08:00
  • adaded343d better fix for IE8 page up down John McLear 2013-02-06 20:09:30 +00:00
  • 9fcabfa8ac fix IE8 styling y u no do this 0ip? root 2013-02-06 20:02:24 +00:00
  • 3896553432 redirect to teampad area if not allowed to access this pad Robert Helmer 2013-01-23 15:18:26 -08:00
  • e47aac423c small style change to manage teams link ossreleasefeed 2013-01-23 21:45:53 +02:00
  • 9212a39cff teampad feature Robert Helmer 2013-01-23 12:04:06 -08:00
  • 0f2d542bbe stackato support Robert Helmer 2013-01-23 11:53:08 -08:00
  • dd49c71af9 fixes IE8 error by only redifining if firefox John McLear 2013-02-06 19:43:28 +00:00
  • 5b31030958 Merge pull request #1454 from dmitryuv/feature/socketio-rooms John McLear 2013-02-05 16:09:25 -08:00
  • 7cfc790cdf Merge 34f9f15150 into a5fb1e33de dmitryuv 2013-02-05 11:35:49 -08:00
  • 34f9f15150 socket.io rooms instead of own session management Dmitry 2013-02-05 23:33:44 +04:00
  • 2affccf900 allow for 404 files and be graceful if one doesnt exist John McLear 2013-02-04 22:00:31 +00:00
  • a5fb1e33de Merge pull request #1447 from jhollinger/develop John McLear 2013-02-04 07:07:47 -08:00