etherpad-lite - Really real-time collaborative document editing. http://etherpad.org

Age	Commit message (Collapse)	Author
2017-04-19	Merge pull request #3173 from therealshredder/use-https-in-readme	Luiza Pagliari
	Use HTTPS for images in README.md
2017-04-19	Use HTTPS for images in README.md	Thomas Wucher
	This change prevents mixed-content warnings on pages displaying the readme via HTTPS.
2017-04-18	Merge pull request #3161 from ether/feature/automatic_force_reconnect	Luiza Pagliari
	Feature: automatic force reconnect
2017-04-16	Merge pull request #3170 from AdamNiederer/patch-2	webzwo0i
	Butt On -> button
2017-04-15	Butt On -> button	Adam Niederer

2017-04-06	Merge pull request #3162 from ether/fix_connection_to_sauce_labs	Luiza Pagliari
	Fix connection to sauce labs
2017-04-06	[fix] Fix path on test script	Luiza Pagliari

2017-04-06	[fix] Use new SauceConnect provided by Sauce Labs	Luiza Pagliari
	Could not dowload "Sauce-Connect-latest.zip" anymore, need to change to new version of SauceConnect.
2017-04-06	Localisation updates from https://translatewiki.net.	translatewiki.net

2017-04-05	[feature] Only automatically reconnect if can establish connection to server	Luiza Pagliari
	Avoid trying to reload pad when network is not available.
2017-04-04	[feature] i18n for automatic reconnection messages/buttons	Luiza Pagliari

2017-04-04	Merge pull request #3160 from pageye123/develop	Luiza Pagliari
	wrong path of generate.js
2017-04-04	[test] Create tests for automatic reconnection on error	Luiza Pagliari

2017-04-04	[feature] Create option to automatically reconnect after a few seconds	Luiza Pagliari
	On some erros that display a modal with "Force reconnect" button, allow Etherpad to automatically reload pad after a few seconds. Amount of seconds is defined on settings.json. Still need to create tests for this feature, and implement i18n.
2017-04-04	wrong path of generate.js	jeffreyye

2017-04-03	Localisation updates from https://translatewiki.net.	translatewiki.net

2017-03-30	Localisation updates from https://translatewiki.net.	translatewiki.net

2017-03-20	Localisation updates from https://translatewiki.net.	translatewiki.net

2017-03-13	Merge pull request #3149 from AdamNiederer/patch-1	Luiza Pagliari
	Remove an extra space
2017-03-13	Merge pull request #3150 from AdamNiederer/develop	Luiza Pagliari
	Docs: Lots of spelling fixes
2017-03-13	Localisation updates from https://translatewiki.net.	translatewiki.net

2017-03-11	Fix typo	Adam Niederer

2017-03-11	Spelling fixes	Adam Niederer

2017-03-11	Spelling fixes	Adam Niederer

2017-03-11	Spelling, grammar, and style improvements	Adam Niederer

2017-03-11	Spelling fix	Adam Niederer
	Also removes an extra space
2017-03-11	Grammar fix	Adam Niederer

2017-03-11	Remove an extra space	Adam Niederer

2017-03-06	Localisation updates from https://translatewiki.net.	translatewiki.net

2017-02-27	Localisation updates from https://translatewiki.net.	translatewiki.net

2017-02-23	Localisation updates from https://translatewiki.net.	translatewiki.net

2017-02-20	Merge pull request #3141 from ether/fix_ie10_test	Luiza Pagliari
	Fix IE10 test
2017-02-20	[fix] Remove extra whitespace on helper tests for IE	Luiza Pagliari

2017-02-20	[refactor] Use better way to select a single line	Luiza Pagliari

2017-02-20	[test] Fix helper tests for IE	Luiza Pagliari

2017-02-08	Merge pull request #3136 from joassouza/fix_minify	Luiza Pagliari
	Fix minification of JS files
2017-02-07	Refactor code	joassouza

2017-02-07	Fix minification of code	joassouza

2017-02-06	Localisation updates from https://translatewiki.net.	translatewiki.net

2017-02-03	Merge pull request #3135 from storytouch/develop	Luiza Pagliari
	[fix] Fix drag and drop tests for IE
2017-02-03	[fix] Fix drag and drop tests for IE	Luiza Pagliari

2017-02-02	Merge pull request #3119 from storytouch/fix_3118	Luiza Pagliari
	Create plugin to run tests for line attribs + fix #3118
2017-01-29	Merge pull request #3131 from Sjord/remove-outdated-comment	Stefan
	Remove deprecated comment
2017-01-26	Remove deprecated comment	Sjoerd Langkemper
	The session key is currently stored in SESSIONKEY.txt, so it is no longer reset every time the server starts.
2017-01-17	Merge pull request #3123 from Sjord/fix-hook-called-from	Luiza Pagliari
	Update called from for two hooks
2017-01-17	Update called from for two hooks	Sjoerd Langkemper
	`expressCreateServer` and `expressConfigure` are called from `express.js`, not from `server.js`.
2017-01-12	Merge pull request #3122 from tpltnt/freebsd-pkg-fix	Luiza Pagliari
	readme: added curl as dependency
2017-01-12	added curl as dependency	tpltnt

2017-01-12	[chore] Use helper plugin when running tests on Travis	Luiza Pagliari
	This plugin allows us to test code related to plugins, like testing issues that only happen when we have plugins using line attribs, for example (see #3118).
2017-01-12	[fix] Consider line attribs of plugins when building changesets	Luiza Pagliari
	When checking the places on text that are identical between content before and after a changeset, we were considering only the standard (Etherpad-core) attributes, and not taking into account attributes created by the plugins. One consequence was that the '*' marker of lines with line attribs were being kept, even when the new lines have different line attribs. See #3118 for more details. Fix #3118.