public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,851 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

2851 Commits (5731ef78020095b55a58e41b9f3e0cf7335e97c5)

Author SHA1 Message Date
Marcel Klehr 5731ef7802 Fix ace rtlIsTrue property setter 2013-03-06 15:40:02 +01:00
John McLear 2a8038b9fe Merge pull request #1593 from marcelklehr/feature/rtl-pad-setting 
Add a setting for RTL text direction (integrating the url paramter)
 2013-03-06 05:58:47 -08:00
Marcel Klehr 603115c4bf Merge branch 'master' into develop 2013-03-06 14:57:09 +01:00
Marcel Klehr 760e1b82c3 Add a setting for RTL text direction (integrating the url paramter) 
Fixes #1191
 2013-03-05 23:12:00 +01:00
John McLear fe0272b283 Merge pull request #1589 from ether/fix-ctrl-z 
allow chrome to do control z type functionality, not sure why this was n...
 2013-03-05 12:35:03 -08:00
John McLear d124d9b26c Merge pull request #1590 from ether/fix-tests-android 
fix chat simulation test to work in android
 2013-03-05 12:34:44 -08:00
John McLear f9f8b1c079 allow chrome to do control z type functionality, not sure why this was never in.. broken when we last updated jQ anyway 2013-03-05 20:30:31 +00:00
John McLear 38499465c3 fix chat simulation test to work in android 2013-03-05 19:01:22 +00:00
John McLear cb2d148734 Merge branch 'release/1.2.8' 2013-03-05 13:39:53 +00:00
John McLear 2b5cb2989c Merge pull request #1585 from ether/changelog 
changelog
 2013-03-05 05:34:14 -08:00
John McLear 7f9a51e614 changelog 2013-03-05 13:33:09 +00:00
John McLear dc4317b654 Merge pull request #1584 from ether/update-ueber 
update ueberdb
 2013-03-05 05:25:48 -08:00
John McLear 3dee4098b0 update ueberdb 2013-03-05 13:24:24 +00:00
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