fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,742 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

2742 Commits

Author SHA1 Message Date
John McLear 18b96b33c6 Merge pull request #1379 from ether/more-plugin-details 
resolve #1349 - add url to plugin name
 2013-01-24 07:29:30 -08:00
Marcel Klehr 3719ce7c5d [admin] Make links prettier 2013-01-24 13:50:49 +01:00
Marcel Klehr 9fa5b9506e Add links for installed plugins 2013-01-24 13:43:42 +01:00
John McLear 28aa1ecc24 Merge pull request #1398 from marcelklehr/fix/html10n-ie8-array.indexOf 
Fix Array.prototype.indexOf for IE8! <3
 2013-01-23 08:49:15 -08:00
Marcel Klehr 25e1ed2d0c Fix Array.prototype.indexOf for IE8! <3 2013-01-23 17:40:10 +01:00
John McLear c632e3d379 Merge pull request #1396 from goldquest/dev_importfix 
use the existing padimpexp object from the parent window, Issue #1395
 2013-01-23 08:03:08 -08:00
goldquest 74185e79ab use the existing padimpexp object from the parent window 2013-01-23 16:36:37 +01:00
John McLear 9129c6970a add a html block eejs so you can add a cache manifest 2013-01-23 02:46:57 +00:00
John McLear b76f084f3a add eejs block for disconnect 2013-01-23 01:01:35 +00:00
John McLear f1b9c213ee and semi working 2013-01-22 23:37:53 +00:00
John McLear 3fb2f02875 semi working 2013-01-22 23:16:49 +00:00
John McLear d21585b880 mheh 2013-01-22 23:06:52 +00:00
John McLear 205d983225 make it crash 2013-01-22 22:48:05 +00:00
John McLear 5d416579ee bring in some padDiff stuff that doesnt suck 2013-01-22 22:33:51 +00:00
John McLear 6ae46ea8e3 fix issue where url was wrong for install 2013-01-22 18:28:38 +00:00
John McLear 557b5c1ad0 Merge pull request #1388 from ether/proper-fix-for-import-url 
fix import without params
 2013-01-22 10:20:20 -08:00
John McLear 159feceb20 fix import without params 2013-01-22 18:17:15 +00:00
John McLear c6882aa65a Merge pull request #1386 from ether/fix-import-on-params 
fix issue #1369 where params would break import
 2013-01-22 08:05:04 -08:00
John McLear 1725fe318d Merge pull request #1385 from goldquest/dev_import-reverseProxy 
Import: script tag didn't link to right location. Issue #976
 2013-01-22 08:04:06 -08:00
John McLear e23108d199 fix issue #1369 where params would break import 2013-01-22 16:03:00 +00:00
goldquest 666c0adcd2 script tag didn't link to right location 2013-01-22 16:42:56 +01:00
Siebrand Mazeland 7869a543dd Localisation updates from http://translatewiki.net. 2013-01-22 06:14:31 +00:00
John McLear 97afd1cc79 Merge pull request #1383 from disy-mk/patch-2 
Patch 2
 2013-01-21 15:58:00 -08:00
Manuel Knitza 7066ed183d Update bin/convert.js 
'lil typo
 2013-01-22 00:56:39 +01:00
John McLear 441dd3785a fix issue #1110 2013-01-20 23:11:59 +00:00
John McLear 8bfa8a7e73 better urls 2013-01-20 22:42:32 +00:00
John McLear 4cbf3869c6 open in external window 2013-01-20 22:36:58 +00:00
John McLear 1bf526124d resolve #1349 2013-01-20 22:34:27 +00:00
John McLear 4204bf9009 Merge branch 'release/releases-1.2.6' into develop 2013-01-20 13:46:11 +00:00
John McLear 6b13bfa1e8 Merge branch 'release/releases-1.2.6' 2013-01-20 13:46:07 +00:00
John McLear 4b5d993f0d bump v and create CHANGELOG 2013-01-20 13:45:16 +00:00
John McLear 280359a36d Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-01-20 13:43:14 +00:00
John McLear b282547dbf Merge pull request #1376 from t-8ch/patch-2 
listAllPads needs findKeys from ueberDB 0.1.9
 2013-01-20 05:42:44 -08:00
John McLear 0a06b07f7d Merge pull request #1377 from mluto/add-users-block 
Added a template block for #users
 2013-01-20 05:35:19 -08:00
mluto 9c364d7d38 Added a template block for #users 2013-01-20 13:56:51 +01:00
Thomas Weißschuh 9ee5098ad6 listAllPads needs findKeys from ueberDB 0.1.9 2013-01-19 19:17:52 +00:00
John McLear 74c86da0ae Merge pull request #1375 from jhollinger/develop 
listAllPads should return an object, not an arraay. issue #1374
 2013-01-18 08:42:25 -08:00
Jordan Hollinger 858d8e6e71 listAllPads should return an object, not an arraay. issue #1374 2013-01-18 11:13:03 -05:00
John McLear 37c55effd6 Merge branch 'master' of github.com:ether/etherpad-lite 2013-01-18 13:41:53 +00:00
John McLear ec64f71d23 Merge branch 'release/releases-1.2.5' 2013-01-18 13:41:33 +00:00
John McLear 84065d8309 Merge pull request #1373 from ether/release/releases-1.2.5 
Release/releases 1.2.5
 2013-01-18 05:41:20 -08:00
John McLear 96989e63c7 prepare for release 2013-01-18 13:30:46 +00:00
John McLear 292db5fc44 prepare for release 2013-01-18 13:29:43 +00:00
Marcel Klehr 88e42dd109 Merge pull request #1366 from ether/master 
Bring develop up to date with master
 2013-01-17 08:42:21 -08:00
John McLear c731269a87 Merge pull request #1371 from ether/fix/ie8-onload-html10n 
Fix onload event listener in html10n
 2013-01-17 08:41:10 -08:00
John McLear c8786bfdf5 Merge pull request #1372 from marcelklehr/fix/checkPad-async.series 
Fix #1367: async.series was lacking callback in checkPad.js
 2013-01-17 08:35:50 -08:00
Marcel Klehr 90ca3d53c3 Fix #1367: async.series was lacking callback in checkPad.js 2013-01-17 17:31:56 +01:00
Marcel Klehr a1188c15c0 [html10n] Fix onload event listener (must be attached to window!) 2013-01-16 19:47:54 +01:00
John McLear 6802353306 Merge pull request #1370 from mluto/fix-load-message-IE8 
Fixed message-sending in IE8
 2013-01-16 09:53:39 -08:00
mluto e31b9fd1bd IE8 does not have a string.trim()-function, so use regex.. 2013-01-16 18:48:25 +01:00