Commit Graph

6972 Commits (1d9f8cf7600d6d9baa4cacacb0b4862b939a9d8f)

Author SHA1 Message Date
webzwo0i 1d9f8cf760 make css assets static links 2021-03-01 01:25:11 +01:00
webzwo0i 99847027fd fix request uri for safari 2021-03-01 01:05:22 +01:00
webzwo0i 348105fcbc add src=about:blank also to outerFrame 2021-02-28 23:34:32 +01:00
webzwo0i 707dc91caa add iframe.src 2021-02-28 23:27:47 +01:00
webzwo0i 576be344e4 move require of Ace2Inner up 2021-02-28 18:46:05 +01:00
webzwo0i 874f2ccc88 works 2021-02-28 18:43:25 +01:00
Richard Hansen 73cbcc7d3c ace: Build the outer and inner iframes programmatically
This makes the code easier to read and it silences Chrome's
`document.write()` warning:
https://developers.google.com/web/updates/2016/08/removing-document-write
2021-02-28 18:43:25 +01:00
Richard Hansen 0c73983d23 ace: Simplify the `aceEditorCSS` hook map function 2021-02-28 18:43:25 +01:00
Richard Hansen e1415efa03 ace: Delete unused `$$INCLUDE_CSS` logic
Nothing "compiles" the file by replacing `$$INCLUDE_CSS()` calls
anymore so it is safe to simplify the code.
2021-02-28 18:43:25 +01:00
Richard Hansen d5130d0d5a ace: Factor out duplicated `$$INCLUDE_CSS` code 2021-02-28 18:43:25 +01:00
Richard Hansen 012f8ef5a7 ace: Delete unused `clientVars.disableCustomScriptsAndStyles` 2021-02-28 18:43:25 +01:00
Richard Hansen dc9fda3556 ace: Delete unnecessary IIFE 2021-02-28 18:43:24 +01:00
Richard Hansen e38a3c5fe2 ace: Lint and simplify script strings 2021-02-28 18:42:37 +01:00
Richard Hansen 6f717578aa ace: Format script strings for readability 2021-02-28 18:42:34 +01:00
Richard Hansen 50fa336253 ace: Delete ignored class attribute 2021-02-28 18:41:44 +01:00
John McLear b3d7f5d63e pluginTools: stalePlugins.js
Outputs a list of pluginnames and email address for maintainers to contact.  Useful for me to bump folks to maintain there stuff and stop it getting stale :)
2021-02-28 16:05:53 +00:00
John McLear 35ae08ca77
tests: run a long(1+ hr) load test 2021-02-28 16:05:16 +00:00
John McLear d7fd3934de
Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2021-02-28 15:51:51 +00:00
John McLear 237bab7e3e
branding: change etherpad lite to etherpad in Pad settings modal 2021-02-28 15:51:39 +00:00
Stefan a6ac0940cd Link discord and plugins badge with a meaningful url 2021-02-28 11:24:10 +00:00
Richard Hansen 99b3918f2c Minify: Compatibility for all `vendors/*.js` files 2021-02-28 11:12:30 +00:00
John McLear b0d78d662e
tests: include ep_embedmedia in tests (#4889) 2021-02-28 09:26:43 +00:00
Richard Hansen 3667f2ca0e Ace2Inner: Fix missing spread operator on `args`
This fixes a bug that was introduced in commit
c38c34bef4.
2021-02-28 08:39:47 +00:00
Richard Hansen 16e6496eb4 deps: Update ueberdb2 to fix dirty DB bug 2021-02-28 08:03:20 +00:00
webzwo0i 377883db98
fix pads with spaces (#4884) 2021-02-27 22:34:43 -05:00
John McLear 68c4ed7189
Merge branch 'master' into develop 2021-02-27 16:46:26 +00:00
John McLear ad84c8a5a4
Merge branch 'develop' 2021-02-27 16:46:25 +00:00
John McLear 37769cc9ff
bump version 2021-02-27 16:46:22 +00:00
John McLear c394577695
changelog 1.8.11 2021-02-27 16:45:02 +00:00
webzwo0i 348d08c79e ensure version string is attached for inner frame resources 2021-02-27 16:28:12 +00:00
webzwo0i 01dd9f5440 speed up page load 2021-02-27 16:28:12 +00:00
John McLear ba2004cb2d nice-select restore to working
I accidently committed a breaking change in 1b8cd0747d/src/static/js/vendors/nice-select.js
2021-02-27 16:23:39 +00:00
Richard Hansen 3a34db84e6 tests: Refine CachingMiddleware tests
* Lint functions
  * Fix assignment of `settings.minify`
  * Use a for loop to avoid copied code for the `minify = true` and
    `minify = false` cases
  * Put each resource fetch into its own test case
  * Check for 200 status code
  * Use `.expect()` to check header value
  * Use `.expect(fn)` instead of `.then(fn)`
2021-02-27 14:03:09 +01:00
Richard Hansen f86df5322e CachingMiddleware: Asyncify 2021-02-27 14:03:09 +01:00
Richard Hansen 0284d49522 CachingMiddleware: Switch to ES6 class syntax 2021-02-27 14:03:09 +01:00
Richard Hansen 80af66543a lint: Move up `respond()` in `caching_middleware.js` 2021-02-27 14:03:09 +01:00
Richard Hansen 7ab3ee2121 lint: `src/node/utils/caching_middleware.js` 2021-02-27 14:03:09 +01:00
Richard Hansen 392d9dcfde PadMessageHandler: Fix fetching of socket.io Sockets for a pad 2021-02-27 08:46:49 +00:00
Richard Hansen 9cd67cd990 PadMessageHandler: Delete unnecessary use of `Promise.then()` 2021-02-27 08:46:49 +00:00
webzwo0i 15dba7d886
move underscore to its old place and remove unnecessary packages (#4876) 2021-02-27 00:10:53 -05:00
John McLear c0ec28f781 reversecompat: underscore
Backward compatibility for plugins that were written when underscore lived at src/static/js/underscore.js.
2021-02-26 11:03:19 +00:00
John McLear 50782bd03a
Merge branch 'master' into develop 2021-02-25 18:26:21 +00:00
John McLear 55f76c565c
Merge branch 'develop' 2021-02-25 18:26:20 +00:00
John McLear 11f3b7232d
bump version 2021-02-25 18:26:17 +00:00
John McLear 6efa41ec23
update Changelog 1.9.10 2021-02-25 18:25:00 +00:00
webzwo0i efd211bbc5 remove useless semicolon 2021-02-25 16:59:06 +00:00
webzwo0i fa29858a4e avoid manually including require-kernel in ace.js 2021-02-25 16:59:06 +00:00
translatewiki.net 12c23d468c Localisation updates from https://translatewiki.net. 2021-02-25 16:17:56 +01:00
webzwo0i a77994ab6e avoid pad_utils in pad.html 2021-02-25 12:46:04 +00:00
John McLear 9675a584ce
Windows Installer Badge into README
Windows Installer Badge into README
2021-02-25 10:44:00 +00:00