Commit graph

  • ab8b2cae21 Remove nonsense styles. Chad Weider 2012-02-29 16:02:16 -08:00
  • dc0fb12b09 Remove onclick attributes from editbar. Chad Weider 2012-02-29 14:13:02 -08:00
  • def904dbed remove wordle John McLear 2012-05-13 20:20:18 +01:00
  • dc8495765f Merge branch 'develop' of git://github.com/Pita/etherpad-lite into removeWordle John McLear 2012-05-13 20:15:39 +01:00
  • a3075b2137 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into develop John McLear 2012-05-13 14:56:29 +01:00
  • 916e52a1eb Merge pull request #609 from prauscher/disable-passwords John McLear 2012-05-13 06:55:47 -07:00
  • f29f5ffd0e Merge 0e7cb78ec2 into c70d88eedc GitHub Merge Button 2012-05-13 06:54:54 -07:00
  • f1562ab568 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-05-13 14:53:29 +01:00
  • c70d88eedc Merge pull request #667 from fourplusone/feature/cleaner_code John McLear 2012-05-13 06:51:58 -07:00
  • 55d7f9f012 Merge 18d0c81181 into 99ecadc0c3 GitHub Merge Button 2012-05-13 03:16:57 -07:00
  • 99ecadc0c3 Fix #655, wrong located APIKEY.txt 0ip 2012-05-13 00:34:26 +03:00
  • 476065b68d Merge pull request #627 from edy-b/body-block John McLear 2012-05-12 14:18:28 -07:00
  • 9fb27209b9 Merge 47a257ff72 into c406d076de GitHub Merge Button 2012-05-02 09:13:00 -07:00
  • c406d076de Updated socket.io 0ip 2012-05-02 19:12:57 +03:00
  • 47a257ff72 accidentally deleted an end block in last merge Edy 2012-05-01 12:02:12 +02:00
  • 1329e93639 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block Edy 2012-05-01 11:35:06 +02:00
  • b5f92edec1 just fixing somet paths in the checkpad script.. adammawson 2012-04-30 18:24:38 +01:00
  • 73a962e6ca Correct dependency paths for checkPad script. John McLear 2012-04-30 19:23:41 +02:00
  • 40af25d282 Merge pull request #685 from 0ip/typo John McLear 2012-04-30 08:00:05 -07:00
  • 20b94ca96a Merge 64db697558 into 7a09d97731 GitHub Merge Button 2012-04-30 07:56:04 -07:00
  • 64db697558 Fixed typos 0ip 2012-04-30 16:54:19 +02:00
  • 7a09d97731 Fix #683 - Disabling authorship colors doesn't work 0ip 2012-04-30 17:40:29 +03:00
  • 34a2f8cb5d Merge pull request #684 from 0ip/remove_qr_code John McLear 2012-04-30 06:57:42 -07:00
  • d697eab35b Merge 23cdb2a5c6 into 96eb8ac004 GitHub Merge Button 2012-04-30 06:56:58 -07:00
  • 23cdb2a5c6 Removed QR-Code 0ip 2012-04-30 15:54:21 +02:00
  • cf54c23228 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block Edy 2012-04-30 15:17:23 +02:00
  • fa9f5376fc Merge 74047b77cc into 96eb8ac004 GitHub Merge Button 2012-04-29 11:19:36 -07:00
  • 96eb8ac004 100% is not needed here http://ragefac.es/416 0ip 2012-04-29 21:19:34 +03:00
  • e5ffe77af5 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-04-29 19:13:51 +01:00
  • bf568b3477 Merge pull request #682 from fourplusone/fix/fix-677 John McLear 2012-04-29 11:13:45 -07:00
  • d1244418be Merge fa622857b9 into 122986798e GitHub Merge Button 2012-04-29 11:13:33 -07:00
  • fa622857b9 fixed plugins.js Matthias Bartelmeß 2012-04-29 20:12:15 +02:00
  • e33b131696 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-04-29 19:11:34 +01:00
  • 122986798e Merge pull request #681 from fourplusone/fix/fix-677 John McLear 2012-04-29 11:11:25 -07:00
  • 8ee86309ce Merge cbb5a043b8 into a73192b10d GitHub Merge Button 2012-04-29 11:10:26 -07:00
  • cbb5a043b8 fixed socket.io in timeslider.js Matthias Bartelmeß 2012-04-29 20:04:00 +02:00
  • 18b7340d87 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-04-29 18:57:51 +01:00
  • a73192b10d Merge pull request #680 from fourplusone/fix/fix-677 John McLear 2012-04-29 10:57:35 -07:00
  • 16e60f77a4 Merge 0e941b498e into f6bdbddfcc GitHub Merge Button 2012-04-29 10:57:18 -07:00
  • 0e941b498e fix #677 Matthias Bartelmeß 2012-04-29 19:54:38 +02:00
  • 3b9bcf178a Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-04-29 16:11:29 +01:00
  • f6bdbddfcc Merge pull request #679 from 0ip/highl_mod John McLear 2012-04-29 08:10:52 -07:00
  • f5df012048 Merge 2525f20ff4 into c969e11a6b GitHub Merge Button 2012-04-29 07:16:48 -07:00
  • c969e11a6b Merge pull request #678 from 0ip/admin_rel_paths John McLear 2012-04-29 07:16:45 -07:00
  • 2525f20ff4 Tidied up highlighting for currently opened module 2 0ip 2012-04-29 02:48:47 +02:00
  • 4b272fe2e1 Tidied up highlighting for currently opened module 0ip 2012-04-29 01:00:31 +02:00
  • 8443d3cbc2 Merge c11df112e8 into 83648481c3 GitHub Merge Button 2012-04-28 13:03:28 -07:00
  • c11df112e8 templates/plugins.html Fixed relative paths 0ip 2012-04-28 22:00:15 +02:00
  • dbf21bf021 Merge e4c34b0bed into 83648481c3 GitHub Merge Button 2012-04-26 08:14:49 -07:00
  • e4c34b0bed removed debug code Matthias Bartelmeß 2012-04-26 17:14:31 +02:00
  • ec65ded0c8 removing the need for requireAuthorization setting since its now determinated automatically whether auth. plugins are registered Matthias Bartelmeß 2012-04-26 16:53:37 +02:00
  • dce07ceeed Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-04-25 17:51:28 +01:00
  • c173ebe197 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads Egil Moeller 2012-04-25 17:51:03 +02:00
  • 83648481c3 Merge pull request #671 from fourplusone/fix/baseurl John McLear 2012-04-25 07:01:53 -07:00
  • 4baed40d6b Merge 513deef768 into d554420f57 GitHub Merge Button 2012-04-25 07:01:47 -07:00
  • 513deef768 added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670 Matthias Bartelmeß 2012-04-25 10:23:58 +02:00
  • c05ec84489 Merge e559ef5640 into d554420f57 GitHub Merge Button 2012-04-23 07:52:19 -07:00
  • e559ef5640 Disable design mode in readonly pad Egil Moeller 2012-04-23 16:41:41 +02:00
  • ba3430ebb7 Corect ReadOnly link Egil Moeller 2012-04-23 16:20:55 +02:00
  • 480d0b8e25 ReadOnly pad handling Egil Moeller 2012-04-23 16:18:14 +02:00
  • ed7e254417 Disconnect handling and cleanup of unused code Egil Moeller 2012-04-23 14:47:07 +02:00
  • e5a22423bb Fixed timedelta problem Egil Moeller 2012-04-23 14:20:17 +02:00
  • 1faae5b756 Timeslider autoupdate on pad change Egil Moeller 2012-04-23 13:29:27 +02:00
  • 583743a3f9 Restored saved revision support Egil Moeller 2012-04-23 12:58:04 +02:00
  • 914d79ad20 Unified timeslider and pad editing protocol / component Egil Moeller 2012-04-23 12:52:30 +02:00
  • 3d862b8bde Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-04-22 14:51:28 +01:00
  • 18d0c81181 adding padutils to padmodals Matthias Bartelmeß 2012-04-21 14:57:22 +02:00
  • a557f2414e cssManager top is not used, so drop it Matthias Bartelmeß 2012-04-21 13:47:11 +02:00
  • d554420f57 Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing) John McLear 2012-04-21 01:23:13 +02:00
  • 3798f53f94 Merge pull request #660 from redhog/master John McLear 2012-04-20 16:21:04 -07:00
  • 9c977d68f0 Merge d08f3ff5ee into 16edda7d46 GitHub Merge Button 2012-04-20 16:18:15 -07:00
  • d08f3ff5ee Bugfix dependencies Egil Moeller 2012-04-21 01:17:27 +02:00
  • 9d9b7b7b47 Merge branch 'develop' into feature/cleaner_code Matthias Bartelmeß 2012-04-21 00:34:32 +02:00
  • 937524ab8c Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-04-20 23:16:19 +01:00
  • 16edda7d46 luke warm fix. John McLear 2012-04-21 00:16:10 +02:00
  • ee77257636 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-04-20 23:13:31 +01:00
  • a5210ab27d Merge pull request #647 from etinquis/fixes John McLear 2012-04-20 15:10:40 -07:00
  • 8fefb551fc less verbose startup, better log messages at startup Matthias Bartelmeß 2012-04-20 22:44:10 +02:00
  • 7f50e8f551 server.js can be called from console. Matthias Bartelmeß 2012-04-20 22:40:33 +02:00
  • c90ef5aeb8 default dirty.db to current pwd, so no new directory has to be created Matthias Bartelmeß 2012-04-20 22:39:16 +02:00
  • e9fc16a974 warn if dirty db is used Matthias Bartelmeß 2012-04-20 17:03:37 +02:00
  • 90bbf169b2 allow startup without settings file Matthias Bartelmeß 2012-04-20 17:03:26 +02:00
  • 6fc45d6252 added etherpad-lite to "bin" in package.json Matthias Bartelmeß 2012-04-20 17:00:32 +02:00
  • c9416cf921 Merge da75b87d3c into b6be00c3ab GitHub Merge Button 2012-04-20 06:12:39 -07:00
  • b6be00c3ab Merge pull request #659 from redhog/master John McLear 2012-04-20 06:12:34 -07:00
  • 9691f02765 removing Minify.js.rej Matthias Bartelmeß 2012-04-20 15:12:20 +02:00
  • d747078285 Merge 9a67a3a1db into 0a9fcc267f GitHub Merge Button 2012-04-20 06:09:51 -07:00
  • 9a67a3a1db Removed debug print Egil Moeller 2012-04-20 15:08:50 +02:00
  • 0a9fcc267f Merge pull request #658 from redhog/master John McLear 2012-04-20 05:56:57 -07:00
  • 1e1468fb43 Merge 72c972b256 into a743112170 GitHub Merge Button 2012-04-20 05:39:41 -07:00
  • 72c972b256 Bugfix for recursive dependency-installation and paths Egil Moeller 2012-04-20 14:37:53 +02:00
  • 89ab73c868 removing commented out functions from cssmanager.js Matthias Bartelmeß 2012-04-20 14:25:07 +02:00
  • 8593b1905c getRepHTML seems to be unused. Removing Matthias Bartelmeß 2012-04-20 14:24:44 +02:00
  • 709a3b1dbe removing debug code in collab_client.js Matthias Bartelmeß 2012-04-20 13:34:35 +02:00
  • ab7f7506b9 removed unused functions in collab_client Matthias Bartelmeß 2012-04-20 13:32:43 +02:00
  • 07ee836946 set view zoom is unused Matthias Bartelmeß 2012-04-20 12:19:09 +02:00
  • e661f653b1 sharebox and Feedback are not used. Removing them Matthias Bartelmeß 2012-04-20 12:15:09 +02:00
  • 23bbe4ab5a undo-xpopup seems to be unused Matthias Bartelmeß 2012-04-20 12:03:38 +02:00
  • f809b0d6c8 removing de-facto noop Matthias Bartelmeß 2012-04-20 12:03:11 +02:00
  • 5b339fa458 Merge 3745873e13 into 309e3b0994 GitHub Merge Button 2012-04-19 14:50:50 -07:00