Skip to content

Merge of b_1_5_2#4031

Merged
mauromsl merged 69 commits into
masterfrom
b_1_5_2
Mar 27, 2024
Merged

Merge of b_1_5_2#4031
mauromsl merged 69 commits into
masterfrom
b_1_5_2

Conversation

@mauromsl

@mauromsl mauromsl commented Mar 15, 2024

Copy link
Copy Markdown
Member

b_1_5_2 has been consolidated with b_1_5_1, this PR brings both sets of changes to master

mauromsl and others added 30 commits July 8, 2021 10:24
@mauromsl
Settings file to declare what settings to merge
d75aae5 
Instead of mandating what settting iterables should be merged from the
runtime, a user writing a custom settings module can declare a set of
MERGEABLE_SETTINGS
@mauromsl
Update jenkins settings
908c485
@mauromsl @ajrbyers
#3977: Download XML/PDF urls only available if article is published
bb0807b
@mauromsl
XSLT: Adds support for embedding criticalcommons
56df82f
@ajrbyers @mauromsl
Fixes a bug that stopped the submission page from rendering when usin…
9f195d5 
…g the clean theme.
@ajrbyers @mauromsl
Fixes an issue with the press nav on the clean theme
c31a704
@mauromsl
#2284: Preserve default mergeable settings
21c5c14
@mauromsl
Merge branch 'b_1_5_2' into 2284-bugfix
157fe9e 
Signed-off-by: Mauro MSL <[email protected]>
@mauromsl
#2284: Undo whitespace change from rebase
56b5707 
Signed-off-by: Mauro MSL <[email protected]>
@mauromsl
Merge pull request #2294 from BirkbeckCTP/2284-bugfix
88ba037 
Settings file to declare what settings should be merged
@mauromsl @ajrbyers
Adds TinyMCE WYSIWYG editor
2e662ea
@mauromsl @ajrbyers
#1481: Adds custom Bleach fields
45ad214
@mauromsl @ajrbyers
#1481: Bleach + TinyMCE on submission app
ad763ae
@mauromsl @ajrbyers
#1481: Bleach + TinyMCE on journal app
476b6ab
@mauromsl @ajrbyers
#1481: Bleach + TinyMCE on cms app
fb0f729
@mauromsl @ajrbyers
#1481: Bleach + TinyMCE on core app
72b9fef
@mauromsl @ajrbyers
#1481: Bleach + TinyMCE on comms app
46c2e9a
@mauromsl @ajrbyers
#1481: Bleach + TinyMCE on press app
d91efe5
@mauromsl @ajrbyers
#1481: Bleach + TinyMCE on repository app
c6c9a4c
@mauromsl @ajrbyers
#1481: Adds bleach + TinyMCE migrations
bc946ee
@mauromsl @ajrbyers
#1481: Bleach + TinyMCE on revie app
12a6bdc
@mauromsl @ajrbyers
#1481: Remove no longer needed bleach forms for clarity
2faf2cd
@mauromsl @ajrbyers
#1481: Add admin css into TinyMCE widget
6d29074
@mauromsl @ajrbyers
#1481: Adds JS files and custom callbacks
ae85d90
@mauromsl @ajrbyers
#1481: Render remaining review JQTE fields as TinyMCE
819a6f1
@mauromsl @ajrbyers
#1481: Use TinyMCE for text-area submission fields
0d73806
@mauromsl @ajrbyers
#1481: Undo old bleach change to comms form
beb31b6
@mauromsl @ajrbyers
#1481: Undo bleach repository models
f75e058
@mauromsl @ajrbyers
#1481: Undo bleach setting description
baf9431
@mauromsl @ajrbyers
#1481: Remove code commented out
552038c
ajrbyers and others added 27 commits March 15, 2024 13:21
@ajrbyers
#3979 updated comment.
907c090
@ajrbyers
#3979 tweaked the format of this function after discussion with @maur…
50e5cc0 
…omsl
@ajrbyers
#3979 added trailing comma.
c933d80
@ajrbyers
#3979 updated warning text as per suggestion.
0c67820
@ajrbyers
#3979 default behaviour now overwrites the existing file. For workflo…
9af0109 
…w use check_for_existing_images should be set to True (and is in Prod/Typesetting).
@ajrbyers
#3979 add return after overwrite
e7d8699
@ajrbyers
#3979 as the file is replaced, we don't need to remove the image from…
7906438 
… galley.images
@ajrbyers @mauromsl
Adds mising close > to the tinyMCE script tag
cbde402
@joemull
Merge pull request #4032 from BirkbeckCTP/3979-cherrypick
646319b 
Stops multiple galley image files with the same name from being loaded in the edit galley interface.
@mauromsl
Adds latest es and de .po files
75863b5
@mauromsl
Bumps displayed Janeway version to RC 6
b623e92
@mauromsl
Merge remote-tracking branch 'origin/b_1_5_1' into b_1_5_2
97f61ec
@mauromsl
Adds merge migrations for schema resolution after b_1_5_1 merge
d52b771
@mauromsl
Adds tinyMCE assets to edit profile JS block
843e71c
@joemull
Merge pull request #4038 from BirkbeckCTP/tinymce-profile-themes
9962633 
Added support for clearing fromatting from pasted inputs onto the user page data
@mauromsl
openlibhums/pandoc_plugin#17: Fix newlines leading to rendered whites…
13ae13b 
…pace
@joemull
Merge pull request #4044 from BirkbeckCTP/pandoc-3-bugfix
97ea2a3 
Fixes additional whitespace being added after italics and bold to HTML galleys
@mauromsl
Merge remote-tracking branch 'origin/b_1_5_1' into b_1_5_2
5925b5c
@mauromsl
#4034: TinyMCE to use browser native fullscreen
54797a0
@joemull
Merge pull request #4045 from BirkbeckCTP/4034-fullscreen-native
43a40e6 
Rich text editor now supports escape to close the full screen view
@mauromsl
Merge remote-tracking branch 'origin/b_1_5_1' into b_1_5_2
b230bc8
@ajrbyers @mauromsl
Fixes the skip nav link
2a0100d
@ajrbyers @mauromsl
Remove errant > character in skip nav section
cc1af7b
@mauromsl
Fixes some bad translations on register.html
4437ef6
@mauromsl
Update changelog
77e549e
@mauromsl
Merge remote-tracking branch 'origin/b_1_5_1' into b_1_5_2
5ccc89b
@mauromsl
Updates test to cope with 13ae13b
cce5c6f
@mauromsl mauromsl merged commit 905736f into master Mar 27, 2024
@mauromsl mauromsl deleted the b_1_5_2 branch March 27, 2024 19:11
@mauromsl mauromsl restored the b_1_5_2 branch March 28, 2024 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mauromsl @ajrbyers @joemull