Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

style, js, contenttype, import scripts, email templates #525

Merged
merged 73 commits into from
Nov 17, 2023
Merged

style, js, contenttype, import scripts, email templates #525

merged 73 commits into from
Nov 17, 2023

Conversation

zombified
Copy link
Contributor

No description provided.

@zombified zombified requested a review from bduncan137 May 18, 2022 13:18
bduncan137 added 25 commits May 23, 2022 16:18
@bduncan137
fix folder_contents paging bugs
4e6fc08
@bduncan137
allow floats or stringified floats in lat and lng
cb090e1
@bduncan137
update HISTORY
b3a3286
@bduncan137
fix some resume bugs, add delete-resumeable-file flag
d912be7
@bduncan137
fix too-modern js
378d618
@bduncan137
style toggle-advanced like other buttons
a649efe
@bduncan137
compile resources
ab83659
@bduncan137
upgrade step
d4c78b2
@bduncan137
update HISTORY
20033d9
@bduncan137
fix max function in less compiler
b833a0d
@bduncan137
compile resources
576698c
@bduncan137
typo
2e25068
@bduncan137
compilation that seems to have worked
aadb4b5
@bduncan137
Squashed commit of the following from BL/contenttypes:
add4c6e 
    history
    upgrade to add descrptions to content types
    deleted non-castle icon types
    added new icons for contenttypes
@bduncan137
castle types updated and upgrades to match
af99e6d
@bduncan137
Merge branch 'Castle/bd/test-icons' of github.com:castlecms/castle.cm…
1768ae2 
…s into Castle/bd/test-icons
@bduncan137
update .gitignore
9664cbc
@bduncan137
remove unneeded init-dev and templates folder
224cc26
@bduncan137
update max statement to compile with newer less/css
50eaa15
@bduncan137
permanently add makefile and package.json
57625f7
@bduncan137
update package-lock, compiled resources
ba9d8a9
@bduncan137
update docs and HISTORY
447b72d
@bduncan137
Merge remote-tracking branch 'origin/Castle/bd/test-icons' into jk/re…
de5e56a 
…sumeimport
@bduncan137
fix typo
7e7cc19
@bduncan137
move from 3004 (old pr) to 3005
60ab725
@bduncan137 bduncan137 changed the title WIP: add resuming (quick skipping already imported paths) to import script Add resuming (quick skipping already imported paths) to import script Nov 9, 2023
@bduncan137
Copy link
Collaborator

  • Update control panel icons, providing one for every castle configlet
  • Update dexterity types so every one has an icon and a short desription
  • Add EmailTemplate dexterity type for repeated emails
  • Fix data-tiles that don't exist from rendering and spamming output
    (for dexterity type definitions in control panel in /@@dexterity-types/)
  • Allow resuming importjson script

bduncan137
bduncan137 approved these changes Nov 10, 2023
View reviewed changes
Copy link
Collaborator

@bduncan137 bduncan137 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I approve this VERY MODIFIED from original PR

@zombified zombified changed the title Add resuming (quick skipping already imported paths) to import script style, js, contenttype, import scripts, email templates Nov 17, 2023
zombified
zombified commented Nov 17, 2023
View reviewed changes
castle/cms/profiles/3009/types/Parallax.xml Outdated Show resolved Hide resolved
castle/cms/theming.py Outdated Show resolved Hide resolved
castle/cms/upgrades/__init__.py Outdated Show resolved Hide resolved
@zombified zombified merged commit 24bf26e into master Nov 17, 2023
3 checks passed
@zombified zombified deleted the jk/resumeimport branch November 17, 2023 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bduncan137 bduncan137 bduncan137 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@zombified @bduncan137