Skip to content

flavor/blog #392

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
Open
github-actions wants to merge 114 commits into
base: main
Choose a base branch
from
Open

flavor/blog #392

github-actions wants to merge 114 commits into from

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Aug 21, 2022

flavor/blog

flauc and others added 30 commits June 17, 2021 08:19
@flauc
feat: updated library versions
5a9815e
@flauc
feat(web): connecting blog 🚧
4bc7261
@flauc
feat: extended common block
8f4136d
Merge branch 'flavor/mw' into flavor/mw-blog
aa2bd31 
# Conflicts:
#	client/package-lock.json
#	client/package.json
#	client/projects/cms/src/assets/i18n/en.json
feat: added automatic emails and sent emails
5b1f1ad
@flauc
Merge remote-tracking branch 'origin/flavor/mw' into flavor/mw-blog
62f1ca5 
# Conflicts:
#	client/angular.json
#	client/package-lock.json
#	client/package.json
#	client/projects/cms/src/assets/i18n/en.json
#	package.json
#	setup/collections/settings.collection.ts
#	setup/package-lock.json
@flauc
Merge remote-tracking branch 'origin/flavor/mw' into flavor/mw-blog
61fcd8f 
# Conflicts:
#	package-lock.json
@flauc
feat: connected automatic emails and forms in page builder blocks
c60cdcc
@flauc
chore(cms): starting on different port from website
faae6b8
@flauc
feat: connected web workflow and build command
0cebaeb
@flauc
feat: added production checklist
5389d29
feat: added build:web to build script
ad358b2
Merge remote-tracking branch 'origin/flavor/mw' into flavor/mw-blog
ac598aa 
# Conflicts:
#	package-lock.json
Merge branch 'flavor/mw' into flavor/mw-blog
da976ad 
# Conflicts:
#	package-lock.json
@flauc
chore: removed need for DATABASE_URL secret
626ad92
@flauc
fix: adjusted path for web build
51d52aa
@flauc
Merge branch 'flavor/mw' into flavor/mw-blog
692b310 
# Conflicts:
#	CHANGELOG.md
#	package-lock.json
@flauc
Merge remote-tracking branch 'origin/flavor/mw' into flavor/mw-blog
4b2aa43 
# Conflicts:
#	package-lock.json
@flauc
ci: fixed indent on web
ff18608
@flauc
ci: fixed indent on web
177e591
@flauc
chore: added empty meta tags
17f3f37
@flauc
ci: web build fix
8742776
@flauc
chore: build adjustments
a979fb4
fix(web): added missing live environment
670e34f
fix(web): importing firebase from wrong project
ad20b25
@flauc
feat: adaptations for decorator blocks
87b38c4
@flauc
feat(web): connected app init for preloading page that is currently b…
efec47a 
…eing navigated to
fix(cms): missing common option defaults and translations
b21e8ba
fix: update query params if changed in block-link
4c5ecd6
feat: added ctrl support for block-link
4d20f3b
flauc and others added 30 commits February 10, 2022 08:24
@flauc
feat(web): persisting global loader for initial page load
f9c82bd
@flauc
Merge branch 'main' into flavor/blog
8fd2496
@flauc
Merge branch 'main' into flavor/blog
e9ccba7
@flauc
Merge branch 'main' into flavor/blog
6de058a
@flauc
chore(web): removed not-found since it can be created through page bu…
d024c02 
…ilder
@flauc
chore: version updates and code cleanup
85236e2
@flauc
Merge branch 'main' into flavor/blog
2d06b47
@flauc
fix: added missing hr translations
2115560
@flauc
Merge branch 'main' into flavor/blog
5046c84
@flauc
Merge remote-tracking branch 'origin/main' into flavor/blog
e761130
@flauc
Merge remote-tracking branch 'origin/main' into flavor/blog
e03139a
@flauc
Merge remote-tracking branch 'origin/main' into flavor/blog
7a58543
@flauc
Merge remote-tracking branch 'origin/main' into flavor/blog
7379999
@flauc
chore: merge conflicts
9b31a81
@AntonioStipic
Merge branch 'main' into flavor/blog
67f5162 
# Conflicts:
#	client/package-lock.json
#	client/package.json
#	client/projects/cms/src/app/modules/dashboard/modules/module-instance/pages/instance-single/instance-single.component.ts
#	definitions/package-lock.json
#	functions/package-lock.json
@AntonioStipic
chore(cms): merge main into current
2aaccd2
@AntonioStipic
fix(cms): preserveSymlinks for cms project in angular.json
ab70ff4
@flauc
Merge branch 'main' into flavor/blog
3ea7917
@flauc
fix: indent in dynamic-pages workflow
ec03b1c
@flauc
fix: proper indent in dynamic-pages workflow
882f2e3
@flauc
chore(web): restore scroll position
791bf0a
@flauc
Merge remote-tracking branch 'origin/main' into flavor/blog
47abf95
@flauc
fix: missing 404 in build.js
5bdfb8c
@flauc
feat(definitions): added upload method for meta
028b063
@flauc
Merge branch 'main' into flavor/blog
26d5da9
@flauc
fix(cms): FormSubmissionGuard properly calling next
9fba769
@flauc
chore(cms): removed unused imports in FormSubmissionGuard
5aa76a9
@flauc
Merge remote-tracking branch 'origin/main' into flavor/blog
744242c
@flauc
chore: fixed inconsistency in build.js
c75f0a1
@flauc
Merge remote-tracking branch 'origin/main' into flavor/blog
29020ac
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.

5 participants

@flauc @iGrubesic @makiJS @AntonioStipic