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 |
|
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 |
|
John McLear
|
5c9d081391
|
Begin supporting the database but still have a problem where it generates new key on restart...
|
2013-02-13 01:33:22 +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 |