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

2781 Commits (850cf401575db7a7c2310c3b278a2d9e326b790f)

Author SHA1 Message Date
John McLear 850cf40157 more mess, again dont merge, just for me 2013-02-21 01:56:57 +00:00
John McLear 1e6fc26780 throw and post err on bad pad data 2013-02-21 01:39:03 +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 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 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 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 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 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 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
John McLear aefd8d8d0d nice chars n no cruft 2013-02-13 18:45:45 +00:00
John McLear dea892213e Revert "allow non ascii chars in txt export" 
This reverts commit be56272e66.
 2013-02-13 18:41:04 +00:00
John McLear be56272e66 allow non ascii chars in txt export 2013-02-13 18:30:55 +00:00
John McLear d3f730e2ba fix various issues dont stop random *'s appearing 2013-02-13 18:01:15 +00:00
John McLear 5b5176cc0c Merge pull request #1518 from eldiddio/fix-typo 
Fixed typo thats made server hang
 2013-02-13 07:37:29 -08:00
Mark Fisher 500f9b8b48 Fixed typo thats made server hang 2013-02-13 15:25:27 +00:00
Marcel Klehr 602d603658 Merge pull request #1512 from disy-mk/patch-3 
Allow people to query current API version via /api
 2013-02-13 03:39:32 -08:00
John McLear a4e5adab3e Update Ueber DB to fix MySQL Bug! 2013-02-13 02:47:24 +00:00
Manuel Knitza fde10052ca Update doc/api/http_api.md 
Updated
 2013-02-12 21:57:01 +01:00
Manuel Knitza 8c9ad6ee50 Update src/node/handler/APIHandler.js 2013-02-12 21:50:14 +01:00
Manuel Knitza e855bafdf9 Update src/node/hooks/express/apicalls.js 2013-02-12 21:47:40 +01:00
John McLear da246d183d Correct license header 2013-02-12 19:47:53 +00:00
John McLear 0b5c948549 Move code from Html export to a Helper file 2013-02-12 19:45:46 +00:00
John McLear 14dca92692 Merge pull request #1505 from ether/fix-for-long-strings 
very simple fix that might break other things but stops the caret focus ...
 2013-02-12 11:06:45 -08:00
John McLear 760bebc429 Merge pull request #1507 from ether/ace2_inner-fix 
fix issue where opera was doing stupid things but still an issue w/ doub...
 2013-02-12 11:06:25 -08:00
John McLear a37d396577 fix issue where opera was doing stupid things but still an issue w/ double tabs exists 2013-02-12 19:04:43 +00:00
John McLear bf6958ad57 Update bin/loadTesting/README 2013-02-12 15:04:06 +00:00
John McLear 9c54f024aa Bump to latest ueber to support sqlite 2013-02-12 13:15:57 +00:00