Commit Graph

  • eeb8e82771 Remove an extra space Adam Niederer 2017-03-11 21:27:34 -0500
  • bc0eff6dd0 Localisation updates from https://translatewiki.net. translatewiki.net 2017-03-06 08:49:04 +0100
  • 9515109308 Localisation updates from https://translatewiki.net. translatewiki.net 2017-02-27 07:48:12 +0100
  • 393f651770 Localisation updates from https://translatewiki.net. translatewiki.net 2017-02-23 09:00:01 +0100
  • e95395a88f Merge pull request #3141 from ether/fix_ie10_test Luiza Pagliari 2017-02-20 07:50:38 -0300
  • 2b96a961e3 [fix] Remove extra whitespace on helper tests for IE Luiza Pagliari 2017-02-20 06:14:27 -0300
  • 15cda0fde6 [refactor] Use better way to select a single line Luiza Pagliari 2017-02-20 06:03:56 -0300
  • 92be656113 [test] Fix helper tests for IE Luiza Pagliari 2017-02-20 06:02:31 -0300
  • 203a48b42d Merge pull request #3136 from joassouza/fix_minify Luiza Pagliari 2017-02-08 04:14:44 -0200
  • 0025613ba6 Refactor code joassouza 2017-02-07 15:06:49 -0200
  • d1e6c8492d Fix minification of code joassouza 2017-02-07 13:04:22 -0200
  • 306e63c3f5 Localisation updates from https://translatewiki.net. translatewiki.net 2017-02-06 07:52:00 +0100
  • 1500ed63f0 Merge pull request #3135 from storytouch/develop Luiza Pagliari 2017-02-03 06:48:26 -0200
  • 02bd4a31af [fix] Fix drag and drop tests for IE Luiza Pagliari 2017-02-03 06:47:33 -0200
  • a6436ac8d2 Merge pull request #3119 from storytouch/fix_3118 Luiza Pagliari 2017-02-02 17:54:20 -0200
  • f5810957b4 This WA is not longer required in the newest Chrome see comments in the issue: ether#2078 The hack is still necessary in Firefox 51 Pablo Saavedra 2017-02-02 10:45:59 +0100
  • 40f54fed38 Merge pull request #3131 from Sjord/remove-outdated-comment Stefan 2017-01-29 12:54:17 +0100
  • 21a6e66e25 Remove deprecated comment Sjoerd Langkemper 2017-01-26 09:59:09 +0100
  • f2a22f197d Merge pull request #3123 from Sjord/fix-hook-called-from Luiza Pagliari 2017-01-17 12:19:29 -0200
  • d48395089c Update called from for two hooks Sjoerd Langkemper 2017-01-17 14:59:24 +0100
  • d65ab4d80b Merge pull request #3122 from tpltnt/freebsd-pkg-fix Luiza Pagliari 2017-01-12 18:21:33 -0200
  • 6e1bf9dc90 added curl as dependency tpltnt 2017-01-12 20:50:31 +0100
  • 520f257ed1 [chore] Use helper plugin when running tests on Travis Luiza Pagliari 2017-01-12 13:04:32 -0200
  • b2d9f57338 [fix] Consider line attribs of plugins when building changesets Luiza Pagliari 2017-01-12 12:31:42 -0200
  • cc69e76200 redirect /admin properly (fix #3114) noerw 2017-01-06 18:18:55 +0100
  • deed74c8c8 Localisation updates from https://translatewiki.net. Niklas Laxström 2017-01-02 09:00:13 +0100
  • f217e29071 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-12-29 08:24:55 +0100
  • 087d4ad95c Merge pull request #3106 from alxlo/develop Luiza Pagliari 2016-12-27 10:12:07 -0200
  • cd7f01f40a minor changes in docs - correct link to doc generation tool. - fixed incomplete sentence regarding API client libraries Alexander Lorz 2016-12-26 20:18:34 +0100
  • 423d8e584e Merge pull request #3103 from ether/master Stefan 2016-12-23 23:12:32 +0100
  • 9f51432175 Update CHANGELOG.md Stefan 2016-12-23 22:12:18 +0100
  • 8992dd665a Merge new release into master branch! Stefan 2016-12-23 22:00:34 +0100
  • 6dc808ad54 Release version 1.6.1 Stefan 2016-12-23 21:59:57 +0100
  • b8a4648d6d Merge pull request #3101 from Gared/fix_crash_on_invalid_export Stefan 2016-12-23 21:14:56 +0100
  • caabb4d8f7 Update nodejs for windows to 6.9.2 Stefan 2016-12-22 23:15:49 +0100
  • be9ff4a0de Fixed crash on invalid export url Stefan 2016-12-22 23:04:06 +0100
  • efb25f417a Merge pull request #2993 from ether/fixes-2945 Stefan 2016-12-20 22:08:05 +0100
  • a1ec061017 Merge pull request #3053 from danfuzz/fix-timeslider-lists Stefan 2016-12-20 22:06:31 +0100
  • db21a25eff Merge pull request #3000 from Gared/improve_cookies Stefan 2016-12-20 22:00:12 +0100
  • 8084400e13 Try to init cookies before testing if it exists Stefan 2016-12-20 21:57:01 +0100
  • aefa617797 Merge branch 'develop' into improve_cookies Stefan 2016-12-20 21:31:11 +0100
  • 368bbe4836 Merge pull request #3084 from Gared/fix_npm_node7 Stefan 2016-12-20 00:07:26 +0100
  • db94ce9413 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-12-19 07:36:35 +0100
  • d13a28a1ea Localisation updates from https://translatewiki.net. Niklas Laxström 2016-12-15 07:31:34 +0100
  • 01d23b1f6a Merge pull request #2929 from xavidotron/develop Luiza Pagliari 2016-12-13 06:12:26 -0200
  • da5ae8b1f7 Merge pull request #3085 from Gared/fix_socketio_options Stefan 2016-12-12 23:40:29 +0100
  • 9d3f5781eb Merge pull request #3086 from Gared/update_node_for_windows Stefan 2016-11-30 19:32:46 +0100
  • b41b4726d6 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-11-24 08:24:37 +0100
  • 352cec1811 Updated socket.io to 1.6.0 Stefan 2016-11-20 12:44:59 +0100
  • d1d2e462d0 Updated node for windows build to version 6.9.1 Stefan 2016-11-20 12:32:36 +0100
  • 39a3bedb7b Updated option parameters for socket.io to work with latest version Stefan 2016-11-20 12:27:27 +0100
  • 00c9caf7a3 Updated npm to 4.0.2 and removed recursive searching for ep-plugins Stefan 2016-11-20 11:28:17 +0100
  • 602fd4629a Localisation updates from https://translatewiki.net. Siebrand Mazeland 2016-11-17 09:50:45 +0100
  • c76af79471 Merge pull request #3080 from ldidry/document-undocumented-API-function-restoreRevision Luiza Pagliari 2016-11-16 19:34:12 -0200
  • 2341d09807 Add undocumented API function restoreRevision to doc Luc Didry 2016-11-16 10:35:38 +0100
  • 0497e12d7b Merge pull request #3077 from pcarver/typo-fix Luiza Pagliari 2016-11-14 10:50:18 -0200
  • 573b55af8b Correct the spelling of occured to occurred Paul Carver 2016-11-11 12:46:40 -0500
  • 223127bf39 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-11-01 07:59:29 +0100
  • 7dd934f714 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-10-17 20:19:22 +0200
  • 2c69511c62 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-10-13 08:00:32 +0200
  • 965af5a40b Localisation updates from https://translatewiki.net. Niklas Laxström 2016-10-06 07:41:01 +0200
  • 428e0cdbc2 Merge pull request #3044 from rugk/patch-3 Stefan 2016-09-30 23:49:21 +0200
  • f29e813ca0
    Merge https://github.com/ether/etherpad-lite into patch-3 rugk 2016-09-30 19:20:40 +0200
  • f289611ba9 Merge pull request #3059 from paper-pauper/librejs John McLear 2016-09-28 23:02:40 +0100
  • 93ca44f005 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-09-27 13:58:36 +0200
  • b6e5a2283b Localisation updates from https://translatewiki.net. Niklas Laxström 2016-09-22 07:27:50 +0200
  • 97fd1ab2fe Added LibreJS support Nobody Really 2016-09-20 09:06:07 +0200
  • 32eb6a2288 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-09-15 08:18:13 +0200
  • 7ecf240d9e Localisation updates from https://translatewiki.net. Niklas Laxström 2016-09-13 07:44:27 +0200
  • 0a9d02562d Handle relative paths properly, when `@import`ing. Dan Bornstein 2016-09-09 12:59:02 -0700
  • d7940cf8c5 Harmonize list- and indent-related CSS in the pad editor and timeslider. Dan Bornstein 2016-09-09 12:33:46 -0700
  • a5a7ebea3d Handle `@import` during CSS minification. Dan Bornstein 2016-09-09 12:32:24 -0700
  • 7dd252f763 Merge pull request #3045 from danfuzz/extract-export-css Luiza Pagliari 2016-09-08 19:15:10 -0300
  • a0403ffc22 Remove unused parameter `noDocType`. Dan Bornstein 2016-09-08 09:46:13 -0700
  • 879ae7c67d Remove the `noDocType` argument, which was only ever passed as `false`. Dan Bornstein 2016-09-08 09:41:23 -0700
  • 5022912895 Merge pull request #3048 from danfuzz/fix-first-line-margin-top Luiza Pagliari 2016-09-08 05:59:36 -0300
  • b502c855d2 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-09-08 10:08:19 +0200
  • fd7591c110 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-09-05 07:14:04 +0200
  • a3765d9785 Account for any top margin on the first line. Dan Bornstein 2016-08-30 11:10:17 -0700
  • 8ad9d4f6dd Localisation updates from https://translatewiki.net. Niklas Laxström 2016-08-25 07:33:25 +0200
  • 6d7f128b87 Use an EEJS template for HTML export instead of inlining it in the JS code. Dan Bornstein 2016-08-24 10:54:52 -0700
  • d6da6b3c63 Merge pull request #3027 from rugk/patch-2 Luiza Pagliari 2016-08-23 17:23:47 -0300
  • b5632b3ac5 Index: No-referrer rugk 2016-08-23 22:12:40 +0200
  • bf99cf92ab Pad: Add no-referrer rugk 2016-08-23 22:12:12 +0200
  • 8f133abacc Timeslider: Add no-referrer rugk 2016-08-23 22:11:11 +0200
  • 45266f90a3 Merge pull request #3042 from storytouch/fix_dnd Luiza Pagliari 2016-08-22 18:52:01 -0300
  • ea562250d9 Perform drag and drop in one changeset, so UNDO works properly. Fix #3041 Luiza Pagliari 2016-08-22 18:44:17 -0300
  • bd20d44e89 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-08-18 07:52:23 +0200
  • f147146519 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-08-15 08:08:30 +0200
  • 9fc72194d9 Merge pull request #3035 from danfuzz/fix-docs Luiza Pagliari 2016-08-12 17:45:58 -0300
  • 219a1dc3e3 Fix value to be valid JSON. Dan Bornstein 2016-08-12 11:05:40 -0700
  • 2996f0fad7 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-08-04 07:57:38 +0200
  • 08b90437c1 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-08-01 08:08:45 +0200
  • cf3aaa334f Localisation updates from https://translatewiki.net. Niklas Laxström 2016-07-28 07:59:29 +0200
  • 17726856c6 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-07-25 07:56:41 +0200
  • f4bbe00322 Download JQuery over HTTPS rugk 2016-07-23 16:59:47 +0200
  • 81b11be54a Merge pull request #3026 from storytouch/develop Luiza Pagliari 2016-07-21 15:42:38 -0300
  • c92e3e4b5e Fix #2918. Re-enable editor after user is reconnected to server Luiza Pagliari 2016-07-21 15:23:14 -0300
  • 3fcc7aa190 Localisation updates from https://translatewiki.net. Niklas Laxström 2016-07-18 08:48:25 +0200
  • a2ee1d0b3f Merge pull request #3009 from storytouch/selectMultipleLinesOnFESpecs Luiza Pagliari 2016-07-15 15:05:54 -0300