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

GT - Merge develop into master for new QA release 6.3.4 #2266

Merged
merged 43 commits into from
Sep 11, 2024
Merged

GT - Merge develop into master for new QA release 6.3.4 #2266

merged 43 commits into from
Sep 11, 2024

Conversation

levieggertcru
Copy link
Collaborator

No description provided.

rachaelblue and others added 30 commits August 6, 2024 14:58
@rachaelblue
add tool settings button to CYOA flow
96ea71f
@rachaelblue
create toolSettingsObserver for CYOA
31d3b0c
@rachaelblue
add tool settings flow completion to CYOA flow
987d4b5
@rachaelblue
rename toolView to tractView
c3b3ee8
@rachaelblue
hide screen share button on cyoa
bf3ac05
@rachaelblue
Merge branch 'develop' of https://github.com/CruGlobal/godtools-swift …
e38c61d 
…into GT-2199-Tool-Options-for-Openers

# Conflicts:
#	godtools.xcodeproj/project.pbxproj
@rachaelblue
add isRemoteShareable flag
2380bde
@levieggertcru @github-actions
Increase version to 6.3.4
beb0634
@rachaelblue
Merge pull request #2246 from CruGlobal/GT-2199-Tool-Options-for-Openers
da77586 
GT-2199 tool options for openers
@rachaelblue
move tool settings observer setup into renderer base view model
4187334
@rachaelblue
create toolSettingsNavigationFlow
908d1ea
@rachaelblue
add closeToolSettings to protocol extension
20dc290
@rachaelblue
fix capitalization
20ffc1c
@rachaelblue
fix observers not getting attached
64826a3
@rachaelblue
fix access levels
45a2437
@rachaelblue
Merge pull request #2250 from CruGlobal/GT-2199-Tool-Options-Followup
c719ec1 
GT-2199 tool options followup
@renovate @frett
Lock file maintenance
69b9e0c
@levieggertcru
Merge branch 'develop' into feature/cyoa-tool-settings
7e33add
@rachaelblue
create domain model for highlighted text
ab9168c
@rachaelblue
move attributed string logic into view
23bfd98
@rachaelblue
hide share link button by default
3a37ee7
@rachaelblue
fix separator spacing
29e236c
@rachaelblue
Merge pull request #2255 from CruGlobal/GT-2177-Domain-Model-for-High…
3547daa 
…light-Text

GT-2177 create domain model for highlighted text
@rachaelblue
Merge branch 'feature/cyoa-tool-settings' of https://github.com/CruGl…
8abc23d 
…obal/godtools-swift into GT-2430-disable-share-links-on-cyoa

# Conflicts:
#	godtools.xcodeproj/project.pbxproj
@rachaelblue
fix target membership issue
ab7248a
@rachaelblue
Merge pull request #2256 from CruGlobal/GT-2430-disable-share-links-o…
02e77e4 
…n-cyoa

GT-2430 disable share links on cyoa
@levieggertcru
Fixes banner animation not showing when opening tool for first time w…
927c7d1 
…hile offline and tool language already downloaded
@renovate
Lock file maintenance
8dcba73
@rachaelblue
add localized "network lost" string
b45c6b2
@rachaelblue
check for analytics event should trigger before tracking
d1a0429
renovate bot and others added 13 commits September 3, 2024 11:35
@renovate
Update dependency ruby to v3.3.5
59e9b13
@renovate
Update peter-evans/create-pull-request action to v7
14b9a61
@levieggertcru
Merge pull request #2258 from CruGlobal/renovate/lock-file-maintenance
211d365 
Lock file maintenance
@rachaelblue
use continue instead of break
dda796e
@rachaelblue
Merge pull request #2259 from CruGlobal/GT-2436-Network-Connection-Lo…
aca1865 
…st-String

GT-2436 add localized "network lost" string
@levieggertcru
Merge pull request #2262 from CruGlobal/renovate/peter-evans-create-p…
16cfa05 
…ull-request-7.x

Update peter-evans/create-pull-request action to v7
@levieggertcru
Merge pull request #2261 from CruGlobal/renovate/ruby-3.x
56e62b8 
Update dependency ruby to v3.3.5
@renovate
Lock file maintenance
1e3d4c4
@levieggertcru
Merge pull request #2263 from CruGlobal/versions/6.3.4
e8328ee 
Increase version to 6.3.4
@levieggertcru
Merge pull request #2257 from CruGlobal/GT-2435-fix-about-animation-n…
329ff21 
…ot-showing-when-offline

GT-2435 Fixes banner animation not showing when opening tool for first time
@levieggertcru
Merge pull request #2265 from CruGlobal/renovate/lock-file-maintenance
10ead17 
Lock file maintenance
@rachaelblue
Merge pull request #2249 from CruGlobal/feature/cyoa-tool-settings
396919b 
GT merge feature/cyoa-tool-settings into develop
@rachaelblue
Merge pull request #2260 from CruGlobal/GT-1955-Enforce-Analytics-Limits
c759b2c 
GT-1955 check for analytics event should trigger before tracking
@levieggertcru levieggertcru merged commit 9d96dda into master Sep 11, 2024
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rachaelblue rachaelblue rachaelblue 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
@levieggertcru @rachaelblue