496ad50b18
filters: represent POST as json becausr booleans cannot be represented in urlencoded as Pleroma thinks
2020-04-28 04:01:19 +02:00
8bcd6a9ba4
ComposeActivity: put buttons into relativelayout and scrollview so they would not push send button outside of screen
2020-04-12 22:04:44 +03:00
5ad9f0e871
ComposeActivity: fix crash on old Android
2020-04-12 22:02:32 +03:00
f80d5639a9
NetworkModule: oops, disable showing headers in logcat
2020-04-12 21:05:54 +03:00
c1557e08fe
wysiwyg: add minimal editor based on MarkdownEdit library
2020-04-12 20:44:40 +03:00
3bcbc97bab
compose: implement BBcode and HTML sending
2020-04-12 20:13:09 +03:00
7c806733ee
AccountActivity: animate banner if animateGifAvatars is enabled
2020-04-10 19:20:28 +03:00
01e4f13c93
http: haha content-encoding goes brrrr (enabled brotli compression)
2020-04-10 18:53:28 +03:00
25dc0e9677
emojis: remove unicode emojis consisting of more than one code point as it's unsupported by Pleroma
2020-04-10 17:33:53 +03:00
Ivan Kupalov
a267d85080
Fix reblog confirm ( #1723 )
...
* Fix reblog confirmation default value
* Fix triggering reblog before confirming it
* Fix accidents caused by reblog confirmation
2020-04-10 16:41:06 +03:00
b3c3ddeaf7
gradle: remove ndk version setting
2020-04-10 03:34:04 +03:00
79b6ecdb37
husky: regenerate artwork, fix incorrect dimensions, use pngcrush, add two new pics
2020-04-10 03:12:34 +03:00
93d7e1df3b
icons: add high-resolution icon for notifications
2020-04-10 02:19:43 +03:00
ac3c32061e
strings: change Add reaction to React
2020-04-10 02:19:03 +03:00
825eab8cda
emoji_reactions: show keyboard as dialog
2020-04-10 02:18:37 +03:00
1a8fd62e46
custom_emoji: fix showing emojis that may look like a regular expression
2020-04-10 02:14:33 +03:00
f4b696cc4d
emoji_reactions: implement for notifications fragment
2020-04-10 02:13:33 +03:00
8580524300
emoji_keyboard: first keyboard, supports only unicode emojis
2020-04-10 02:11:38 +03:00
b08f939e0f
emoji: add all Unicode 12.0 emojis
2020-04-10 01:59:25 +03:00
e98db92d23
emoji: use bundled compat font
2020-04-10 01:58:47 +03:00
18c19be90c
adapter: replace simple viewholders by SingleViewHolder(extended from RecyclerView.ViewHolder but allowed to instantiate)
2020-04-10 01:58:06 +03:00
d273c9dec4
Merge branch 'develop' of https://github.com/FWGS/Husky into develop
2020-03-16 18:47:27 +03:00
4d4d7d21ea
Better handling of muted users and conversations, add option Hide muted users like in PleromaFE
2020-03-13 18:54:27 +03:00
d37e3ec569
Revert "Hide muted users' statuses in timelines on client side, because we're getting full timeline now(to support muted conversations)"
...
This reverts commit 2fc5f876bc
2020-03-13 17:46:22 +03:00
40c72f1b72
NotificationPreferences: fix crash when opening notifications settings
2020-03-13 17:00:20 +03:00
98cad637c9
NotificationHelper: add a way to test legacy notification channels on new devices
2020-03-13 16:59:58 +03:00
a6e1eaebd8
view_background_message: make image big again
2020-03-13 16:19:37 +03:00
8908e93580
StatusBaseViewHolder: fix recycling bug, fix emoji reaction view empty space touch
2020-03-12 06:16:57 +03:00
738d378154
Merge branch 'develop' of https://github.com/tuskyapp/Tusky into develop
2020-03-12 02:53:28 +03:00
d1026b664b
Merge branch 'develop' of https://git.mentality.rip/FWGS/Husky into develop
2020-03-12 02:53:15 +03:00
b5a0859bc9
splash: slightly update splash logo
2020-03-12 02:50:28 +03:00
Ivan Kupalov
6a87e3e352
Work around the bug in ComposeScheduleView, fix #1720 ( #1722 )
...
DatePicker seems to think that it's in UTC. So setting selected time
might not work as aspect and receiving value from it might be in UTC
as well. This commit fixes the second issue by interpreting the date
as UTC date. Tested with America/New_York (GMT-5 at the moment) and
Russia/Kamchatka (GMT+12).
2020-03-09 20:43:01 +01:00
bfd854afeb
travis: disable lint abort for now
2020-03-06 23:44:07 +03:00
c2ded20df8
emoji_reactions: implement adding and removing on existing reactions(LOW PERFORMANCE)
2020-03-06 22:33:25 +03:00
6a4215363e
emoji_reactions: show the emoji in title
2020-03-06 21:30:20 +03:00
371cafc0cd
emoji_reactions: add menu for normal timelines
2020-03-06 21:22:41 +03:00
19198d7564
emoji_reactions: make buttons a bit smaller
2020-03-06 21:22:19 +03:00
4f1400842f
emoji_reactions: general refactoring, implement emoji_reactions_by
2020-03-06 21:04:14 +03:00
3cbbbe99c4
Merge upstream
2020-03-06 16:16:54 +03:00
Daniele Lira Mereb
91dd3e4f5f
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (410 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_BR/
2020-03-06 12:28:01 +01:00
Sveinn í Felli
d974f47408
Translated using Weblate (Icelandic)
...
Currently translated at 100.0% (410 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/is/
2020-03-06 12:28:01 +01:00
Mélanie Chauvel
8ffb263e16
Translated using Weblate (French)
...
Currently translated at 100.0% (410 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/
Translated using Weblate (Esperanto)
Currently translated at 99.8% (409 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/eo/
2020-03-06 12:28:01 +01:00
Weblate
1710b980bc
Added translation using Weblate (English (Australia))
...
Translated using Weblate (Swedish)
Currently translated at 100.0% (410 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
Translated using Weblate (Japanese)
Currently translated at 87.1% (357 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ja/
Translated using Weblate (Esperanto)
Currently translated at 99.8% (409 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/eo/
2020-03-06 12:28:01 +01:00
tolstoevsky
38c2c24a09
Translated using Weblate (Russian)
...
Currently translated at 100.0% (410 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ru/
2020-03-06 12:28:01 +01:00
knuxify
5471670129
Translated using Weblate (Polish)
...
Currently translated at 100.0% (410 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pl/
2020-03-06 12:28:01 +01:00
Vegard Skjefstad
83e8c9eb75
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 100.0% (410 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/nb_NO/
2020-03-06 12:28:01 +01:00
ButterflyOfFire
dfab2cb000
Translated using Weblate (Kabyle)
...
Currently translated at 58.5% (240 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (Kabyle)
Currently translated at 53.2% (218 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (French)
Currently translated at 100.0% (410 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/
Translated using Weblate (Kabyle)
Currently translated at 53.2% (218 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (Arabic)
Currently translated at 100.0% (410 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ar/
Translated using Weblate (Kabyle)
Currently translated at 53.2% (218 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (Kabyle)
Currently translated at 52.7% (216 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (French)
Currently translated at 100.0% (410 of 410 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/
2020-03-06 12:28:01 +01:00
Ivan Kupalov
67c20326f9
Add options to confirm reblog/unreblog actions, close #460 ( #1650 )
2020-03-03 21:27:26 +01:00
Ivan Kupalov
712f61b15a
Add "more" popup to a11y menu, fix #1710 ( #1714 )
2020-03-02 19:36:44 +01:00
Levi Bard
3edc47aa4a
Add option to show link previews in timelines ( #1681 )
...
* Add option to show link previews in timelines.
Addresses #1075
* Indent cards in non-selected statuses when viewing threads
* Indent cards in timelines
* Fix clipping of right side of preview in timelines
2020-03-02 19:34:31 +01:00
b0e97392a5
Merge upstream
2020-02-28 10:30:09 +03:00
fab2aedffb
Husky branding(icons)
2020-02-28 09:47:09 +03:00
2ec074f499
Merge branch 'develop' of https://git.mentality.rip/FWGS/Husky into develop
2020-02-28 08:34:37 +03:00
Levi Bard
dd8abad8ca
When a plaintext share contains EXTRA_TEXT and a distinct EXTRA_SUBJECT, use EXTRA_SUBJECT as the content warning for the shared status ( #1712 )
2020-02-26 20:41:02 +01:00
50730f7481
Add more URL cases for Pleroma, Misskey and Friendica ( #1702 )
2020-02-25 19:59:40 +01:00
Levi Bard
710b9f08c1
Add status url as EXTRA_SUBJECT when sharing status content. ( #1680 )
...
Addresses #1655
2020-02-25 19:58:20 +01:00
Ivan Kupalov
656644b7cb
Make image in BackgroundMessageView adapt to the height, fix #1618 ( #1649 )
...
* Make image in BackgroundMessageView adapt to the height, fix #1618
* Hide filters panel when showing status view in notifications
2020-02-25 19:57:28 +01:00
Konrad Pozniak
d9c802982e
Upgrade deps ( #1708 )
...
* upgrade Dagger
* upgrade AndroidX Lifecycle
* upgrade AndroidX Fragment
* upgrade Room, Retrofit, AndroidX core, Material components
* fix report fragments not sharing viewmodels
2020-02-25 19:49:41 +01:00
Konrad Pozniak
398ee66084
simplify DI & test setup, convert TuskyApplication to Kotlin ( #1675 )
...
* simplify DI & test setup, convert TuskyApplication to Kotlin
* try to fix tests on bitrise
* remove conscrypt-openjdk-uber test dependency again
2020-02-25 19:49:15 +01:00
Conny Duck
218046fd27
Release 70 / 10.0
2020-02-25 19:00:21 +01:00
Conny Duck
82f5fe49b1
cleanup empty translations, add german translation
2020-02-25 18:47:53 +01:00
hg
563d920f63
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
2020-02-25 17:33:30 +00:00
Isak Holmström
ff0529217b
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
2020-02-25 17:33:30 +00:00
Daniele Lira Mereb
091d59680b
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_BR/
2020-02-25 17:33:30 +00:00
ButterflyOfFire
a4d9116bb8
Translated using Weblate (Occitan)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/oc/
Translated using Weblate (Kabyle)
Currently translated at 51.8% (212 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
2020-02-25 17:33:30 +00:00
Anonymous
921aae5012
Translated using Weblate (Slovak)
...
Currently translated at 28.4% (116 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sk/
Translated using Weblate (Swedish)
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
Translated using Weblate (Swedish)
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
Added translation using Weblate (Luxembourgish)
Added translation using Weblate (French (Belgium))
Added translation using Weblate (English (United States))
Added translation using Weblate (English (Australia))
2020-02-25 17:33:30 +00:00
Levi Bard
80e0c55b67
Warn when scheduling a post within 5 minutes ( #1698 )
...
* Warn when scheduling a post within 5 minutes
* Fix NPE when scheduled post time isn't set
* Use AlertDialog with option to cancel instead of Toast when a post isn't scheduled far enough in advance
* Move schedule validation warning to scheduling bottom sheet
* Fix scheduling error display when sending after an initially-valid scheduling time has become invalid
2020-02-25 18:33:24 +01:00
Konrad Pozniak
aba36ca6f8
Compose activity fixes ( #1707 )
...
* cleanup media keyboard code
* fix crash in ComposeActivity when rotating phone while taking photo
* fix poll button in ComposeActivity being invisible when disabled
2020-02-24 22:02:59 +01:00
692517323e
gradle: set up version to 0.99 for now and version code to days passed since first my commit to this repo
2020-02-23 06:12:30 +01:00
Conny Duck
c2e94c4bf0
fix color of conversation_thread_line
2020-02-22 17:56:20 +01:00
Konrad Pozniak
6d48811767
fix crash when inserting custom emojis at the start of the compose field ( #1706 )
2020-02-21 22:08:41 +01:00
Konrad Pozniak
1eef035a9e
fix default emoji font icon not rendering
2020-02-21 18:21:47 +01:00
0fddd80d83
avatar_default: replace with Pleroma logo
2020-02-20 05:29:06 +03:00
2fc5f876bc
Hide muted users' statuses in timelines on client side, because we're getting full timeline now(to support muted conversations)
2020-02-20 05:03:28 +03:00
74d2bd6aaa
status: increase hit area for fav/reblog buttons #71
2020-02-20 04:25:35 +03:00
Konrad Pozniak
b8ef287b47
fix image from another status showing up instead of blurhash ( #1699 )
2020-02-19 22:07:01 +01:00
Levi Bard
9a173f0234
Delete draft when sending its status completes. ( #1704 )
...
Fixes #1700
2020-02-19 21:10:22 +01:00
052b58f5af
Add MORE cases for Pleroma, Misskey and Friendica
2020-02-19 05:14:40 +03:00
63a751768a
Merge upstream
2020-02-19 04:54:30 +03:00
05b0779902
emojireactions: implement coloring buttons
2020-02-19 04:18:48 +03:00
483aae6c74
emojireactions: fix EmojiReaction object
2020-02-19 04:18:21 +03:00
Konrad Pozniak
3f3166522b
fix list editing by moving account_ids from query to form param ( #1690 )
...
* fix list editing by moving account_ids from query to form param
* fix DialogFramentStyle
2020-02-18 08:45:10 +01:00
Konrad Pozniak
1e6842e41a
delete empty strings from sk translation, improve de translation
2020-02-17 19:39:42 +01:00
Konrad Pozniak
6a60a2a6a6
fix url search returning the same post indefinitely ( #1695 )
2020-02-17 19:34:11 +01:00
Connyduck
47048ef2bb
Deleted translation using Weblate (Luxembourgish)
2020-02-17 18:25:03 +00:00
Connyduck
ea78eb0627
Deleted translation using Weblate (French (Belgium))
2020-02-17 18:24:34 +00:00
Connyduck
d2276cf8ee
Deleted translation using Weblate (English (United States))
2020-02-17 18:24:20 +00:00
Connyduck
1221f3d4bd
Deleted translation using Weblate (English (Australia))
2020-02-17 18:24:02 +00:00
Konrad Pozniak
91eb1c64f1
Merge remote-tracking branch 'weblate/develop' into develop
2020-02-17 19:21:10 +01:00
Weblate
c5c47ea58c
Added translation using Weblate (Luxembourgish)
2020-02-17 18:10:43 +00:00
Weblate
11de74f7e9
Added translation using Weblate (French (Belgium))
2020-02-17 18:10:41 +00:00
Weblate
06bf697bf4
Added translation using Weblate (English (United States))
2020-02-17 18:10:38 +00:00
Weblate
323aca8581
Added translation using Weblate (English (Australia))
2020-02-17 18:10:36 +00:00
Konrad Pozniak
a00509c946
Merge pull request #1678 from nailyk-weblate/weblate-tusky-tusky
...
Update from Weblate
2020-02-17 19:10:11 +01:00
Anonymous
3224ae2a84
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
Translated using Weblate (Polish)
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pl/
Translated using Weblate (Kabyle)
Currently translated at 47.4% (194 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
2020-02-17 15:24:05 +00:00
Daniele Lira Mereb
7e37a86ef5
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_BR/
2020-02-17 15:24:05 +00:00
Juanjo Salvador
1f8777b578
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/es/
2020-02-17 15:24:05 +00:00
Danial Behzadi
36b853cd05
Translated using Weblate (Persian)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fa/
2020-02-17 15:24:05 +00:00
ButterflyOfFire
69797b608c
Translated using Weblate (Kabyle)
...
Currently translated at 47.4% (194 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (Kabyle)
Currently translated at 46.5% (190 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (Kabyle)
Currently translated at 32.5% (133 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
2020-02-17 15:24:05 +00:00
ati3
a1bf07cfb0
Translated using Weblate (Slovak)
...
Currently translated at 25.2% (103 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sk/
2020-02-17 15:24:05 +00:00
Konrad Pozniak
285d2d488c
make the light theme background color lighter ( #1692 )
2020-02-17 16:24:00 +01:00
Ivan Kupalov
5a5bbca171
Fix emoji download ( #1691 )
...
* Update OkHttp to 4.3.1
* Fix downloading emoji fonts
OkHttp strips away content length info when compression is used.
Even though this behavior is old, we didn't observe it until OkHttp was
updated in d3ebcc14ec
2020-02-17 16:23:34 +01:00
Levi Bard
04275b4073
[Tusky10] Fix recollapsing expanded sensitive content in the thread view ( #1689 )
2020-02-14 19:04:14 +01:00
Levi Bard
185bfeb9f3
[Tusky10] Fix descriptions of audio attachments when expanding/collapsing status content ( #1688 )
2020-02-14 19:03:59 +01:00
Konrad Pozniak
3a75ca25a3
[Tusky10] fix crash when bookmarking a conversation while offline ( #1686 )
2020-02-14 19:03:42 +01:00
Konrad Pozniak
28e128a4dd
[Tusky10] adjust poll result background, status divider & button outline color ( #1685 )
...
* adjust poll result background, status divider & button outline color
* fix navigationBarDividerColor
2020-02-14 19:03:18 +01:00
Konrad Pozniak
3edb93ff7c
increase tab page margin ( #1684 )
2020-02-14 19:03:01 +01:00
Juanjo Salvador
51ee4b6e92
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/es/
2020-02-13 17:41:21 +00:00
Danial Behzadi
e994473556
Translated using Weblate (Persian)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fa/
2020-02-13 17:41:21 +00:00
ButterflyOfFire
16bdaf5458
Translated using Weblate (Kabyle)
...
Currently translated at 46.5% (190 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (Kabyle)
Currently translated at 32.5% (133 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
2020-02-13 17:41:21 +00:00
ati3
32801b5e03
Translated using Weblate (Slovak)
...
Currently translated at 25.2% (103 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sk/
2020-02-13 17:41:21 +00:00
Conny Duck
6be8d873e7
put androidExtensions experimental=true back in to fix crash
2020-02-12 21:53:16 +01:00
Conny Duck
6f8e8a6d5c
Release 69 / 10.0 beta 1
2020-02-10 16:50:35 +01:00
Conny Duck
0bd4920ea5
add missing languages to in-app language switcher
2020-02-10 15:18:08 +01:00
Conny Duck
5dacc3dc8e
delete invalid strings
2020-02-10 14:58:23 +01:00
Conny Duck
bd115bf480
Merge branch 'develop' of https://github.com/Vavassor/Tusky into develop
2020-02-10 14:51:17 +01:00
Conny Duck
07d979eb60
update LicenseActivity
2020-02-10 14:45:30 +01:00
ati3
fe30eb48cb
Translated using Weblate (Slovak)
...
Currently translated at 23.2% (95 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sk/
Translated using Weblate (Slovak)
Currently translated at 17.8% (73 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sk/
2020-02-10 13:00:27 +00:00
Danial Behzadi
5b479b4406
Translated using Weblate (Persian)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fa/
2020-02-10 13:00:27 +00:00
ButterflyOfFire
9ec34455ee
Translated using Weblate (Kabyle)
...
Currently translated at 26.9% (110 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
2020-02-10 13:00:27 +00:00
Ivan Kupalov
5945700c1b
Allow higher zooming levels for caption dialog images ( #1672 )
2020-02-10 14:00:21 +01:00
Konrad Pozniak
11a4de858c
fix crash when opening Poll dialog and instanceParams are null ( #1668 )
2020-02-09 22:34:44 +01:00
5242466c2a
emojireactions: resize buttons
2020-02-08 14:05:47 +03:00
Konrad Pozniak
5324258c2e
change dialog background color ( #1670 )
2020-02-07 20:52:22 +01:00
ati3
207d37b05c
Translated using Weblate (Slovak)
...
Currently translated at 12.0% (49 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sk/
2020-02-07 19:24:21 +00:00
Anonymous
8061a5184a
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
2020-02-07 19:24:21 +00:00
Sveinn í Felli
2c86cdc36f
Translated using Weblate (Icelandic)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/is/
2020-02-07 19:24:21 +00:00
nailyk
8d5f61133a
Translated using Weblate (French)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/
2020-02-07 19:24:21 +00:00
jeroenpraat
65487f8ac1
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/nl/
2020-02-07 19:24:21 +00:00
ButterflyOfFire
f550b16341
Translated using Weblate (Kabyle)
...
Currently translated at 24.7% (101 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (Kabyle)
Currently translated at 23.2% (95 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (Kabyle)
Currently translated at 11.5% (47 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translated using Weblate (Kabyle)
Currently translated at 11.2% (46 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
2020-02-07 19:24:21 +00:00
Konrad Pozniak
035329fe4c
revert colorPrimaryDark back for the dark theme ( #1669 )
2020-02-07 20:24:17 +01:00
Konrad Pozniak
88b8eca16a
fix crash when Account.displayName is null ( #1667 )
2020-02-07 20:23:51 +01:00
Konrad Pozniak
fde23f25d2
fix mixup of search params in SearchDataSource.loadRange ( #1666 )
2020-02-07 20:23:36 +01:00
b09aa35b8e
Very dirty, very quick, read-only implementation of emoji reactions
2020-02-07 01:21:10 +03:00
7c286c61cd
emojireactions: add emoji reaction list to StatusViewData
2020-02-06 23:24:18 +03:00
1b4f1eea0e
emojireactions: add entities and api endpoints
2020-02-06 23:19:28 +03:00
25e05f06ad
Fixup black theme
2020-02-06 22:52:32 +03:00
626359adaa
Merge branch 'develop' of https://github.com/tuskyapp/Tusky into develop
2020-02-06 18:55:36 +03:00
Konrad Pozniak
c379014d9a
fix content collapse button not working in notifications ( #1665 )
2020-02-04 22:21:43 +01:00
5860327ee6
Change about page
2020-02-04 20:11:56 +01:00
03cb9ceb75
Remove references to "toot", "boost", and "Mastodon" ( #67 )
2020-02-04 20:07:06 +01:00
d8782fdb1a
Fix NPE
2020-02-03 22:34:28 +06:00
db4670a703
Support emoji reaction notification
2020-02-03 18:36:45 +03:00
8e4e104a18
Enable muting for all timelines, except where it's useless
2020-02-03 14:30:25 +03:00
d58a80f498
Correctly handle invalid conversation ID
2020-02-03 13:33:52 +03:00
9cc251deaa
Change colors a bit
2020-02-03 13:24:04 +03:00
8666e5f833
Merge remote-tracking branch 'origin2/develop' into develop
2020-02-03 12:51:15 +03:00
058e7d46f9
Merge upstream, update color scheme
2020-02-03 12:50:52 +03:00
Frieder Bluemle
9bc000569d
Update espresso-core to 3.2.0
2020-02-01 11:14:31 -08:00
Konrad Pozniak
8767d2ed3d
Theme refactoring ( #1656 )
...
* Theme refactoring
* disable the automatic tinting of surfaces with elevation in dark mode
* make the media warning visible again with the dark theme
* fix nav bar on api 27+
* use correct color for all media warnings
2020-01-30 21:37:28 +01:00
Konrad Pozniak
29ef92edd3
fix overlapping icons in ComposeActivity ( #1661 )
2020-01-30 21:17:37 +01:00
Konrad Pozniak
415b526885
fix in app language switching ( #1659 )
2020-01-30 21:05:24 +01:00
ButterflyOfFire
07ae58889a
Adding kabyle language ( #1658 )
...
Adding kabyle language and correcting arabic.
2020-01-30 19:31:49 +01:00
af37f83ccd
Merge remote-tracking branch 'origin2/develop' into develop
2020-01-29 22:42:40 +03:00
Mélanie Chauvel (ariasuni)
d6f3856878
Refresh DM column when removing toot there instead of removing conversation ( #1654 )
2020-01-29 19:25:55 +01:00
Quentí
7f456b95c1
Translated using Weblate (Occitan)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/oc/
2020-01-29 18:17:15 +00:00
ati3
ff54d217f2
Translated using Weblate (Slovak)
...
Currently translated at 6.6% (27 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sk/
Translated using Weblate (Czech)
Currently translated at 97.3% (398 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/cs/
Added translation using Weblate (Slovak)
2020-01-29 18:17:15 +00:00
ButterflyOfFire
b0fe52a6a3
Translated using Weblate (Kabyle)
...
Currently translated at 11.0% (45 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Added translation using Weblate (Kabyle)
Translated using Weblate (French)
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/
Translated using Weblate (Arabic)
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ar/
2020-01-29 18:17:15 +00:00
Vegard Skjefstad
79886e7547
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 100.0% (409 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/nb_NO/
2020-01-29 18:17:15 +00:00
dani
56bcfcbcff
Translated using Weblate (German)
...
Currently translated at 97.8% (400 of 409 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/de/
2020-01-29 18:17:15 +00:00
Sveinn í Felli
8a90078fbd
Translated using Weblate (Icelandic)
...
Currently translated at 100.0% (408 of 408 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/is/
Added translation using Weblate (Icelandic)
2020-01-29 18:17:15 +00:00
Konrad Pozniak
45828fbb5a
fix FragmentAdapter returning null fragments when activity was recreated ( #1647 )
...
* fix FragmentAdapter returning null fragments when activity was recreated
* remove unused import
* make activity in CustomFragmentStateAdapter private
2020-01-29 19:17:11 +01:00
Konrad Pozniak
27d464351b
fix reveal button not updating in ViewThreadActivity ( #1652 )
2020-01-29 19:16:12 +01:00
Konrad Pozniak
7d5a9da992
fix crash when closing ComposeActivity ( #1651 )
2020-01-29 19:15:53 +01:00
0ab3e66d0f
Implement muting whole conversation by it's ID, add button to hide muted status again
2020-01-26 19:31:51 +03:00
40c9ae6884
item_status_muted: better alignment of image button
2020-01-26 16:38:06 +03:00
8cb743efaa
Implement muting/unmuting conversations, fix possible appearing of muted users in notifications
2020-01-26 16:13:22 +03:00
ff361c1743
Merge with upstream
2020-01-20 13:56:18 +03:00
f2f7f32ca5
MainActivity: increase velocity threshold for viewPager
2020-01-20 13:48:32 +03:00
Ivan Kupalov
77fb4df659
Make radio buttons in compose screen sheets full width, fix #1593 ( #1645 )
2020-01-18 12:13:10 +01:00
Ivan Kupalov
e1aa3cc995
Enable zooming and panning in the CaptionDialog ( #1643 )
2020-01-18 12:12:37 +01:00
3468cc654e
NotificationsAdapter: show muted threads as muted
2020-01-17 19:44:09 +03:00
a6e9e85c22
Status: add isMuted parameter
2020-01-17 19:05:45 +03:00
d8475b6bd1
values: add thread mute strings
2020-01-17 19:04:42 +03:00
Ivan Kupalov
92e9c9a762
Fix setting text to CW button in fav/reblog notification. Fix #1641 ( #1642 )
...
This is a regression from e5b78f65cf
2020-01-16 19:08:19 +01:00
Levi Bard
f903cc50e1
Add support for sharing audio attachments ( #1629 )
2020-01-16 19:06:13 +01:00
Levi Bard
9dccd06a06
Add support for uploading audio attachments ( #1630 )
...
* Add support for audio attachments.
Partially addresses #1337
* Register Tusky as a target for audio sharing
* Use icon with textColorTertiary for audio preview
2020-01-16 19:05:52 +01:00
Vivianne
a7c1345085
Small changes to the media player ( #1572 )
...
* Resolving some issues with media playback.
* Changing ViewVideoFragment so that it fully handles autohiding the
media controller, allowing consistency between it and the toolbar
* Fixed an issue where the toolbar and description were not fading in
* Do not hide the toolbar/media player if the video is loading or paused
* Created "ExposedPlayPausedVideoView" to allow hooking play/pause
* Fix back button when viewing videos
* Back button did not work if video controls were visible.
* Tweak audio player
* Always show the controls when audio begins playing
* Do not auto-hide the controls if the player is playing audio
* Address PR comments
* Use overloaded constructor
* Remove m prefix
* Fix subtle media player issues
* Fix audio player incorrectly auto-hiding after hiding/showing toolbar
* Only subscribe touch listener once content is ready
- Prevents top toolbar visibility from getting out of phase with audio player visibility if hidden during load
2020-01-16 19:01:02 +01:00
79c264d0d3
TimelineRepositoryTest: fix
2020-01-16 18:26:31 +03:00
6e60f89f48
MastodonApi: set withMuted to true everywhere for a while
2020-01-16 18:15:11 +03:00
7657202347
MastodonApi: add with_muted field on every timeline
2020-01-16 18:14:41 +03:00
cfabb3f748
NotificationHelper: don't send notification if it's from muted thread
2020-01-16 18:13:38 +03:00
9645718062
Status: add thread_muted field
2020-01-16 18:13:10 +03:00
a21d30128f
ComposeActivityTest: fix test(for now empty nodeinfo)
2020-01-16 17:17:21 +03:00
0a40b9cc6f
ComposeActivity: add warning for too big files
2020-01-16 16:51:55 +03:00
2e45c1ecb4
ComposeActivity: use nodeinfo data for determining upload limits and markdown support
2020-01-16 16:44:32 +03:00
7f9bfb5790
NodeInfo: implement nodeinfo fetching
2020-01-16 16:43:54 +03:00
e2ad0f541f
Merge remote-tracking branch 'origin2/develop' into develop
2020-01-16 11:58:27 +03:00
Konrad Pozniak
21a7201f8a
fix notification refresh ( #1638 )
2020-01-14 21:58:35 +01:00
6c2fd977a7
gradle: fix AppCompatCustomView lint warning. I don't really care about AppCompat bloated everyone use
2020-01-14 18:41:58 +03:00
3e7bfb4f39
Merge with upstream
2020-01-14 17:07:21 +03:00
Konrad Pozniak
f12f126df5
migrate ReportPagerAdapter to ViewPager2 ( #1635 )
2020-01-13 21:15:22 +01:00
Konrad Pozniak
cd52caf9e9
fix crash in NotificationAdapter when status is null ( #1634 )
2020-01-13 21:12:33 +01:00
Daniele Lira Mereb
8b856949f9
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (408 of 408 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_BR/
2020-01-13 14:54:26 +00:00
Muha Aliss
0f1156774c
Translated using Weblate (Turkish)
...
Currently translated at 97.3% (397 of 408 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/tr/
2020-01-13 14:54:26 +00:00
ButterflyOfFire
6db0bab5fd
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (408 of 408 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ar/
2020-01-13 14:54:26 +00:00
Vegard Skjefstad
ec29d4410d
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 100.0% (408 of 408 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/nb_NO/
2020-01-13 14:54:26 +00:00
nailyk-weblate
663099e0b1
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/
2020-01-13 14:54:26 +00:00
Anonymous
5242dfa5b9
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (408 of 408 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_BR/
2020-01-13 14:54:26 +00:00
hg
60ae1ad8ed
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (408 of 408 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
2020-01-13 14:54:26 +00:00
kyori19
a6c9aee2e8
Fix emoji sorting ( #1633 )
2020-01-13 15:22:45 +01:00
Ivan Kupalov
32fd7b18ce
Add space before emojo code in editor when needed, fix #1616 ( #1632 )
2020-01-13 15:21:40 +01:00
Levi Bard
c9a28b47c1
Compose activity: When selection is nonempty and a "special character" button is pressed, decorate all selected word starts ( #1523 )
...
* ComposeActivity: When selection is nonempty and a "special character" button is pressed, decorate all selected word starts
Closes #1417
* ComposeActivity: Tests for word break prepend logic
2020-01-13 15:21:17 +01:00
Levi Bard
6a2c9bdbe4
Don't drop content warning when replying ( #1631 )
2020-01-13 15:18:55 +01:00
Konrad Pozniak
7cb76aad97
Fix search bugs ( #1624 )
...
* fix toggling media visibility
* cleanup search code to make it more readable
* remove redundant OnQueryTextListener
this is the default behavior
* fix bookmarking
* fix status interaction causing unnecessary network requests
2020-01-13 13:57:44 +01:00
Konrad Pozniak
f8c7bedfa6
update rick roll domain list
2020-01-13 13:48:53 +01:00
7e3a3cd469
ProgressTextView: fix circle drawing
2020-01-11 13:07:21 +03:00
48bf3fe35a
ProgressView: remove dead code
2020-01-11 12:41:44 +03:00
9cb80410e5
Notification: ignore seen notifications
2020-01-11 11:21:42 +03:00
b926f5afed
AccountActivity: don't show moderator badge if user already admin
2020-01-11 10:24:45 +03:00
04678c5618
AccountActivity: implement subscribing
2020-01-11 10:10:22 +03:00
1d79902bdc
MastodonApi: add support for subscribing endpoints and subscribing status field
2020-01-11 10:09:57 +03:00
b414d891ad
gradle: disable ExtraTranslation
2020-01-11 08:50:03 +03:00
ad4b559f8f
AccountActivity: show admin/moderator badge
2020-01-11 08:39:40 +03:00
f5aa20577e
ComposeActivity: restore ability to upload any type of file
2020-01-11 07:47:11 +03:00
0123529f0f
Merge with upstream
2020-01-09 02:06:12 +03:00
b4d72d7980
ComposeActivity: fix crash
2020-01-09 01:56:39 +03:00
55c7567aab
db: upgrade
2020-01-09 01:48:25 +03:00
Konrad Pozniak
e5b78f65cf
use material buttons in timeline ( #1627 )
...
* use material buttons in timeline
* remove wrong switch option
2020-01-07 19:40:52 +01:00
Konrad Pozniak
b87a1711f2
give poll result backgrounds a rounded shape ( #1626 )
...
* give poll result backgrounds a rounded shape
* fix rtl layout of poll options
2020-01-07 19:38:32 +01:00
Konrad Pozniak
441a1c1f95
remove redundant toHtml from StatusBaseViewHolder ( #1625 )
2020-01-07 19:38:08 +01:00
Mélanie Chauvel (ariasuni)
bec1ce8b09
Display Elephant with better message in Drafts screen when there are none ( #1619 )
...
* Display Elephant with better message in Drafts screen when there are none
* Remove unused import
2020-01-06 18:24:54 +01:00
Levi Bard
9d65b2ace1
Filters: Make behavior of "whole word" filters consistent with the web UI when filters are non-alphanumeric ( #1623 )
...
* Fix tests build
* Make behavior of non-alphanumeric whole-word filters consistent with the web UI.
Fixes #1543
* Fix typo in filter tests
2020-01-06 16:16:54 +01:00
ce1bfb925d
ComposeActivity: add unlimited attachments support again
2020-01-04 02:54:31 +03:00
7d4e5d8dc0
ComposeActivity: add optional field markdownMode to ComposeOptions
2020-01-04 02:15:06 +03:00
589d2db393
AppDatabase: fix migration
2020-01-04 02:14:49 +03:00
bf1b8c451c
ComposeActivity: fix compiling
2020-01-04 02:06:14 +03:00
884cb3a231
activity_compose: fix after merge
2020-01-04 01:59:17 +03:00
80feb90bca
ComposeViewModel: fix syntax errors
2020-01-04 01:50:55 +03:00
5b741ffbd9
colors: fix resource name after merge
2020-01-04 01:44:21 +03:00
3b1ae4b319
item_media_preview: try to fix XML parsing
2020-01-04 01:12:44 +03:00
b9a9cdb109
ComposeActivity: reimplement markdown mode again after pointless java->kotlin transition
2020-01-04 00:49:36 +03:00
be145d9ea2
ComposeActivity: hide markdown button by default
2020-01-03 23:58:40 +03:00
f5de85c39e
VersionUtils: move isPleroma method from Instance
2020-01-03 23:58:12 +03:00
678ed81626
Merge upstream develop
2020-01-03 22:55:09 +03:00
Konrad Pozniak
352ff3a2d1
give media previews a rounded outline ( #1617 )
...
* give media previews a rounded outline
* give media previews a rounded outline in ReportActivity
2020-01-03 20:22:16 +01:00
Ivan Kupalov
426e7edb73
Fix missing cases of using StatusDisplayOptions ( #1614 )
2020-01-03 20:22:02 +01:00
Vegard Skjefstad
21f59d003d
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 100.0% (408 of 408 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/nb_NO/
2020-01-02 17:51:03 +00:00
Joan Montané
b1bc214144
Translated using Weblate (Catalan)
...
Currently translated at 100.0% (408 of 408 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ca/
2020-01-02 17:51:03 +00:00
ButterflyOfFire
b339877576
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (407 of 407 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ar/
2020-01-02 17:51:03 +00:00
Konrad Pozniak
cdb9d87f41
use RxAwareViewModel for more ViewModels ( #1613 )
...
* use RxAwareViewModel for more ViewModels
* fix ReportViewModel
2020-01-02 18:50:58 +01:00
Konrad Pozniak
88d59da13c
fix poll button being visible below voted poll ( #1612 )
2019-12-31 16:56:04 +01:00
Konrad Pozniak
8a9d62e654
Merge pull request #1610 from tuskyapp/improve_scheduled_toot
...
Improve ScheduledTootActivity
2019-12-31 15:00:23 +01:00
Konrad Pozniak
54f04fb4d7
address PR feedback
2019-12-31 13:57:24 +01:00
Mélanie Chauvel
b6759fa46e
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (406 of 406 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/eo/
2019-12-30 20:37:25 +00:00
Anonymous
54df9cf3da
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (406 of 406 strings)
Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
2019-12-30 20:37:25 +00:00
Ivan Kupalov
7623962a0d
Use blurhash as image preview and as sensitive media cover, close #1571 ( #1581 )
...
* Use blurhash as image preview and as sensitive media cover, close #1571
* Fix focal point for blurhashes
* Fix video indicator overlapping sensitive media indicator
* Add a preference for blurhash
* Add blurhash to report UI.
* Introduce StatusDisplayOptions
2019-12-30 21:37:20 +01:00
Konrad Pozniak
76026f5afa
add license headers
2019-12-30 21:09:10 +01:00
Konrad Pozniak
f0112743eb
remove debug logging
2019-12-30 21:05:03 +01:00
Konrad Pozniak
b66faab71c
add empty screen message
2019-12-30 21:01:38 +01:00
