highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-20 22:36:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,071 Commits 8 Branches 418 Tags
eb40540f0d3babecde782d74017263f967d527bc
Commit Graph

1071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chemaclass
7c94af2fb2 Use MasterKey.Builder instead of deprecated MasterKeys 2023-03-09 20:56:56 +00:00
Vitor Pamplona
ccf2b06b10 Merge remote-tracking branch 'origin/HEAD' into less_memory_test_branch 2023-03-09 15:42:22 -05:00
Vitor Pamplona
c511ad6f73 Merge pull request #243 from Chemaclass/add-missing-es-translations 
Add missing ES translations
 2023-03-09 15:03:48 -05:00
Chemaclass
25f8bde880 Remove more untranslatable strings 2023-03-09 19:55:41 +00:00
Chemaclass
ab88629085 Add missing ES translations 2023-03-09 19:51:02 +00:00
Chemaclass
82c4e02cb1 Remove sats from all langs becuase its not translatable 2023-03-09 19:42:25 +00:00
Vitor Pamplona
1b20f9d85c Merge pull request #242 from maxmoney21m/bugfix/239-select-text-scroll 
Fix #239
 2023-03-09 13:53:17 -05:00
Vitor Pamplona
1c9b702a06 Merge remote-tracking branch 'origin/HEAD' 2023-03-09 13:27:47 -05:00
maxmoney21m
d41836ca19 Fix #239 2023-03-10 02:27:29 +08:00
Vitor Pamplona
99d5b19acb Merge pull request #240 from maxmoney21m/feature/zhtw-translations 
More translations
 2023-03-09 13:25:49 -05:00
Vitor Pamplona
3b582636f4 NIP-39 Support 2023-03-09 13:24:32 -05:00
maxmoney21m
680c0f1089 Add tw translations 2023-03-10 00:28:15 +08:00
Vitor Pamplona
56433a3ad3 v0.24.1 v0.24.1 2023-03-09 10:10:44 -05:00
Vitor Pamplona
2ebbac0f58 Showing pubkeys prominently in the Profile Page. 2023-03-09 10:08:11 -05:00
Vitor Pamplona
e616d2bdca Merge pull request #238 from miseelu/main 
Added Chinese( Traditional ) Translation
 2023-03-09 10:04:43 -05:00
Milu Lu
da4b3e78fd Added Chinese( Traditional ) Translation 2023-03-09 22:45:58 +08:00
Milu Lu
8bff85749a Merge branch 'main' of https://github.com/miseelu/amethystcc 
 Conflicts:
	app/src/main/res/values-zh-rHK/strings.xml
 2023-03-09 22:36:47 +08:00
Milu Lu
a577bf8e6a Added Chinese( Traditional ) Translation 2023-03-09 22:35:44 +08:00
Vitor Pamplona
c8d19f142e Keeping Quick Action and DropDown similar for now. 2023-03-09 09:34:25 -05:00
miseelu
e3aa6b5d3c Merge branch 'vitorpamplona:main' into main 2023-03-09 22:33:56 +08:00
Vitor Pamplona
61d8a31a8a Merge remote-tracking branch 'origin/HEAD' 2023-03-09 09:26:59 -05:00
Milu Lu
91f92043b4 Added Chinese( Traditional ) Translation 2023-03-09 22:25:10 +08:00
Vitor Pamplona
bb635c43e9 Merge pull request #236 from miseelu/main 
Added Chinese(Simplified) Translation
 2023-03-09 09:20:27 -05:00
Vitor Pamplona
0cbe1b746a Tweaks colors of the Quick Action to work better in Dark Mode 2023-03-09 09:19:41 -05:00
Vitor Pamplona
ddeead15ac Reduces Text Size of the Quick Action menu to fit on screen 2023-03-09 09:19:18 -05:00
Vitor Pamplona
f9965bc7d1 Removes extra vertical bar in the QuickAction Menu 2023-03-09 09:18:46 -05:00
Milu Lu
e820250e4e Added Chinese(Simplified) Translation 2023-03-09 22:14:13 +08:00
Vitor Pamplona
f2f53c66bd Merge remote-tracking branch 'origin/HEAD' into less_memory_test_branch 2023-03-09 09:01:27 -05:00
Vitor Pamplona
39b53c05b7 Merge remote-tracking branch 'origin/HEAD' 2023-03-09 08:49:42 -05:00
Vitor Pamplona
d148644799 Allows Rendering of PrivateMessages as Notes (for notifications) with correct redirection to the private room when clicked 2023-03-09 08:49:29 -05:00
Vitor Pamplona
ceb0895b8d Using Log.debug instead of println for State Dump action 2023-03-09 08:48:11 -05:00
Vitor Pamplona
30e2070b89 Deleting awards cache. 2023-03-09 08:47:16 -05:00
Vitor Pamplona
05446af068 Merge pull request #234 from Radiokot/fix/actualize_ru_uk_21_03_09 
Actualize Russian and Ukrainian translations
 2023-03-09 08:40:14 -05:00
Oleg Koretsky
0459c4f90a Actualize Russian and Ukrainian translations 2023-03-09 13:27:46 +02:00
Vitor Pamplona
b93f28f09d Merge branch 'main' into less_memory_test_branch 
# Conflicts:
#	app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/LongTextNoteEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
 2023-03-08 17:47:34 -05:00
Vitor Pamplona
38df1ba6f7 Merge commit '40a6feab8a4a36813644c19ca034333b73e98132' into less_memory_test_branch 2023-03-08 17:35:30 -05:00
Vitor Pamplona
6c9aa9b6ff Merge commit '9c7a5b73b3a75a465f78c1d97726e66f0e3032a3' into less_memory_test_branch 2023-03-08 17:35:21 -05:00
Vitor Pamplona
26b581b13c Merge commit 'a41f2c38ec9683f0e9aaca3e4cffb2cd45f21145' into less_memory_test_branch 2023-03-08 17:34:40 -05:00
Vitor Pamplona
6a3cae1c8d Merge commit 'c7ba0bce5bbc3edd8ece9669751b110d59c40052' into less_memory_test_branch 2023-03-08 17:34:29 -05:00
Vitor Pamplona
40ac31983c Merge commit 'c9b859610e660f7e2d906594410bc7fbf2b1914a' into less_memory_test_branch 
# Conflicts:
#	app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt
 2023-03-08 17:34:22 -05:00
Vitor Pamplona
8c25667d0f Organize imports to simplify merge 2023-03-08 17:29:36 -05:00
Vitor Pamplona
6acc842d4f Readding LocalCacheImport 2023-03-08 17:18:25 -05:00
Vitor Pamplona
fc4b68b264 Merge commit 'f1b6927bb37d1c9887fb48aa5655a6d2df558e81' into less_memory_test_branch 
# Conflicts:
#	app/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
#	app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
#	app/src/main/java/com/vitorpamplona/amethyst/model/User.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelCreateEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/ContactListEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/EventInterface.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/LongTextNoteEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/TextNoteEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowersFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowsFeedFilter.kt
 2023-03-08 17:17:03 -05:00
Vitor Pamplona
9470560002 Testing Lint Commit 2023-03-08 17:07:56 -05:00
Vitor Pamplona
cd950ee946 Merge commit '2d92e1d44491d62005e45adcf3dc1c5a403c386f' into less_memory_test_branch 2023-03-08 17:04:24 -05:00
Vitor Pamplona
f9f68e2a4f Merge commit '691b8225035d8fe59539a971a85b1df2f2f84ebe' into less_memory_test_branch 2023-03-08 17:03:42 -05:00
Vitor Pamplona
0986698c4b Merge pull request #230 from maxmoney21m/bugfix/223-invoice-intent 
Fix LN invoice in expandable text component
 2023-03-08 15:16:44 -05:00
Vitor Pamplona
24b85ed9ac Merge pull request #231 from Chemaclass/add-pre-push-hook 
Add pre-push git hook to run tests
 2023-03-08 15:15:00 -05:00
Vitor Pamplona
2199d98a06 Merge pull request #232 from Chemaclass/remove-deps.txt 
Remove deps.txt
 2023-03-08 15:14:03 -05:00
Chemaclass
bef122e909 Remove deps.txt 2023-03-08 19:43:37 +00:00