Skip to content

Beta.6.55. Final merge#600

Merged
alexandergull merged 64 commits into
masterfrom
beta.6.55.ag
Apr 24, 2025
Merged

Beta.6.55. Final merge#600
alexandergull merged 64 commits into
masterfrom
beta.6.55.ag

Conversation

@alexandergull
Copy link
Copy Markdown
Member

AntonV1211 and others added 30 commits March 11, 2025 20:33
# Conflicts:
#	js/apbct-public-bundle.min.js
#	js/apbct-public-bundle_ext-protection.min.js
#	js/apbct-public-bundle_ext-protection.min.js.map
#	js/apbct-public-bundle_full-protection.min.js
#	js/apbct-public-bundle_full-protection.min.js.map
#	js/apbct-public-bundle_int-protection.min.js
#	js/apbct-public-bundle_int-protection.min.js.map
# Conflicts:
#	js/cleantalk-admin-settings-page.min.js.map
Upd. Settings. Access key field  behavior updated
alexandergull and others added 28 commits April 16, 2025 13:33
# Conflicts:
#	js/apbct-public-bundle.min.js
#	js/apbct-public-bundle_ext-protection.min.js
#	js/apbct-public-bundle_ext-protection.min.js.map
#	js/apbct-public-bundle_full-protection.min.js
#	js/apbct-public-bundle_full-protection.min.js.map
#	js/apbct-public-bundle_int-protection.min.js
#	js/apbct-public-bundle_int-protection.min.js.map
#	js/cleantalk-admin-settings-page.min.js.map
Mod. Settings. Renaming the Set cookies option
…ipt paths to prevent errors when the setting is disabled.
# Conflicts:
#	css/cleantalk-admin-settings-page.min.css
#	css/src/cleantalk-admin-settings-page.css
#	js/cleantalk-admin-settings-page.min.js
#	js/cleantalk-admin-settings-page.min.js.map
# Conflicts:
#	css/cleantalk-admin-settings-page.min.css
#	css/src/cleantalk-admin-settings-page.css
#	js/cleantalk-admin-settings-page.min.js
#	js/cleantalk-admin-settings-page.min.js.map
# Conflicts:
#	cleantalk.php
#	js/apbct-public-bundle.min.js
#	js/apbct-public-bundle_ext-protection.min.js
#	js/apbct-public-bundle_ext-protection.min.js.map
#	js/apbct-public-bundle_full-protection.min.js
#	js/apbct-public-bundle_full-protection.min.js.map
#	js/apbct-public-bundle_int-protection.min.js
#	js/apbct-public-bundle_int-protection.min.js.map
@alexandergull alexandergull merged commit 10a6f69 into master Apr 24, 2025
2 checks passed
@alexandergull alexandergull deleted the beta.6.55.ag branch April 24, 2025 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants