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

Merge tag v2.2.0 into 2.x #1182

Merged
merged 254 commits into from
Aug 21, 2024
Merged

Merge tag v2.2.0 into 2.x #1182

merged 254 commits into from
Aug 21, 2024

Conversation

Shadow243
Copy link
Member

@Shadow243 Shadow243 commented Aug 20, 2024 •
edited
Loading

This PR is merging missing commits from tag 'v2.2.0' into 2.x

Shadow243 and others added 30 commits May 6, 2024 20:22
@Shadow243 @josaphatim
Add empty check to compose_delivery_receipt to avoid Undefined array …
23eb1d1 
…key error
@kroky
Merge pull request cypht-org#997 from josaphatim/fixed-providers-that…
9fbf1aa 
…-doesnot-support-scripts-inclusion

Handled providers that don't permit scripts inclusion
@kroky
Merge pull request cypht-org#995 from josaphatim/fixed-issue-with-sie…
836adb5 
…ve-add-filter

Fixed add filter issues
@kroky
Merge pull request cypht-org#996 from jacob-js/fix-validate-method
c9c8ee2 
Adapt filter_input_array Hm_Function to return expected _SERVER data in FastCGI as well
@kroky
Merge pull request cypht-org#1002 from jacob-js/fix-inline-resources
117f04b 
Add external resources handling for inline message style
@marclaporte
Remove broken link
936ce7a
@marclaporte
Jason is unavailable these days
a13a6ca 
So removing his email. It's better that people come to the chat room.
change the order of options for account creation
a741836
@Shadow243 @josaphatim
Remove trans while saving
2cf7a0a
@kambereBr
Handle Unicode in folder names
e692515
review par rapport aux proposition de Mr Josaphat
515c32e
after marge
b1a6bd5
file reset
cd0b7c5
file reset
bec19d2
file reset
1326c6d
@David-Muhasa
Merge pull request cypht-org#1008 from David-Muhasa/issue-1
5b15846 
change the order of options for account creation
@mercihabam @josaphatim
synchronize html editor and md editor with the compose_body textarea …
6d0e50a 
…and adjust their appearance to match bs styling used
@christer77
[ENH]Error Ocurred when attempting gmail oauth2 setup
92f66b7
@amaninyumu1 @josaphatim
module.php[FIX]change default checkbox values ​​from 1 to 0
84317f0
@josaphatim
Fixed unclosed divs when there are multiple alert messages from backend
57571d3
@kroky
Merge pull request cypht-org#1021 from christer77/Error-Ocurred-when-…
054e60d 
…attempting-gmail-oauth2-setup

[FIX]Error Ocurred when attempting gmail oauth2 setup
@marclaporte
Merge pull request cypht-org#1012 from kambereBr/handle-unicode-folde…
b5b4bd2 
…r-name

Handle Unicode in folder names
@josaphatim
Added bootstrap to passwords section in home page
b53221f
@josaphatim
Fixed local contact issue
f72132a
@Yannick243
[ENH]: add profiles and imap_folders to default enabled modules
dd9d9d8
@kroky
Merge pull request cypht-org#1026 from josaphatim/fix-multiple-alerts…
cea402c 
…-in-msg-from-backend

Fixed unclosed divs when there are multiple alert messages from backend
@mercihabam
fix text selection on inline emails hindered by sortable
9980c39
@josaphatim
Set OAuth2 default redirect URL
95440a8
@jonocodes
Docker files in local directory
5f2eac3
@jonocodes
Add some TODO notes
8719555
Shadow243 and others added 17 commits August 13, 2024 02:35
@Shadow243
Update sieve to latest version
24671d8
@Shadow243
Merge pull request cypht-org#1163 from Shadow243/update-php-sieve-man…
2b1a104 
…ager

Update sieve to latest version
@PeterDaveHello
Add zh-TW Traditional Chinese translation
877b1a3
@kroky
Merge pull request cypht-org#1080 from amaninyumu1/added_functionalit…
a1d9a46 
…y_forward_as_message_attachment

[ENH] add fonctionality forward as message attachment
@marclaporte
Merge pull request cypht-org#1168 from PeterDaveHelloKitchen/Add-zh-T…
5364484 
…W-translation

Add zh-TW Traditional Chinese translation
@kroky
Merge pull request cypht-org#1162 from josaphatim/fix-links-for-tiki-…
65e7dd2 
…integration

Fix links when Cypht is embedded
@Yannick243
Fix failing tests after adding traditional Chinese translation
8b7ae4a
@marclaporte
Merge pull request cypht-org#1170 from Yannick243/fix-traditional-chi…
eae614c 
…nese-tests

Fix failing tests after adding traditional Chinese translation
@Yannick243
Fix left navigation menu toggle buttons
c1d2c33
@Yannick243
Fix the enclosing tags in the left-side menu
715c1a7
@christer77
[FIX]Some HTML messages can't be closed
7f3b3f8
@Shadow243
Merge pull request cypht-org#1169 from Yannick243/fix-menu-toggle
439f50c 
Fix left navigation menu toggle buttons
@Shadow243
Merge pull request cypht-org#1172 from christer77/Some-HTML-messages-…
3b7d84c 
…cant-be-closed

[FIX]Some HTML messages can't be closed
@amaninyumu1
[FIX] hm-imap.php PHP NOTICE Deprecated: Creation of dynamic property…
69efc1d 
… Hm_IMAP:: is deprecated
@Shadow243
Merge pull request cypht-org#1171 from amaninyumu1/PHP-Deprecated-Cre…
7eea330 
…ation0-of-dynamic-property-Hm_IMAP--is-deprecated

[FIX] hm-imap.php PHP NOTICE Deprecated:  Creation of dynamic propert…
@Shadow243 @josaphatim
Fix imap tls and starttls radio button
8b0ed3a
@Shadow243
Merge tag 'v2.2.0' into 2.x
39ab928
@Shadow243 Shadow243 marked this pull request as ready for review August 20, 2024 08:35
@Shadow243 Shadow243 requested a review from kroky August 20, 2024 08:38
@Shadow243 Shadow243 changed the title Merge v2.2.0 with 2.x Merge tag v2.2.0 into 2.x Aug 20, 2024
@kroky kroky merged commit b30b176 into cypht-org:2.x Aug 21, 2024
@kroky
Copy link
Member

kroky commented Aug 21, 2024

There seems to be a few more that should also be in 2.x: 2.x...master

@Shadow243
Copy link
Member Author

There seems to be a few more that should also be in 2.x: 2.x...master

Maybe this one: e70db0e the rest came after the release. even this last one came after the Docker release.

@marclaporte
Copy link
Member

marclaporte commented Aug 22, 2024 •
edited
Loading

@Shadow243 Please update as per https://github.com/cypht-org/cypht/wiki/Lifecycle

2.x should have all of 2.2.0 and all bug fixes from master. But new features can stay in master only and will be released in 2.3.0

@kroky
Copy link
Member

kroky commented Aug 22, 2024

Hmm, maybe we need some more information on the merging strategy. I thought 2.x is always up to date with fixes and features that would be relased as part of 2.x branch - even 2.3.0. However, I see that might be a challenge backporting all that stuff constantly.
It might be easier to do the following:

  • develop new features in master
  • fix issues in master
  • be sure to backport these fixes to 2.x branch - it is best at the time of merge or shortly after
  • release 2.2.1, 2.2.2, etc. from 2.x branch (only fixes)
  • release 2.3.0: merge the whole master into 2.x, release from 2.x and tag 2.3.0. Future fixes in 2.x will be released as 2.3.1, 2.3.2, etc. master continues with fixes and features which will later become 2.4.0 or even 3.0.0.

Once we hit a serious update worth bumping to 3.0.0, we can create a 3.x branch from master at that time and stop merging master into 2.x branch. Fixes can still be backported into 2.x branch. I think everything is covered this way.

@marclaporte
Copy link
Member

@josaphatim @Shadow243 @Yannick243 @kambereBr @Baraka24 @IrAlfred

Are you OK with this?

@Shadow243 Shadow243 mentioned this pull request Aug 22, 2024
Merged
@Baraka24 Baraka24 mentioned this pull request Sep 27, 2024
Merged
This was referenced Oct 5, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kroky kroky Awaiting requested review from kroky

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

Successfully merging this pull request may close these issues.