Commit graph

6584 commits

Author SHA1 Message Date
wcjord
7ad50e07e2
Merge pull request #68 from pangeachat/trial-ui
updates to subscription paywall flow
2024-02-19 15:12:07 -05:00
wcjord
1baaa0e2ca
Merge pull request #67 from pangeachat/toolbar-testing
Show translation of selected text
2024-02-19 12:57:12 -05:00
Gabby Gurdin
fb07dc747a updates to subscription paywall flow 2024-02-19 12:36:59 -05:00
Gabby Gurdin
5a6cc913e8 disable selection if message not highlighted 2024-02-15 12:38:58 -05:00
Gabby Gurdin
d7f89eb98c show translation of selected text 2024-02-15 12:32:15 -05:00
ggurdin
8876c86280
Merge pull request #66 from pangeachat/toolbar-testing
removed setState from dispose methods
2024-02-12 16:04:03 -05:00
Gabby Gurdin
32fab63edb removed setState from dispose methods 2024-02-12 16:03:23 -05:00
ggurdin
5e14f7669c
Merge pull request #65 from pangeachat/toolbar-testing
upgraded to most recent version of matrix sdk, fix for when to show r…
2024-02-12 15:26:01 -05:00
Gabby Gurdin
887afb0247 upgraded to most recent version of matrix sdk, fix for when to show rich text 2024-02-12 15:25:13 -05:00
ggurdin
c46c079bc1
Merge pull request #64 from pangeachat/toolbar-testing
Toolbar testing
2024-02-12 14:27:12 -05:00
Gabby Gurdin
9112ba9fd9 Merge branch 'main' into toolbar-testing 2024-02-12 14:26:22 -05:00
Gabby Gurdin
4b5a3b2cae get originalsent langcode if original written not available 2024-02-12 14:25:53 -05:00
ggurdin
a8cb93f9e6
Merge pull request #63 from pangeachat/toolbar-testing
remove expanded widget
2024-02-11 11:28:41 -05:00
Gabby Gurdin
cd7fbc020a Merge branch 'main' into toolbar-testing 2024-02-11 11:27:42 -05:00
Gabby Gurdin
af9b666e30 remove expanded widget 2024-02-11 11:27:35 -05:00
William Jordan-Cooley
38b70baeb2 turn off try catch around getAudioGlobal so eerror bubbles up 2024-02-10 15:35:38 -05:00
ggurdin
c137d80f01
Merge pull request #62 from pangeachat/toolbar-testing
Toolbar testing
2024-02-10 15:02:39 -05:00
Gabby Gurdin
5569747756 merge conflict 2024-02-10 15:02:06 -05:00
Gabby Gurdin
6a299193b5 fix for github build error 2024-02-10 15:00:23 -05:00
ggurdin
2c870656a8
Merge pull request #61 from pangeachat/toolbar-testing
small fix to make sure message text in toolbar is always set
2024-02-10 14:58:05 -05:00
Gabby Gurdin
afb7b5c83b small fix to make sure message text in toolbar is always set 2024-02-10 14:57:05 -05:00
ggurdin
a4ba1c8443
Merge pull request #60 from pangeachat/toolbar-testing
fix to update state of defintion button in toolbar
2024-02-10 14:42:01 -05:00
Gabby Gurdin
da64ed1506 fix to update state of defintion button in toolbar 2024-02-10 14:41:18 -05:00
William Jordan-Cooley
23055e65d1 fix to listening with already made audio 2024-02-10 14:20:15 -05:00
ggurdin
b865e629a7
Merge pull request #59 from pangeachat/toolbar-testing
some fixes for sizing
2024-02-10 11:36:36 -05:00
Gabby Gurdin
0bb202b9a3 some fixes for sizing 2024-02-10 11:34:52 -05:00
ggurdin
6af9a7540d
Merge pull request #57 from pangeachat/toolbar
Toolbar
2024-02-10 10:57:04 -05:00
Gabby Gurdin
20b1b9ddf9 merge conflicts 2024-02-10 10:55:28 -05:00
ggurdin
68ee1320b6
Merge pull request #56 from pangeachat/features/notification_hotfix_ios
ios notification fixed, issues with entitlements, there was invlid va…
2024-02-10 10:50:05 -05:00
Gabby Gurdin
648b25a252 fix for long press selecting messages 2024-02-10 10:44:58 -05:00
lala iqbal
186e5d3973 ios notification fixed, issues with entitlements, there was invlid values in entitlemen file 2024-02-10 20:25:42 +05:00
ggurdin
ebbfba7ac9 added pangea tags, more testing 2024-02-08 17:09:43 -05:00
ggurdin
13b38eac29 changes from testing 2024-02-08 16:22:49 -05:00
ggurdin
8d77ca8951 merge conflicts 2024-02-07 15:45:30 -05:00
ggurdin
7982fa6387 auto generated changes 2024-02-07 15:29:39 -05:00
ggurdin
2cb77732e3 toolbar working 2024-02-07 15:28:52 -05:00
ggurdin
a22c68d3e1
Merge pull request #55 from pangeachat/bot-options
change model key for language level -> difficulty
2024-01-31 11:33:38 -05:00
ggurdin
2f6aab86da change model key for language level -> difficulty 2024-01-31 11:32:55 -05:00
wcjord
8af20b67be
Merge pull request #54 from pangeachat/rules-migration
fix for room rules migration
2024-01-29 17:36:34 -05:00
ggurdin
b1abad5e30 moved functionn 2024-01-29 16:01:03 -05:00
ggurdin
4017d6333c fix for room rules migration 2024-01-29 15:54:13 -05:00
ggurdin
60c27087ff
Merge pull request #53 from pangeachat/bot-options
build fix
2024-01-29 12:36:16 -05:00
ggurdin
e547f6bedd build fix 2024-01-29 12:35:00 -05:00
ggurdin
314be3898e
Merge pull request #52 from pangeachat/bot-options
Conversation Bot UI
2024-01-29 12:15:55 -05:00
ggurdin
c16fff76a9 merge conflict 2024-01-29 12:11:44 -05:00
ggurdin
730499768f
Merge pull request #51 from pangeachat/ios-config
ios build config file updates
2024-01-29 12:10:38 -05:00
ggurdin
45b6cc9323 ios build config file updates 2024-01-29 12:09:45 -05:00
William Jordan-Cooley
57957eac9e experimenting 2024-01-27 12:08:19 -05:00
William Jordan-Cooley
5901de1ab0 merge with main 2024-01-25 13:49:18 -05:00
ggurdin
15631c9ee4
Merge pull request #50 from pangeachat/new-message-selection
Select Text to Show Defintions
2024-01-25 11:35:41 -05:00