Commit graph

  • de4808b2e7 Merge cb2b93b133 into cf1bba8e65 mluto 2013-01-26 06:08:39 -08:00
  • cb2b93b133 Added getChatHistory and getChatHead (api+code+doc) mluto 2013-01-26 14:35:26 +01:00
  • 046fac9fa9 Added a comment to clearify *why* this works mluto 2013-01-25 20:38:24 +01:00
  • 763864539f Use 'html10n' instead of '_', i10nzed "unnamed author(s)" mluto 2013-01-25 17:41:33 +01:00
  • 4a20a26cbf Merge branch 'develop' of https://github.com/ether/etherpad-lite into hardcoded-i18n mluto 2013-01-25 17:14:56 +01:00
  • cf1bba8e65 Merge pull request #1406 from mluto/fix-en-json Marcel Klehr 2013-01-25 08:11:56 -08:00
  • 5361ca42f0 Merge 509f564cd7 into 2841bfc009 mluto 2013-01-25 08:11:17 -08:00
  • 509f564cd7 re-formated onelined en.json mluto 2013-01-25 17:06:57 +01:00
  • 2841bfc009 Merge branch 'feature/real-time-plugin-search' into develop Marcel Klehr 2013-01-25 14:50:51 +01:00
  • 7812d93e74 Fixed "unnamed" and "enter your name" in userlist mluto 2013-01-25 10:32:09 +01:00
  • 82e681fb14 Update settings.json.template John McLear 2013-01-24 22:39:32 +00:00
  • 568b641ee9 Merge pull request #1404 from ether/feature/real-time-plugin-search John McLear 2013-01-24 14:09:30 -08:00
  • 3e793b8a63 [/admin/plugins] remove progress history Marcel Klehr 2013-01-24 23:00:56 +01:00
  • 1ddcdc4576 Merge 23dd4c73e2 into 19e112f160 Marcel Klehr 2013-01-24 13:41:44 -08:00
  • 23dd4c73e2 pluginfw/installer.js: Don't freak out users with cryptic errors, just use the error message Marcel Klehr 2013-01-24 22:40:31 +01:00
  • fa55cd4759 [/admin/plugins] Add real-time on keypress search Marcel Klehr 2013-01-24 22:39:52 +01:00
  • 19e112f160 Merge pull request #1403 from ether/index-wrapper-block John McLear 2013-01-24 13:37:00 -08:00
  • 121f88cc59 Merge 1f7140345a into ccc06b08ee John McLear 2013-01-24 12:04:58 -08:00
  • 1f7140345a index wrapper block John McLear 2013-01-24 20:03:07 +00:00
  • ccc06b08ee Merge pull request #1402 from marcelklehr/feature/uniform-admin-menu John McLear 2013-01-24 10:00:58 -08:00
  • fff29c1580 Merge 7c06dc750c into 0c3d90b753 Marcel Klehr 2013-01-24 09:58:10 -08:00
  • 7c06dc750c Unify admin page titles Marcel Klehr 2013-01-24 18:46:32 +01:00
  • 2eccaa2afd Add a uniform menu to all admin pages Marcel Klehr 2013-01-24 18:46:15 +01:00
  • 0c3d90b753 Merge pull request #1401 from ether/slider-position Marcel Klehr 2013-01-24 09:00:46 -08:00
  • 51d6e210b5 Merge 569fb8d3c8 into 18b96b33c6 John McLear 2013-01-24 08:50:42 -08:00
  • 569fb8d3c8 silly little bug now resolved John McLear 2013-01-24 16:48:40 +00:00
  • 18b96b33c6 Merge pull request #1379 from ether/more-plugin-details John McLear 2013-01-24 07:29:30 -08:00
  • fa7a5dde7b Merge 3719ce7c5d into 28aa1ecc24 John McLear 2013-01-24 04:51:01 -08:00
  • 3719ce7c5d [admin] Make links prettier Marcel Klehr 2013-01-24 13:50:49 +01:00
  • 9fa5b9506e Add links for installed plugins Marcel Klehr 2013-01-24 13:43:42 +01:00
  • 28aa1ecc24 Merge pull request #1398 from marcelklehr/fix/html10n-ie8-array.indexOf John McLear 2013-01-23 08:49:15 -08:00
  • f2c01ab5a7 Merge 25e1ed2d0c into c632e3d379 Marcel Klehr 2013-01-23 08:47:40 -08:00
  • 25e1ed2d0c Fix Array.prototype.indexOf for IE8! <3 Marcel Klehr 2013-01-23 17:40:10 +01:00
  • c632e3d379 Merge pull request #1396 from goldquest/dev_importfix John McLear 2013-01-23 08:03:08 -08:00
  • 1741101a81 Merge 74185e79ab into 557b5c1ad0 Timo Welde 2013-01-23 07:44:51 -08:00
  • 74185e79ab use the existing padimpexp object from the parent window goldquest 2013-01-23 16:36:37 +01:00
  • 9129c6970a add a html block eejs so you can add a cache manifest John McLear 2013-01-23 02:46:57 +00:00
  • b76f084f3a add eejs block for disconnect John McLear 2013-01-23 01:01:35 +00:00
  • f1b9c213ee and semi working John McLear 2013-01-22 23:37:53 +00:00
  • 3fb2f02875 semi working John McLear 2013-01-22 23:16:49 +00:00
  • d21585b880 mheh John McLear 2013-01-22 23:06:52 +00:00
  • 205d983225 make it crash John McLear 2013-01-22 22:48:05 +00:00
  • 5d416579ee bring in some padDiff stuff that doesnt suck John McLear 2013-01-22 22:33:51 +00:00
  • 6ae46ea8e3 fix issue where url was wrong for install John McLear 2013-01-22 18:28:38 +00:00
  • 557b5c1ad0 Merge pull request #1388 from ether/proper-fix-for-import-url John McLear 2013-01-22 10:20:20 -08:00
  • 2f1509ea0a Merge 159feceb20 into c6882aa65a John McLear 2013-01-22 10:20:11 -08:00
  • f948dff5c9 Merge 159feceb20 into 6b13bfa1e8 John McLear 2013-01-22 10:19:37 -08:00
  • 159feceb20 fix import without params John McLear 2013-01-22 18:17:15 +00:00
  • c6882aa65a Merge pull request #1386 from ether/fix-import-on-params John McLear 2013-01-22 08:05:04 -08:00
  • 50a0ae5d11 Merge e23108d199 into 1725fe318d John McLear 2013-01-22 08:04:55 -08:00
  • 1725fe318d Merge pull request #1385 from goldquest/dev_import-reverseProxy John McLear 2013-01-22 08:04:06 -08:00
  • e23108d199 fix issue #1369 where params would break import John McLear 2013-01-22 16:03:00 +00:00
  • 4215b24481 Merge 666c0adcd2 into 7869a543dd Timo Welde 2013-01-22 07:59:19 -08:00
  • 666c0adcd2 script tag didn't link to right location goldquest 2013-01-22 16:42:56 +01:00
  • 7869a543dd Localisation updates from http://translatewiki.net. Siebrand Mazeland 2013-01-22 06:14:31 +00:00
  • 97afd1cc79 Merge pull request #1383 from disy-mk/patch-2 John McLear 2013-01-21 15:58:00 -08:00
  • ff1c380e77 Merge 7066ed183d into 4204bf9009 Manuel Knitza 2013-01-21 15:57:14 -08:00
  • 7066ed183d Update bin/convert.js Manuel Knitza 2013-01-22 00:56:39 +01:00
  • 441dd3785a fix issue #1110 John McLear 2013-01-20 23:11:59 +00:00
  • 8bfa8a7e73 better urls John McLear 2013-01-20 22:42:32 +00:00
  • 4cbf3869c6 open in external window John McLear 2013-01-20 22:36:58 +00:00
  • 1bf526124d resolve #1349 John McLear 2013-01-20 22:34:27 +00:00
  • e357011e9b Merge 76d571c9fa into 6b13bfa1e8 John McLear 2013-01-20 06:32:46 -08:00
  • 76d571c9fa Merge branch 'develop' of github.com:ether/etherpad-lite into release/releases-1.2.6 John McLear 2013-01-20 14:31:30 +00:00
  • eedd8c6f13 mheh John McLear 2013-01-20 14:17:56 +00:00
  • d2e4ae1cb7 mheh John McLear 2013-01-20 14:16:23 +00:00
  • 4204bf9009 Merge branch 'release/releases-1.2.6' into develop John McLear 2013-01-20 13:46:11 +00:00
  • 6b13bfa1e8 Merge branch 'release/releases-1.2.6' 1.2.6 John McLear 2013-01-20 13:46:07 +00:00
  • 4b5d993f0d bump v and create CHANGELOG John McLear 2013-01-20 13:45:16 +00:00
  • 280359a36d Merge branch 'develop' of github.com:ether/etherpad-lite into develop John McLear 2013-01-20 13:43:14 +00:00
  • b282547dbf Merge pull request #1376 from t-8ch/patch-2 John McLear 2013-01-20 05:42:44 -08:00
  • 5aaf3cee3f Merge 9ee5098ad6 into 0a06b07f7d Thomas Weißschuh 2013-01-20 05:42:42 -08:00
  • 0a06b07f7d Merge pull request #1377 from mluto/add-users-block John McLear 2013-01-20 05:35:19 -08:00
  • 81af528c50 Merge 9c364d7d38 into 74c86da0ae mluto 2013-01-20 05:03:32 -08:00
  • 9c364d7d38 Added a template block for #users mluto 2013-01-20 13:56:51 +01:00
  • 9ee5098ad6 listAllPads needs findKeys from ueberDB 0.1.9 Thomas Weißschuh 2013-01-19 19:17:52 +00:00
  • 74c86da0ae Merge pull request #1375 from jhollinger/develop John McLear 2013-01-18 08:42:25 -08:00
  • 83a3fdbab0 Merge 858d8e6e71 into 96989e63c7 Jordan Hollinger 2013-01-18 08:15:27 -08:00
  • 858d8e6e71 listAllPads should return an object, not an arraay. issue #1374 Jordan Hollinger 2013-01-18 11:13:03 -05:00
  • 37c55effd6 Merge branch 'master' of github.com:ether/etherpad-lite 1.2.5 John McLear 2013-01-18 13:41:53 +00:00
  • ec64f71d23 Merge branch 'release/releases-1.2.5' John McLear 2013-01-18 13:41:33 +00:00
  • 84065d8309 Merge pull request #1373 from ether/release/releases-1.2.5 John McLear 2013-01-18 05:41:20 -08:00
  • 442f681f9d Merge 96989e63c7 into 344e8be328 John McLear 2013-01-18 05:33:52 -08:00
  • 96989e63c7 prepare for release John McLear 2013-01-18 13:30:46 +00:00
  • 292db5fc44 prepare for release John McLear 2013-01-18 13:29:43 +00:00
  • 88e42dd109 Merge pull request #1366 from ether/master Marcel Klehr 2013-01-17 08:42:21 -08:00
  • 210cc85f49 Merge 344e8be328 into c731269a87 John McLear 2013-01-17 08:41:53 -08:00
  • c731269a87 Merge pull request #1371 from ether/fix/ie8-onload-html10n John McLear 2013-01-17 08:41:10 -08:00
  • 4c1b2b0b98 Merge a1188c15c0 into c8786bfdf5 Marcel Klehr 2013-01-17 08:41:05 -08:00
  • c8786bfdf5 Merge pull request #1372 from marcelklehr/fix/checkPad-async.series John McLear 2013-01-17 08:35:50 -08:00
  • 0c3d564e68 Merge 90ca3d53c3 into 6802353306 Marcel Klehr 2013-01-17 08:34:08 -08:00
  • 90ca3d53c3 Fix #1367: async.series was lacking callback in checkPad.js Marcel Klehr 2013-01-17 17:31:56 +01:00
  • a1188c15c0 [html10n] Fix onload event listener (must be attached to window!) Marcel Klehr 2013-01-16 19:47:54 +01:00
  • 6802353306 Merge pull request #1370 from mluto/fix-load-message-IE8 John McLear 2013-01-16 09:53:39 -08:00
  • 5fd5785fe5 Merge e31b9fd1bd into 6055fa9cec mluto 2013-01-16 09:52:35 -08:00
  • e31b9fd1bd IE8 does not have a string.trim()-function, so use regex.. mluto 2013-01-16 18:48:25 +01:00
  • 6055fa9cec Merge pull request #1365 from mluto/fix-load-message-tests John McLear 2013-01-15 14:27:54 -08:00
  • 2e0150de46 Merge ae07b73840 into 92a0e60635 mluto 2013-01-15 14:01:57 -08:00
  • ae07b73840 Increased timeouts to make IE9 happy, made button-test more strict mluto 2013-01-15 22:51:53 +01:00
  • 92a0e60635 Merge pull request #1364 from t-8ch/fix-readme-links Marcel Klehr 2013-01-15 13:25:54 -08:00