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

2950 Commits (40cbe55507fdf9eb45e092d3f9321de4f72dce22)

Author SHA1 Message Date
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
John McLear 19964498f3 no need to parse already parsed json 2013-02-18 20:38:32 +00:00
Marcel Klehr 4592397bd9 Merge pull request #1491 from ether/export-txt-with-indent 
TXT Export Indentation on lists Edit
 2013-02-18 12:13:06 -08:00
John McLear ab81b5cfe9 dont jump pages 2013-02-18 19:46:31 +00:00
John McLear 5441179e78 dont jump pages 2013-02-18 19:38:25 +00:00
John McLear 1a177d730a Merge pull request #1536 from ether/timeslider-scripts-block 
Timeslider scripts block
 2013-02-18 11:34:53 -08:00
John McLear 1e7d24c03b Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-02-18 19:34:19 +00:00
John McLear c37875e09a update changelog 2013-02-18 19:33:31 +00:00
John McLear fb97920163 update changelog 2013-02-18 19:32:07 +00:00
John McLear e7a07a495c Merge pull request #1531 from ether/fix-for-long-strings 
make the focus jump back to the left if it's required
 2013-02-18 11:26:46 -08:00
John McLear 2ee3d0469e Merge pull request #1533 from ether/indenting-text 
Indenting text
 2013-02-18 11:25:55 -08:00
John McLear 7fcc71710f dont exposrt sendSocketMs 2013-02-18 18:59:53 +00:00
John McLear 75fd27998e expose socket timeslider with a bad hack 2013-02-18 18:58:58 +00:00
John McLear 3f87a32a12 timestlider script block 2013-02-18 18:07:01 +00:00
John McLear f76cfad42b remove cruft 2013-02-18 08:30:42 -08:00
John McLear 4cfac2f624 fix extract and checkPad 2013-02-18 08:29:25 -08:00
John McLear abadfb7b6a Update README.md 2013-02-18 15:12:37 +00:00
John McLear b30e1de3e5 Update README.md 2013-02-18 15:12:11 +00:00
John McLear 77d03d3473 Try to add some sanity to indentation 2013-02-18 01:40:34 +00:00
John McLear 48ffbde731 allow colon to indent line 2013-02-18 01:10:54 +00:00
John McLear eeeeb04840 remove cruft 2013-02-18 00:37:47 +00:00
John McLear 6e46a53288 this is probably bad, please sanity check 2013-02-18 00:36:31 +00:00
John McLear 11a8295150 eureka 2013-02-18 00:29:53 +00:00
John McLear 6d7e709ecb Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db 2013-02-17 23:44:26 +00:00
John McLear 51a9ecf1f0 better support for other browsers 2013-02-17 21:19:15 +00:00
John McLear 7e023ce8e1 make the focus jump back to the left if it's required 2013-02-17 21:03:19 +00:00
John McLear 26699618ac Merge pull request #1529 from marcelklehr/fix/i18n/two-part-locale-specs 
Fixes #1498: Two-part locale specs in lang cookie wouldn't be read corre...
 2013-02-17 12:37:12 -08:00
Marcel Klehr 9ca2275432 Fixes #1498: Two-part locale specs in lang cookie wouldn't be read correctly 2013-02-17 21:35:46 +01:00
John McLear 04f609752f actually works 2013-02-17 18:05:25 +00:00
John McLear 6b47fb69d0 seems to be working pretty well 2013-02-17 18:01:25 +00:00
John McLear 93d58b93be Update src/static/css/iframe_editor.css 2013-02-17 17:13:02 +00:00
Siebrand Mazeland 025a3aa724 Localisation updates from http://translatewiki.net. 2013-02-16 05:10:29 +00:00
John McLear 140ff6f1bf dont lose focus on key up, doesn't work yet 2013-02-15 12:24:16 +00:00
John McLear c723aefdfe when exporting HTML include html and body 2013-02-14 01:10:47 +00:00
John McLear 36814ed42b apply overlay and remove overlay instantly 2013-02-13 23:44:20 +00:00
John McLear 7f09ec25a2 no need for prefix and tidy double semi 2013-02-13 21:53:15 +00:00
John McLear efce99c3a1 session key in settings file OR generate temp key for instance 2013-02-13 21:51:09 +00:00
John McLear c3972bcb87 Update README.md 2013-02-13 20:14:15 +00:00
John McLear 1607af8753 Bitcoin yo. 2013-02-13 20:12:46 +00:00