libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3038 commits 2 branches 0 tags 24 MiB
Commit graph

3038 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcel Klehr
283f6d0ae6 Merge pull request #1581 from victorhooi/develop 
Remove nested /* */ from settings.json.template
 2013-03-04 05:06:25 -08:00
Victor Hooi
aa9fd7621a Remove nested /* */ from settings.json.template 2013-03-05 05:58:03 +11:00
Siebrand Mazeland
6c304f0480 Localisation updates from http://translatewiki.net. 2013-03-04 11:46:05 +00:00
Marcel Klehr
2b62e9a211 Merge pull request #1578 from yourcelf/patch-2 
Fix comma errors in settings.json.template
 2013-03-03 13:34:18 -08:00
yourcelf
44965f462b Fix comma errors in settings.json.template 2013-03-03 16:25:09 -05:00
John McLear
71f10bff5b Merge pull request #1568 from ether/client-stability 
stop the client disconnecting of the server sends out a bad revision #, ...
 2013-03-03 13:19:10 -08:00
John McLear
fb605fb527 Merge pull request #1569 from ether/doc/log4js-appenders 
Document the endless possibilities of log4js..
 2013-03-03 08:29:50 -08:00
Marcel Klehr
5c03c039d1 [settings.json.template] Shrink things together a bit and consistently indent comments 2013-03-03 16:39:34 +01:00
Marcel Klehr
827c1291b5 Merge pull request #1575 from ether/fix-tests 
fix some tests
 2013-03-02 05:03:38 -08:00
Marcel Klehr
8eb095b42a Merge pull request #1576 from ether/remove-lite-ref 
remove more references to lite
 2013-03-02 04:35:54 -08:00
John McLear
d8154deee3 more fixes 2013-03-01 23:40:25 +00:00
John McLear
4e205fe0af fix monospace text 2013-03-01 23:33:24 +00:00
John McLear
cadb671ae1 this approach seems to work better for change in latest jQ 2013-03-01 23:29:12 +00:00
John McLear
36923313fa remove more references to lite 2013-03-01 23:08:39 +00:00
John McLear
3460159f68 fix a test 2013-03-01 14:04:33 +00:00
John McLear
13c9b66e6e Merge pull request #1571 from marcelklehr/fix/settings-object-prototype 
Fix settings object having constructors of another vm.context
 2013-02-28 07:20:42 -08:00
Marcel Klehr
c4966543ed Fix settings object having constructors of another vm.context 
This made it impossible to rely on `instanceof` to work as expected on (even parts of) the settings object
Fixes #1570
 2013-02-28 16:16:26 +01:00
Marcel Klehr
176a6c36d8 Document the endless possibilities of log4js 2013-02-27 20:39:38 +01:00
John McLear
994c4ebeed stop the client disconnecting of the server sends out a bad revision #, this is very dangerous, the server really shouldn't be sending the same rev #, we could really do with some strong tests case that cover this. Either way this commit 'resolves' #1510 2013-02-27 19:29:59 +00:00
John McLear
22bfe78c4f Merge pull request #1565 from ether/dont-crash-on-mismatch 
patch documented here https://github.com/ether/etherpad-lite/issues/472 ...
 2013-02-27 08:20:46 -08:00
John McLear
ebd8b85072 patch documented here https://github.com/ether/etherpad-lite/issues/472 adds some stability but not a perfect solution 2013-02-27 16:17:50 +00:00
John McLear
3986835f58 Merge pull request #1564 from marcelklehr/fix/extract-pad 
Fix bin/extractPadData on windows
 2013-02-27 07:44:56 -08:00
Marcel Klehr
08ffdac409 Merge pull request #1563 from ether/postTimesliderInit-docs 
timeslider init hook docs
 2013-02-27 07:31:44 -08:00
Marcel Klehr
af25606ea8 Fix bin/extractPadData on windows 2013-02-27 16:26:22 +01:00
John McLear
716cac9c95 timeslider init hook docs 2013-02-27 15:17:22 +00:00
John McLear
18b6cf1534 Merge pull request #1523 from ether/store-sessions-in-db 
Store sessions in db
 2013-02-26 18:03:54 -08:00
John McLear
2c69066591 remove pointless stuff 2013-02-27 02:02:18 +00:00
John McLear
57d923e822 Merge pull request #1561 from ether/callback-for-delete-script 
Callback for delete script
 2013-02-26 16:14:15 -08:00
John McLear
ea4307ae97 remove console error 2013-02-26 16:32:34 -08:00
John McLear
1fd99bfd43 fix deletePad script by remembering not to miss a callback.. 2013-02-26 16:32:09 -08:00
John McLear
80be45ad71 Merge pull request #1559 from ether/url-report 
post url with pad error msg resolves #1558
 2013-02-26 05:26:29 -08:00
John McLear
ad52b40597 post correct url, heh 2013-02-26 13:24:24 +00:00
John McLear
b2eb1b3814 post url with pad error msg 2013-02-26 13:14:17 +00:00
John McLear
ad82c8d754 Merge pull request #1557 from ether/delete-pad-cli-script 
a cli tool for deleting pads
 2013-02-26 03:53:18 -08:00
John McLear
b7d96b1dcf a cli tool for deleting pads 2013-02-26 11:44:22 +00:00
John McLear
cf6413383b Merge pull request #1537 from ether/expose-socket-timeslider 
Expose socket timeslider
 2013-02-25 02:14:24 -08:00
John McLear
f915285f15 merge develop 2013-02-25 10:13:50 +00:00
John McLear
5b89242c5b Merge pull request #1538 from ether/timeslider-init-hook 
timeslider init hook
 2013-02-25 02:12:37 -08:00
Siebrand Mazeland
26ccb1fa3e Localisation updates from http://translatewiki.net. 2013-02-24 16:38:27 +00:00
Marcel Klehr
654175dd36 Merge pull request #1530 from ether/dont-lose-caret 
Dont lose caret
 2013-02-21 08:21:13 -08:00
John McLear
4a98ec3c23 resolve merge conflict 2013-02-20 22:37:27 +00:00
Marcel Klehr
945d5b98e8 Merge pull request #1547 from ulikoehler/develop 
Update link to Developer guidelines
 2013-02-20 12:50:57 -08:00
Uli Köhler
813583c9ce Update link to dev guidelines 2013-02-20 21:38:24 +01:00
John McLear
ec4a6bbaf2 Merge pull request #1545 from ether/fix-clients-conn-count 
only show clients on this pad resolves issue #1544
 2013-02-20 08:21:31 -08:00
John McLear
fb3e4a6232 only show clients on this pad resolves issue #1544 2013-02-20 16:10:27 +00:00
John McLear
e52dc2b17c dont reset head count, use the one we should :) 2013-02-19 02:05:51 +00:00
John McLear
9eff8576ef timeslider init hook 2013-02-18 22:04:58 +00:00
John McLear
cda3a0e78b a different approach 2013-02-18 21:03:52 +00:00
John McLear
c986a8565a Merge pull request #1535 from ether/fix-extractPadData 
fix extract and checkPad
 2013-02-18 12:41:46 -08:00
John McLear
0a19589509 fix path for windows 2013-02-18 20:40:34 +00:00