libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3714 commits 2 branches 0 tags 24 MiB
Commit graph

3714 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcel Klehr
3a82cba4c5 Polish the styles of our docs a little 2014-03-27 18:08:55 +01:00
John McLear
56fd078469 Merge pull request #2092 from webzwo0i/fix-crash-with-queued-messages 
Fix crash with queued messages
 2014-03-26 19:39:19 +00:00
jdittrich
a4f2ebe57e Update package.json 
updated the underscore version number to 1.5.1 (from 1.3.1). Not lifted to most current version because frontend tests broke from 1.5.2 upwards.
 2014-03-26 18:22:41 +01:00
John McLear
e23af7e439 changelog, package file and fix for redo 2014-03-26 15:44:04 +00:00
John McLear
dc1a33bead Merge pull request #2111 from ether/quickfix/req_cs-bounds-check 
Fix REQ_CS rev boundary check
 2014-03-20 20:35:48 +00:00
Marcel Klehr
f6f319960d Fix REQ_CS rev boundary check 
fixes #2096
 2014-03-20 21:34:01 +01:00
Siebrand Mazeland
ba38bc998e Localisation updates from https://translatewiki.net. 2014-03-18 12:14:27 +00:00
John McLear
e1fa43e640 quick formatting clean up 2014-03-17 19:20:32 +00:00
John McLear
8cd9b98b76 Merge pull request #2110 from ether/modularize-toolbar 
Modularize toolbar
 2014-03-16 17:19:22 +00:00
Marcel Klehr
a69793a203 Add docs for toolbar controller and pad_editbar 2014-03-16 15:43:38 +01:00
Marcel Klehr
da5970dda3 Refactor toolbar.js to use consistent naming 2014-03-16 15:14:21 +01:00
Marcel Klehr
51900cbf67 Toolbar: Allow custom dropdowns for plugins 2014-03-16 14:04:12 +01:00
Marcel Klehr
a369347d86 Merge branch 'pr/1579' into toolbar-test 
Conflicts:
	settings.json.template
	src/static/js/pad_editbar.js
 2014-03-16 13:30:22 +01:00
John McLear
44f8b43719 Update CONTRIBUTING.md 2014-03-15 17:26:02 +00:00
John McLear
cd0f5742f6 Merge pull request #2108 from goldquest/dev_deleteSessionBug 
Session deletion error, when group2session/author2session are not available
 2014-03-14 17:22:46 +00:00
goldquest
a00c505403 Sometimes, the author2session / group2session don't exist anymore, but the session does. 
It should be possible to delete a session, if they don't exist
 2014-03-14 17:50:37 +01:00
John McLear
cc03f5374c Merge pull request #2089 from dmitryuv/changesetslib-fixes 
fix for infinite loop on bad changeset
 2014-03-13 14:39:19 +00:00
John McLear
e12093eb19 Merge pull request #2080 from ether/ignore-ctrl-pageup 
allow tabs to be cycled when focus is in editor
 2014-03-13 00:49:20 +00:00
Siebrand Mazeland
96d06abac0 Localisation updates from https://translatewiki.net. 2014-03-12 12:42:31 +00:00
John McLear
26869d29b3 Merge pull request #2101 from ether/preProcessDomLine 
preprocessor for domline attributes
 2014-03-11 17:44:56 +00:00
John McLear
f5716a3b26 cleaner logic 2014-03-05 21:44:32 +00:00
John McLear
df205a4ef4 docs 2014-03-05 21:44:22 +00:00
John McLear
89d7ba0dc0 merge 2014-03-05 21:27:12 +00:00
John McLear
432438a40d fix dintenation 2014-03-04 23:36:16 +00:00
John McLear
c3d62c5fa4 preprocessor for domline attributes 2014-03-04 23:14:15 +00:00
Marcel Klehr
6940106829 Merge pull request #2095 from vvision/develop 
Fix plugins not being fetched (update npm)
 2014-02-26 23:30:39 +01:00
Marcel Klehr
af50001769 Merge pull request #2074 from webzwo0i/fix-disconnect-on-new-changes-in-padinitialization 
don't call ace_getInInternationalComposition if editor is not fully load...
 2014-02-26 22:52:30 +01:00
Marcel Klehr
8b572b888c Merge pull request #2088 from simong/padUsersCallback 
Addressed a potential never finishing forEach in PadMessageHandler.padUsers
 2014-02-26 22:50:29 +01:00
vvision
eb32835ea1 Updated npm version. 2014-02-24 13:29:21 +01:00
webzwo0i
fa681d43f7 remember user session because it can be gone when finalHandler is called 2014-02-20 17:38:25 +01:00
webzwo0i
c8c2866087 fix crash if disconnect happens for sessions that have messages queued 2014-02-20 16:33:42 +01:00
Dmitry Uvarov
0e6019344e fix for infinite loop on bad changeset 2014-02-20 14:08:49 +04:00
Simon Gaeremynck
cfdd57b487 Addressed a potential never finishing forEach in PadMessageHandler.padUsers 
If the session info for a client would be null or undefined, the forEach
callback would never get called which means the padUsers callback would
never get trigged. This could potentially block API request as this function
is exposed at an HTTP API endpoint.
 2014-02-19 10:48:15 +00:00
John McLear
ca8dce1840 Merge pull request #2086 from bnchdrff/cleanse-npm-values 
escape rendered npm package info
 2014-02-17 16:51:07 +00:00
Benjamin Chodoroff
44062ae765 escape rendered npm package info 2014-02-17 11:40:30 -05:00
Siebrand Mazeland
f798e287fb Localisation updates from https://translatewiki.net. 2014-02-09 15:22:15 +00:00
Siebrand Mazeland
65a3344f46 Localisation updates from https://translatewiki.net. 2014-02-02 12:36:23 +00:00
John McLear
7151e7827a allow tabs to be cycled when focus is in editor 2014-02-01 07:05:25 +00:00
webzwo0i
3f31445abf don't call ace_getInInternationalComposition if editor is not fully loaded 2014-01-28 14:07:26 +01:00
Marcel Klehr
b6f354a2de Merge pull request #2052 from ether/fix/l10n-fallbacks-related-langs 
Try to find related languages as a fallback
 2014-01-25 05:34:11 -08:00
Siebrand Mazeland
728958e131 Localisation updates from https://translatewiki.net. 2014-01-24 19:51:24 +00: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
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