mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-27 10:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
3510 commits 215 branches 107 tags 73 MiB
Commit graph

3510 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcel Klehr
59f54ad3ae Merge branch 'develop' into fix-timeslider 2014-01-24 17:29:10 +01:00
Marcel Klehr
fd4dd915ce Merge pull request #2062 from Gared/enable_import_buttons 
Fix #1835 Enable import buttons after failed import (timeout)
 2014-01-24 08:26:37 -08:00
Marcel Klehr
8dd701b6b6 Merge branch 'develop' into fix-timeslider 2014-01-24 17:09:06 +01:00
Marcel Klehr
966fc25145 Merge remote-tracking branch 'remotes/origin/pr/2040' into fix-timeslider 2014-01-24 17:00:45 +01:00
Marcel Klehr
4b87f77aae Merge pull request #2068 from webzwo0i/fix-randomstring 
fix randomstring
 2014-01-24 07:43:19 -08:00
webzwo0i
a43123880a fix randomstring 2014-01-24 01:19:14 +01:00
Gared
bf6ec18ead Fix #1835 Enable import buttons after failed import (timeout) 2014-01-19 20:04:09 +01:00
John McLear
e4fbf4bbcd Merge pull request #2061 from Gared/url_square_brackets 
Fix #2058 Add square brackets to url characters
 2014-01-19 10:26:16 -08:00
Gared
3715535f86 Fix #2058 Add square brackets to url characters 2014-01-19 19:23:11 +01:00
John McLear
be4adec122 Merge pull request #2060 from rhelmer/bug844796-session-token-generation 
Bug844796 session token generation
 2014-01-15 11:46:55 -08:00
Robert Helmer
348d9a838f convert over to server-side crypto 2014-01-15 11:44:57 -08:00
Robert Helmer
ae99c5ea6f new randomString function should take len arg 2014-01-15 11:44:41 -08:00
John McLear
346c03911d Merge pull request #2059 from rhelmer/bug844796-session-token-generation 
mozilla bug 844796 - use node crypto module for randomString
 2014-01-15 11:14:55 -08:00
Robert Helmer
9ef709e7f7 mozilla bug 844796 - use node crypto module for randomString 2014-01-15 10:58:50 -08:00
Siebrand Mazeland
2f9a9d8695 Localisation updates from https://translatewiki.net. 2014-01-11 16:47:39 +00:00
Siebrand Mazeland
a35254c772 Localisation updates from https://translatewiki.net. 2014-01-06 11:01:26 +00:00
s1341
e64c589b2f added logging to assist in debugging 2013-12-31 18:38:00 +02:00
s1341
126c83f71c Commit despite bug in requestChangesets 2013-12-31 18:29:26 +02:00
s1341
1060544b86 transition is now much clearer. 
It now does partial findPaths, builds the final path as it goes  and requests changesets for missing bits only.
 2013-12-31 18:03:31 +02:00
Siebrand Mazeland
1e0456c7ed Localisation updates from https://translatewiki.net. 2013-12-28 17:43:47 +00:00
s1341
aaf028335e Fix the bug causing the lineAssem assert 2013-12-24 20:56:13 +02:00
s1341
9ee80c7a07 missing brace 2013-12-24 19:40:17 +02:00
s1341
f259481c64 Fix logging 2013-12-24 19:37:22 +02:00
s1341
39dc8622e6 Logging verbose by class 2013-12-24 19:30:46 +02:00
Siebrand Mazeland
44f817da01 Localisation updates from https://translatewiki.net. 2013-12-23 20:11:18 +00:00
s1341
321aa05eab Fix transition bug; add scrollIntoView. 2013-12-22 18:41:39 +02:00
s1341
d89babfaeb Handle clicking slider when playing 2013-12-22 18:27:34 +02:00
s1341
b4baba6155 Fixed transition algo not incrementing start 
Added HUGE (1000 revs) bucket. There are still some libchangeset errors
which need fixing.
 2013-12-22 18:21:54 +02:00
s1341
805e492e74 Handle new author info and revisions 
Handle upstream new revisions and added users/authors.
 2013-12-21 19:25:25 +02:00
s1341
3c0bd5767b Implement authorinfo; split RevisionSlider out 2013-12-20 14:12:48 +02:00
John McLear
b5ca52a5e5 Merge pull request #2045 from ether/exposeUpdateBrowserSel 
expose update browser selection function
 2013-12-18 14:13:50 -08:00
John McLear
333d2f119b expose update browser selection function 2013-12-18 22:13:03 +00:00
John McLear
1c2f05cb96 Merge pull request #2044 from ether/ff-del-firstchar 
dont error when pressing del on rep 0 0
 2013-12-18 10:35:25 -08:00
John McLear
1a138438eb dont error when pressing del on rep 0 0 2013-12-18 18:34:35 +00:00
John McLear
33ecd3d52f Merge pull request #2041 from ether/fix-get-attr 
better handling for attribute queries
 2013-12-17 12:49:28 -08:00
John McLear
8313083cd9 better handling for attribute queries 2013-12-17 20:48:19 +00:00
John McLear
af5b8d3e24 Merge pull request #2039 from ether/fix/dont-crash-on-failed-changeset_req 
Don't crash if CHANGESET_REQ fails
 2013-12-17 07:42:05 -08:00
s1341
ed3e88ba20 Real fix for the traversal/granularity bug. 
The algo could still use improvements. In addition, the order of
execution of the callbacks means that the lower granularities will
always be available first, even if higher granularities were requested.

Note that there are some strange libchangeset errors now.
 2013-12-17 17:36:22 +02:00
s1341
1c6012b29f Workaround for granularity issue. 
Just return the granularity discovered to be empty from findPath and
provide it to requestChangesets. This is very sub-optimal, as it will
almost always result in granularity==1.
 2013-12-17 17:36:22 +02:00
s1341
275c26f872 Cleanup; add getHeadRevision function to connection 2013-12-17 17:36:21 +02:00
s1341
a5eced9952 Allow compose or apply to be used in GoToRevision 
Controlled on the static PadClient.USE_COMPOSE variable.
 2013-12-17 17:36:20 +02:00
s1341
13f4a71aba Clicking steppers should pause playback 2013-12-17 17:36:20 +02:00
s1341
541f0e5517 Fix top of editorcontainer so that it isn't behind timeslider 2013-12-17 17:36:19 +02:00
s1341
14b2af44a1 Don't process clicks on steppers if disabled 2013-12-17 17:36:18 +02:00
s1341
ab9b55dbc4 Play/Pause working. 2013-12-17 17:36:18 +02:00
s1341
ccfb0e2d56 Change changesetLoader to run every 200ms:wq 2013-12-17 17:36:17 +02:00
s1341
b8591edc8d Sliding now triggers goToRevision. 2013-12-17 17:36:16 +02:00
s1341
676ff3f436 Handle is only moved when triggered event is done. 2013-12-17 17:36:16 +02:00
s1341
eef08490b2 Minimal working UI wireup 
Working:
  - location.hash
  - click on slider
  - stepper buttons
  - UI update (except authors)
Not working:
  - playback
  - bugs in transition code
 2013-12-17 17:36:15 +02:00
s1341
3013bab251 More or less working goToRevision 
There are still some bugs in the traversal algorithm, as well
as bugs being triggered in the server. Also, for some reason it looks
like there is a problem with the attribute pool not containing certain
elements.
 2013-12-17 17:36:14 +02:00