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

3308 Commits (c8361a211a1e6bfbbc006933f48d48ca51857c71)

Author SHA1 Message Date
webzwo0i b3680058ff
getChangesetInfo: print error message (#4172) 2020-07-16 23:54:15 +01:00
John McLear 410d20417d
Bumping async (#4171) 
Resolves #3940
 2020-07-16 17:37:42 +01:00
John McLear 78c97d811c
Script to create session and store token <> author more throughly (dont create ghosts) (#4012) 2020-07-16 10:51:02 +01:00
John McLear 9bf1b9f2a2
bugfix / testing: Ie11 warning for not having Promises (#4167) 
Makes IE11 work again but may cause an issue for plugin testing in IE11.  IE plugin tests in IE11 will probably fail as the plugin code will not execute.
 2020-07-16 09:31:35 +01:00
John McLear e24ef6969e
Bugfix / tests: Specs list type (#4169) 
* remove cruft..  ugh

* housekeeping: close stale issues

* fix issue #3945
 2020-07-15 17:37:03 +01:00
John McLear ab8320d15b
WIP - Test Coverage: Import & Export include LibreOffice Test Coverage (#4163) 
Runs on Travis
Will only run locally is ``allowAnyoneToImport`` and ``soffice`` or ``abiword`` is set.
 2020-07-14 18:44:53 +01:00
translatewiki.net 9d69caa8dc Localisation updates from https://translatewiki.net. 2020-07-14 10:15:56 +02:00
Florian Rittmeier c7581ba6f3
fixes jQuery.Deferred exception as reported in #4132 (#4158) 2020-07-10 15:28:32 +01:00
translatewiki.net 908ce78e70 Localisation updates from https://translatewiki.net. 2020-07-10 11:30:55 +02:00
John McLear b15154cc23
Same site cookie fix - Ready for testing / merge (#3990) 
* initial fix for httpprefs

* token

* express_sid fix
 2020-07-10 08:43:20 +01:00
b_b 3ea8d571e7
Fix PDF import with libreoffice (#4156) 
Fix #4151
 2020-07-09 23:50:45 +01:00
b_b 358af5fea1
Fix typo in comment (#4154) 2020-07-09 12:32:54 +01:00
John McLear a3386e3e55
Dont use jquery in import handler (#4153) 
I think jQ3 update broke imports a bit, so this removes jQuery and also ensures only .etherpad does reload of page.
 2020-07-08 14:50:48 +01:00
translatewiki.net 2f7e097711 Localisation updates from https://translatewiki.net. 2020-07-06 18:44:49 +02:00
John McLear 313bba09d6
Update ueberdb big update (#4149) 2020-07-05 11:05:32 +01:00
translatewiki.net 4b721785e0 Localisation updates from https://translatewiki.net. 2020-07-02 17:44:57 +02:00
translatewiki.net 18494dd657 Localisation updates from https://translatewiki.net. 2020-06-29 16:18:59 +02:00
webzwo0i 2814ebfe65
i18n: include about and poweredBy in locales (#4140) 2020-06-27 20:12:37 +01:00
webzwo0i b7dff552f0
cruft: Remove unecessary consolelogs (#4141) 2020-06-27 20:12:06 +01:00
John McLear 168737b6d8
pluginfw: Move Timeslider eejs block to correct location (#4139) 2020-06-27 09:52:53 +01:00
axlevxa 0e2749831a
UX: Add prefers-reduced-motion query for Colibris skin #4136 (#4137) 2020-06-27 09:49:37 +01:00
John McLear 8a13bde535
bugfix: #4067 openapi incorrect syntax (#4138) 
https://github.com/ether/etherpad-lite/issues/4067#issuecomment-650423412 

Thanks to @tom-chase
 2020-06-27 09:47:16 +01:00
translatewiki.net 75ecb3f49b Localisation updates from https://translatewiki.net. 2020-06-22 17:19:38 +02:00
translatewiki.net 774a075cfc Localisation updates from https://translatewiki.net. 2020-06-18 21:14:49 +02:00
John McLear beccf677a4
bugfix: Fix #4120 where an author might not be populated on restart - if this is the case don't push the author to the array. 2020-06-17 10:54:10 +01:00
translatewiki.net d19937fa06 Localisation updates from https://translatewiki.net. 2020-06-15 22:11:47 +02:00
Stefan 9a22144a83
staleCode: Remove unnecessary robots.txt entry (#4113) 2020-06-14 20:49:13 +01:00
John McLear 045ac70db8
pluginfw: Make the NEW_CHANGES payload include the message in handleClientMessage 2020-06-12 12:26:33 +01:00
translatewiki.net 85383a316d Localisation updates from https://translatewiki.net. 2020-06-11 19:23:22 +02:00
John McLear 93829b9e33
pluginfw/performance: Dont cache if max age is 0 (#4098) 2020-06-08 17:21:55 +01:00
translatewiki.net 497704eb03 Localisation updates from https://translatewiki.net. 2020-06-08 17:03:38 +02:00
John McLear f1e3aff72f stale code: use terser instead of uglify 2020-06-07 20:09:10 +00:00
John McLear 166e1371da socket.io bump to 2.3.0 2020-06-07 19:12:11 +00:00
John McLear 512a51149d Revert "Merge branch 'develop' of github.com:ether/etherpad-lite into develop" 
This reverts commit 6fad0210f8, reversing
changes made to 128f3e15eb.
 2020-06-07 18:46:41 +00:00
John McLear 564e8fee07 forcing back to last known stable before parent merge 2020-06-07 18:44:01 +00:00
John McLear 49cd270592 including terser, again 2020-06-07 17:09:48 +00:00
John McLear 0ab9e1e8c3 ffs npm how you get so broke 2020-06-07 16:53:49 +00:00
John McLear 4b37034f0c ugh attempt to overwrite package files due to weirdness 2020-06-07 16:38:50 +00:00
John McLear b1ce372035 bump package lock 2020-06-07 13:57:58 +00:00
John McLear 009e1d01f7
staleCode: Async update 2020-06-07 14:56:45 +01:00
John McLear 0669280af0 Revert "socketio230" 
This reverts commit fbb7b5123b.
 2020-06-07 13:46:53 +00:00
John McLear fbb7b5123b socketio230 2020-06-07 12:57:28 +00:00
John McLear 6fad0210f8 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2020-06-07 12:56:20 +00:00
John McLear 128f3e15eb
stalecode: jQuery 3 (#3903) 2020-06-07 12:01:14 +01:00
John McLear ea9a9cd883 Revert "Revert "stale: Terser instead of uglify (#4075)"" 
This reverts commit 423be7f081.
 2020-06-07 10:08:11 +00:00
John McLear c5584fb5b4
editor: outdent on ol removal (#4088) 2020-06-07 09:51:12 +01:00
John McLear 2cd3dccc4d Revert "Revert "Revert "editor: ul/ol/li - outdent on ol and ul button press""" 
This reverts commit fd3980133d.
 2020-06-06 20:51:17 +00:00
John McLear fd3980133d Revert "Revert "editor: ul/ol/li - outdent on ol and ul button press"" 
This reverts commit 82fb6ddc99.
 2020-06-06 20:38:08 +00:00
John McLear 82fb6ddc99 Revert "editor: ul/ol/li - outdent on ol and ul button press" 
This reverts commit fc88f12bba.
 2020-06-06 18:34:51 +00:00
John McLear aff93d24dd
export: txt import include correct OL prefix (#4086) 
Includes test coverage
Final part of solving https://github.com/ether/etherpad-lite/issues/3447
 2020-06-06 14:30:13 +01:00
John McLear 423be7f081 Revert "stale: Terser instead of uglify (#4075)" 
This reverts commit 552b6d7adb.
 2020-06-05 23:55:14 +00:00
John McLear 552b6d7adb
stale: Terser instead of uglify (#4075) 2020-06-05 23:10:24 +01:00
John McLear 56f6973209
import/export: Timeslider export links numeric pad IDs (#4073) 
Fixes #4071
 2020-06-05 22:50:55 +01:00
John McLear 6dbfe5e43c
editor/ux: Clearauthorship on full doc selected 2020-06-05 22:47:12 +01:00
John McLear d4fcc23fb3
backups: include the pool every 100 revs stored (#3991) 2020-06-05 22:46:12 +01:00
John McLear 33ad48714c stale code: update package-lock.json and force re-run tests 2020-06-05 20:04:50 +00:00
John McLear a4bdcc3392
tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes 
1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
 2020-06-05 20:54:16 +01:00
John McLear fc88f12bba
editor: ul/ol/li - outdent on ol and ul button press 2020-06-05 20:00:21 +01:00
John McLear 13bd859f31
Import/export: Fix3032 - importing document botches pad options (#3769) 
Fixes #3032
 2020-06-05 19:58:25 +01:00
translatewiki.net c9ffe59b55 Localisation updates from https://translatewiki.net. 2020-06-04 17:46:31 +02:00
Chocobozzz c854cced65
performance: Use worker threads to minify JS/CSS files (#3823) 2020-06-04 14:00:50 +01:00
Gerrit Pape f925d5fc74
ui: Add a home icon (#4076) 
This commit adds the fontawesome "home" icon, codepoint e80b
 2020-06-03 10:56:24 +01:00
Sebastian Castro 7aa7e02e27
Various UI improvement (#4017) 2020-06-02 10:25:43 +01:00
Alex f45d85f615
editor: fix the wrong URL when we use etherpad without /p/ in the URL (#4070) 2020-06-01 22:12:42 +01:00
translatewiki.net b1e50ab835 Localisation updates from https://translatewiki.net. 2020-06-01 22:30:02 +02:00
John McLear 0d51e71578
ux: Better ux for if cookies are disabled or not available. 2020-06-01 20:17:48 +01:00
Richard Hansen 07c73d4f2d
webaccess: Log authentication attempts (#4022) 
Addresses issue #4016.
 2020-06-01 20:11:57 +01:00
John McLear addb9b957a
import: Resolve error handling import causes instance crash 2020-06-01 20:09:10 +01:00
b_b f84837ef9b
plugins: add hooks for index.html template 
ref #3978
 2020-06-01 19:43:11 +01:00
John McLear 2c944eba34
minification: use mime lookup for mime types (#3979) 2020-06-01 19:37:54 +01:00
John McLear 71bffed190
tests: fix for fuzz tests (#4068) 2020-06-01 18:52:46 +01:00
ssendev 0b7ace83d5
ui: hide create/open pad buttons on index page (#3974) 
if requireSession or editOnly is set these buttons always fail
 2020-06-01 18:28:13 +01:00
John McLear bfca481b0b
import: setting for allowing import without author existing 2020-06-01 18:19:06 +01:00
Stefan cffd04446e
admin: Add etherpad update check 
This update check notifies admin on startup (via console) or in /admin UI that they need to update Etherpad.
 2020-06-01 17:57:53 +01:00
John McLear 8deac52c84 tests: include mocha froth in package lock and better syntax for package.json 2020-06-01 16:35:38 +00:00
John McLear dc11b85e62
tests: fuzzing, binary imports 2020-06-01 17:26:55 +01:00
Chocobozzz 59b1a2d5e0
performance: add template cache for quicker page renders 2020-06-01 15:00:47 +01:00
John McLear 7273778e5f doh, recommit package-lock 2020-05-30 18:40:44 +00:00
John McLear add3b23f66 tests: load testing into core 2020-05-30 18:17:33 +00:00
John McLear 2011c24f57
editor: Don't restrict plugins from being able to bring in newline content 
#2412 broke this, it was discovered in https://github.com/JohnMcLear/ep_copy_paste_images/issues/20.

The limitation means that images can't be pasted within lists which IMHO is fine.  I could refine this down to OL only but I think images within lists would be fine not to include.
 2020-05-29 16:53:08 +01:00
John McLear 00b6a1d9fe
Remove top console logs to stop hosted iFrames being broken. 2020-05-29 12:56:03 +01:00
John McLear b2a723e57f
editor: Don't allow edits during reconnecting 
Not the best fix but better than the current status quo.
 2020-05-29 12:35:00 +01:00
John McLear 40f36d7eb5
Tests: ShowChat fix (#4049) 
Resolves https://github.com/ether/etherpad-lite/issues/3541
 2020-05-28 15:18:13 +01:00
John McLear bcdb331c79
tests: Embed test fix (#4020) 
* quick fix for iframe code wihch someone broke

* Also fix cookie test
 2020-05-27 16:54:20 +01:00
translatewiki.net 66a43646a7 Localisation updates from https://translatewiki.net. 2020-05-26 17:05:30 +02:00
Daniel Krol f79b50d311
Remove superfluous semicolon (#4037) 2020-05-21 16:43:15 +01:00
Daniel Krol 61c7bb9699
feat(i18n) Custom i18n strings (#4000) 
* Custom i18n strings (and some code formatting)

* Documentation for per-instance l10n overwrites
 2020-05-19 13:21:31 +01:00
translatewiki.net 170f471299 Localisation updates from https://translatewiki.net. 2020-05-18 16:03:29 +02:00
Richard Hansen 901a3f396e Revert "SessionStore: replace password with PASSWORD_HIDDEN when storing in db" 
This reverts commit 53f126082a, which
broke user authentication.

Fixes issue #4016.
Reopens issue #3421.
 2020-05-17 13:00:17 +02:00
muxator 4644e7a127 dependencies: update cookie-parser 1.4.4 -> 1.4.5 2020-05-15 13:09:56 +02:00
muxator 7ea85cbb03 dependencies: update wd 1.11.4 -> 1.12.1 
This is a dev dependency. No impact in production.
 2020-05-15 13:09:56 +02:00
muxator 026675170d dependencies: update mocha 7.1.1 -> 7.1.2 
This is a dev dependency. No impact in production.
 2020-05-15 13:09:56 +02:00
muxator 9da53707e4 dependencies: update nyc 15.0.0 -> 15.0.1 
This is a dev dependency. No impact in production.
 2020-05-15 13:09:56 +02:00
muxator b5cf3cf718 dependencies: update request 2.88.0 -> 2.88.2 2020-05-15 13:09:56 +02:00
muxator 14b0c3a7bd dependencies: update express-session 1.17.0 -> 1.17.1 2020-05-15 13:09:56 +02:00
muxator 3e9def7017 dependencies: update graceful-fs 4.2.2 -> 4.2.4 2020-05-15 13:09:56 +02:00
muxator 738d573cc3 package-lock: regenerated with integrity-checked dependencies 2020-05-15 13:09:56 +02:00
muxator 7403a46d2e dependencies: update npm 6.14.4 -> 6.14.5 2020-05-15 13:09:56 +02:00
muxator 4365598658 release: prepare for 1.8.4 2020-05-15 02:09:18 +02:00
muxator 37abb21a55 minify: rebase relative urls in imported files. 
4177b3f943 moved the font-face declarations from src/static/css/pad.css to two
imported files (src/static/css/pad/fonts.css, src/static/css/pad/toolbar.css)
in a different directory.

This results in the font files being invoked from CSSes residing in different
directories in the minified and un-minified case. URLs in the src attribute are
relative to the stylesheet path [0], and so we have to start requiring clean-css
to rebase them.

Before this change, the non minified casse worked by chance, because there were
a lot of "..", which ended up resolving to the root of the site anyways.

Fixes #3956

[0] https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src
 2020-05-15 01:29:13 +02:00