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

5022 Commits (f35d3456cf63e2440196da12a5fd695f67025ef6)

Author SHA1 Message Date
Luc Didry f35d3456cf Fix FR dateformat 
FYI, the dateformat in translatewiki is correct.
 2018-06-29 01:23:17 +02:00
translatewiki.net 599b1f4568 Localisation updates from https://translatewiki.net. 2018-06-28 07:21:00 +02:00
translatewiki.net dfd45f0f57 Localisation updates from https://translatewiki.net. 2018-06-21 08:17:13 +02:00
translatewiki.net 3362c683bc Localisation updates from https://translatewiki.net. 2018-06-14 12:22:22 +02:00
translatewiki.net d42393dc93 Localisation updates from https://translatewiki.net. 2018-05-31 08:22:54 +02:00
John McLear fe08d2a1db
Merge pull request #3268 from citizenos/develop 
getLineHTMLForExport - Fixes #2486 but breaks plugins
 2018-05-21 15:56:58 +01:00
translatewiki.net bacc37cf9b Localisation updates from https://translatewiki.net. 2018-05-21 16:02:15 +02:00
ilmar a96aa88dad merge with ether/etherpad-lite develop branch 2018-05-21 16:18:40 +03:00
ilmar 4feccff530 merge with develop branch 2018-05-21 15:41:49 +03:00
ilmar 3c66425b60 List indent fix 2018-05-21 13:07:08 +03:00
ilmar 016497dbb4 prevLine/nextLine check fix 2018-05-14 22:57:15 +03:00
Wikinaut 6dd172d6b7 Update settings.json.template 2018-05-12 21:48:21 +02:00
Wikinaut 784bd8c7cc Update settings.json.template 
harmonizing the database name. "store" is the table name - not to be used here! Database name must not contain "-", but can contain "_". See https://github.com/ether/etherpad-lite/wiki/How-to-use-Etherpad-Lite-with-MySQL
 2018-05-12 21:48:21 +02:00
muxator bfec44e346 Release version 1.6.6 2018-05-05 00:53:59 +02:00
muxator e13ae0aec5 changelog: better specified CVE description 
Previous commit was wrong.
Fixes #3372, really.
 2018-05-04 23:24:58 +02:00
muxator 10d555bc91 changelog: better specified CVE description 
fixes #3372
 2018-05-04 23:15:22 +02:00
muxator 6dbeca217e createRelease.sh: changelog editing failed for multiline messages 
sed does not accept multiline strings in its replacement text.
Let's replace newlines with literal "\n" in modify_files()
 2018-05-04 00:36:09 +02:00
muxator 903a2c8e43 createRelease.sh: added error checking in modify_files() 
Otherwise, when inserting a multiline changelog sed would with this message:
  sed: -e expression #1, char 27: unterminated `s' command

And the script would continue with an unmodified CHANGELOG.md
For simmetry, added the same check to package.json, too
 2018-05-03 23:54:08 +02:00
ilmar 47e20a2f49 line parsing fix 2018-05-03 00:07:07 +03:00
ilmar 6684f9bfe8 hook callAll to aCallAll 2018-05-02 11:45:48 +03:00
ilmar 55ecf31786 html export fix 2018-05-02 11:12:58 +03:00
ilmar c9863f81ad sync with ether/etherpad-lite 2018-05-02 11:08:57 +03:00
ilmar 8d27f3cf03 upgrade to 1.6.5 2018-04-24 13:31:40 +03:00
ilmar 7cc7bb1abc upgrade to 1.6.5 2018-04-24 12:25:56 +03:00
ilmar d6fa065ef2 export html to original structure 2018-04-24 12:13:31 +03:00
translatewiki.net ba322012d7 Localisation updates from https://translatewiki.net. 2018-04-23 08:52:57 +02:00
anugu-chegg 7b6a4aba30 Remove leftover code from earlier commits 2018-04-19 23:23:16 +02:00
anugu-chegg b4068144c3 Refactor code 2018-04-19 23:23:16 +02:00
anugu-chegg 461ed413b7 Fix few mistakes 2018-04-19 23:23:16 +02:00
anugu-chegg d41e184a3c Send commits missed during the reconnect 2018-04-19 23:23:16 +02:00
anugu-chegg bf05e9ae89 Handle client reconnect properly 2018-04-19 23:23:16 +02:00
anugu-chegg 4265f4175e Handle socketio errors properly 2018-04-19 23:23:16 +02:00
anugu-chegg fb20c26c5f Don't send COMMIT-MESSAGE when socketio connection is not active 2018-04-19 23:23:16 +02:00
Benjamin Schweizer d26df86490 made url relative 2018-04-19 22:55:40 +02:00
translatewiki.net 4f2ff31a61 Localisation updates from https://translatewiki.net. 2018-04-19 09:20:05 +02:00
muxator 9daade0b95
fix: line numbers was not aligned with text 
This change partially reverts 0a9d02562d, which got released in 1.6.4
due to #3280.

Text size and line alignment are now reverted back to their 1.6.3
appearance (thus stay non customizable, for now).

Fixes #3378
 2018-04-13 18:32:39 +02:00
translatewiki.net 6dc8ead8c9 Localisation updates from https://translatewiki.net. 2018-04-12 15:16:27 +02:00
translatewiki.net 686ce054fa Localisation updates from https://translatewiki.net. 2018-04-12 09:12:18 +02:00
muxator 3eb3e301a2 manually updated CHANGELOG.md 
due to createRelease.sh not catching an error from sed and continuing:
   sed: -e expression #1, char 66: unterminated `s' command
 2018-04-10 00:50:28 +02:00
muxator 1d4e2b3b11 Release version 1.6.5 2018-04-10 00:47:40 +02:00
ilmar 517b249394 D 2018-04-10 00:08:42 +03:00
nashe 92eee85f36 Escape data when listing available plugins 2018-04-09 22:31:13 +02:00
Olivier Tétard 5b1e1f0c35 Fix typo in `apicalls.js` which prevents from importing `isValidJSONPName`. 2018-04-09 20:56:29 +02:00
ilmar 8502c04bee html lists export fix 2018-04-09 15:37:28 +03:00
translatewiki.net 1fdb01fd75 Localisation updates from https://translatewiki.net. 2018-04-09 08:17:36 +02:00
John McLear b16e7ad25e
unbreak Safari iOS line wrapping 
fixes f5810957b4 (diff-f639eb4efeaabf5624f3229daa1e88cd)
 2018-04-07 18:11:24 +01:00
John McLear fba2bf4df9
Update iframe_editor.css 2018-04-07 17:50:45 +01:00
John McLear 4c16ac4b47
Merge pull request #3367 from ether/master 
Merge in 1.6.4
 2018-04-07 11:05:58 +01:00
John McLear 6a38826e9d
Merge pull request #3366 from ether/release/1.6.4 
Release/1.6.4
 2018-04-07 11:05:31 +01:00
John McLear fa83de778c Password check fix 2018-04-07 10:31:47 +01:00