Commit Graph

980 Commits

Author SHA1 Message Date
sk 5c593a1025 improve adding/removing users from lists 2022-11-12 20:20:45 +01:00
sk 625134605b implement adding/removing users from lists 2022-11-12 16:14:45 +01:00
sk 1e0ae6e570 Merge branch 'main' into list-timeline-views 2022-11-12 12:35:05 +01:00
sk f3efd1e3bc Merge branch 'feature/follow-requests' into fork 2022-11-12 03:22:27 +01:00
sk dba8bd1862 clean up, revert unnecessary changes 2022-11-12 03:21:40 +01:00
sk d78e3a738d bump version 2022-11-12 03:06:40 +01:00
sk 5632016220 Merge branch 'feature/follow-requests' into fork 2022-11-12 03:05:02 +01:00
sk 12fdd70ad0 implement accepting/rejecting follow requests
closes #13
2022-11-12 03:03:52 +01:00
sk 7fd6a6f83e Merge branch 'feature/follow-requests' into fork 2022-11-12 03:03:14 +01:00
sk 515592e8ea implement accepting/rejecting follow requests
closes #13
2022-11-12 03:01:59 +01:00
sk 5fa81e6c8a add accept/decline buttons 2022-11-12 01:18:07 +01:00
sk c22a139a5d bump version 2022-11-11 21:09:31 +01:00
sk f568415d8c Merge branch 'feature/favs-list' into fork 2022-11-11 21:06:53 +01:00
sk c1137cf7b7 implement favorited posts list
closes #4
2022-11-11 21:05:06 +01:00
sk b2a7b62902 Rename “Community“ to “Local” 2022-11-11 19:57:19 +01:00
sk a356bdeee3 change github and website url 2022-11-11 19:33:26 +01:00
sk 76043e87ad Merge branch 'fix-edit-polls' into fork 2022-11-11 19:20:16 +01:00
sk 3b28bd6ce9 get poll duration from edited status
fixes mastodon#343
2022-11-11 19:10:45 +01:00
sk 1236b16a3a Merge branch 'feature/delete-redraft' into fork 2022-11-11 18:00:09 +01:00
sk 5ec4e5339b fix null pointer exception 2022-11-11 17:59:53 +01:00
sk 0643f72a0b Merge branch 'feature/delete-redraft' into fork 2022-11-11 17:57:27 +01:00
sk 443b985b06 navigate to re-drafted status when opened 2022-11-11 17:53:04 +01:00
sk aecaba2a92 show reply icon as workaround for mastodon#341 2022-11-11 17:18:21 +01:00
sk 977f3d0635 fix re-drafting replies 2022-11-11 17:17:52 +01:00
sk 5742493185 re-implement redraft from upstream edit function 2022-11-11 16:12:26 +01:00
sk 8b2d06c548 Merge branch 'main' into feature/delete-redraft 2022-11-11 15:36:33 +01:00
sk 56b76080ec Revert "implement deleting and re-drafting"
This reverts commit 3a4d13b1c6.
2022-11-11 15:35:30 +01:00
sk 1a12659a23 Revert "preserve visibility when re-drafting"
This reverts commit e8b43c7179.
2022-11-11 15:35:26 +01:00
sk d711ed986c set hiding interactions counts as default 2022-11-11 14:58:39 +01:00
sk 53cb809996 bump version, update readme 2022-11-11 13:26:48 +01:00
sk ff0a77d6b5 Merge branch 'settings/hide-interaction-numbers' into fork 2022-11-11 13:25:35 +01:00
sk 596ec3230f add option to hide interaction counts 2022-11-11 13:23:53 +01:00
sk fa75c8eb6f Merge branch 'compact-extended-footer' into fork 2022-11-11 13:03:51 +01:00
sk 6c7a17fb81 change edit history icon 2022-11-11 13:03:39 +01:00
sk 0ad8f926cc set reblogs and favs always in one line 2022-11-11 12:54:17 +01:00
sk 764ab60fea bump version 2022-11-11 03:15:52 +01:00
sk 9283ca8878 Merge branch 'list-timeline-views' into fork 2022-11-11 03:06:55 +01:00
sk 679ede1124 update strings 2022-11-11 03:02:17 +01:00
sk f4b1bde8c5 improve list item styling 2022-11-11 02:42:58 +01:00
sk eff6cc3e17 Merge branch 'compact-extended-footer' into fork 2022-11-11 02:11:52 +01:00
sk 03044b86b1 add clickable app name button 2022-11-11 02:11:37 +01:00
sk 90ff88f02b Merge branch 'compact-extended-footer' into fork 2022-11-11 01:35:13 +01:00
sk e1f378977a set fixed visibility icon size 2022-11-11 01:35:01 +01:00
sk a0f3d2862c Merge branch 'compact-extended-footer' into fork 2022-11-11 01:27:46 +01:00
sk 0c64145368 implement new old extended footer design
fixes #34
2022-11-11 01:27:17 +01:00
sk a1474fb461 bump version 2022-11-09 23:29:30 +01:00
sk 965ebc8669 Merge branch 'feature/post-notifications-toggle' into fork 2022-11-09 23:28:59 +01:00
sk 3514152439 fix issues with post notification button 2022-11-09 23:28:48 +01:00
sk e9f5d235cb Implement post notifications button
Closes #10, mastodon#81
2022-11-09 18:39:28 +01:00
sk 9692afb323 bump version 2022-11-09 18:38:58 +01:00
sk 3ae37a700b Merge branch 'feature/post-notifications-toggle' into fork 2022-11-09 18:38:20 +01:00
sk b166ca705e Implement post notifications button 2022-11-09 18:38:10 +01:00
sk e6a67543f4 Bump version, update README 2022-11-09 15:54:33 +01:00
sk 7d38f031f1 Merge branch 'feature/follow_hashtags' into fork
Fixes #31, mastodon#233
2022-11-09 15:49:29 +01:00
sk cf864e6f49 Implement following hashtags 2022-11-09 15:48:01 +01:00
sk f4b1629a1d Merge branch 'feature/filter-home-timeline' into fork 2022-11-09 10:34:47 +01:00
sk 1fbb97021e align code 2022-11-09 10:34:36 +01:00
sk 229c815a59 move option to home timeline section 2022-11-09 10:32:12 +01:00
sk ee8d78637d Merge branch 'settings/load-new-posts' into fork 2022-11-09 10:31:30 +01:00
sk 4ede842171 add option to disable automatically loading new posts 2022-11-09 10:30:25 +01:00
sk 8306e78ce3 Merge branch 'feature/filter-home-timeline' into fork 2022-11-09 10:12:16 +01:00
sk 65d093ee9d fix new posts not filtering 2022-11-09 10:11:55 +01:00
sk aa48233a75 Merge branch 'main' into fork 2022-11-09 09:48:03 +01:00
Julien Humbert 20d838f576 Fix CJK text cut off for category names on Onboarding screen 2022-11-08 23:48:04 +09:00
Grishka ae50e618c0 Fix #316 2022-11-08 09:41:07 +03:00
Grishka defa8b014e Fix #315 2022-11-08 09:38:26 +03:00
Grishka 159d91f390 Crash fixes 2022-11-08 09:36:56 +03:00
sk 430d4ec93b Merge branch 'spoiler-height-independent' into fork 2022-11-08 00:55:10 +01:00
sk ae64784daf revert increased vertical padding
i changed my mind
2022-11-08 00:54:48 +01:00
sk 18df7c32a4 Merge branch 'feature/filter-home-timeline' into fork 2022-11-08 00:27:31 +01:00
sk 4615612a65 use home_timeline string 2022-11-08 00:27:19 +01:00
sk 6b226cdcad bump version 2022-11-08 00:21:33 +01:00
sk 75a35cd680 Merge branch 'feature/filter-home-timeline' into fork 2022-11-08 00:18:19 +01:00
sk 18d4f2fa36 add timeline filters for replies/boosts
fixes #32, mastodon#210
2022-11-08 00:13:06 +01:00
sk bca936f6a2 move contribute to the spicy zone
i've been planning to do this for a while :D
2022-11-07 23:37:10 +01:00
sk 58abdad62a bump version 2022-11-07 21:18:41 +01:00
sk ee158e1aba Merge branch 'feature/mark-media-as-sensitive' into fork 2022-11-07 21:04:44 +01:00
sk 40d478aaec tweak styles 2022-11-07 21:04:28 +01:00
sk e7fb96b3ff Merge branch 'feature/mark-media-as-sensitive' into fork 2022-11-07 20:47:15 +01:00
sk ef75427b45 fix option not being there when editing 2022-11-07 20:46:49 +01:00
sk 2ff4f00774 Merge branch 'feature/mark-media-as-sensitive' into fork 2022-11-07 20:17:39 +01:00
sk 534fd8c119 implement "mark media as sensitive" button
fixes #21
2022-11-07 20:15:16 +01:00
sk 2d2cd89454 Merge branch 'spoiler-height-independent' into fork 2022-11-07 17:32:55 +01:00
sk 9f3f5ca7c1 make spoiler height independent of content
fixes #12, fixes mastodon/mastodon-android#166
2022-11-07 17:32:37 +01:00
Samuel Kaiser c0e6f17c83
Merge pull request #28 from br4yd/patch-1
Add German translation for the federated timeline
2022-11-07 16:57:21 +01:00
sk 677f1cb42d Merge remote-tracking branch 'origin/upstream' into fork 2022-11-07 16:56:27 +01:00
Julien Humbert 21927d2e25 Add missing line in Android Manifest 2022-11-07 12:32:20 +09:00
Julien Humbert c35441f5f7 Add per-app language preferences 2022-11-07 12:27:26 +09:00
br4yd 3718fe6601
Add German translation for the federated timeline
I added the translation strings for the federation timeline tab to the German translation file and also translated the values.
2022-11-06 22:21:53 +01:00
sk 095f234bd5 bump version 2022-11-06 11:16:31 +01:00
sk ebbd5d1fa3 Merge branch 'upstream' into fork 2022-11-06 11:13:26 +01:00
Grishka c8abf26040 Fix #301 2022-11-06 05:43:17 +03:00
Grishka bc733af147 Actually no, this makes more sense 2022-11-06 05:39:22 +03:00
Grishka 77a2fd2a60 Fix #298 2022-11-06 05:36:43 +03:00
Gregory K bfa48c2d3e
Merge pull request #289 from sk22/fix-editing-cw
Fix spoiler not being published when editing
2022-11-04 07:02:40 +03:00
sk ef207f885b increase update check interval 2022-11-04 03:37:32 +01:00
sk c4eee28335 Merge branch 'feature/check-for-update-button' into fork 2022-11-04 03:34:06 +01:00
sk 6fe466779e add toash message 2022-11-04 03:33:41 +01:00
sk e71db1b883 custom app name in strings 2022-11-04 03:11:10 +01:00
sk b6efafe99d Merge branch 'feature/check-for-update-button' into fork 2022-11-04 03:09:39 +01:00
sk 688d466f8e implement manual update check settings item 2022-11-04 03:09:19 +01:00
sk 48a5e262ce bump version 2022-11-03 17:18:57 +01:00
sk 972c05d60b Revert "set unlisted as default visibility"
This reverts commit d34653750e.
2022-11-03 17:13:10 +01:00
sk acb5778e0b bump version, again 2022-11-03 16:36:31 +01:00
sk 7694c50358 Merge branch 'fix-editing-cw' into fork 2022-11-03 16:35:31 +01:00
sk 7ffa368d10 fix spoiler not being published when editing 2022-11-03 16:33:12 +01:00
Y32Gcnte8z 53f8f41d88 remain visibility when editing 2022-11-03 16:15:17 +01:00
sk 93d57d847e fix newly published posts appearing twice
see https://github.com/mastodon/mastodon-android/issues/283
2022-11-03 16:14:12 +01:00
sk 83a4f5eec2 re-add missing onStatusUpdate event listener 2022-11-03 16:11:44 +01:00
obstsalatschuessel 21a526dda9 Add list timelines view
* get accounts list timelines from API
* display available lists in discover view tab
* display list timeline
2022-11-03 09:03:34 +01:00
sk 85b8bae42e bump version 2022-11-02 22:15:26 +01:00
Samuel Kaiser 64416ef9ee
Merge pull request #26 from Y32Gcnte8z/fork
Should we also change the client name in the footer of status?
2022-11-02 21:55:20 +01:00
Samuel Kaiser 6274ab3384
Merge pull request #27 from Y32Gcnte8z/visibility
Retain visibility of status when editing
2022-11-02 21:53:34 +01:00
sk 4ea5d94dc6 Merge branch 'fix-notifications-crash' into fork 2022-11-02 21:41:30 +01:00
sk db4dd436b7 more concise null check 2022-11-02 21:36:14 +01:00
sk 6906ac6c8f remove unnecessary import 2022-11-02 21:34:05 +01:00
sk bc0b56a90e avoid null in notification display items
fixes bug where type = status, but status = null,
causing buildDisplayItems to return a null title status item and an account card
2022-11-02 21:31:44 +01:00
sk 349d95b8ee fix syntax error 2022-11-02 20:25:42 +01:00
sk 8c8eb395de Merge remote-tracking branch 'origin/upstream' into fork 2022-11-02 20:22:33 +01:00
Grishka 50c844aa25 It was the wrong icon this whole time 2022-11-02 11:06:00 +03:00
Grishka 85b232330b Merge branch 'l10n_master' 2022-11-02 11:02:18 +03:00
Grishka b4c305d094 Add privacy policy step to the signup flow 2022-11-02 11:01:52 +03:00
Grishka be2ee3a029 Fix #277 2022-11-02 09:07:48 +03:00
sk 596799bf2f enable github update check 2022-11-01 23:28:55 +01:00
sk 10a405ef13 change self updater api url 2022-11-01 21:38:30 +01:00
Eugen Rochko 118c5d4b44 New translations strings.xml (French) 2022-11-01 21:31:10 +01:00
sk a4cb05080a Merge branch 'upstream' into fork 2022-11-01 21:26:44 +01:00
Eugen Rochko 699ececc42 New translations strings.xml (French) 2022-11-01 20:17:30 +01:00
Eugen Rochko ea7aa6c52f New translations strings.xml (Vietnamese) 2022-11-01 18:21:15 +01:00
David Hewitt 244f2ed911
Fix crash on duplicate custom emojis
Fixes #274

Add a merge function to `Collectors.toMap` to discard any duplicate custom emojis that may be returned if a user uses the same custom emoji in both their name and profile.
2022-11-01 14:47:25 +00:00
Eugen Rochko b3c0550a86 New translations strings.xml (German) 2022-11-01 15:23:47 +01:00
Eugen Rochko 39a0c6d08a New translations strings.xml (Vietnamese) 2022-11-01 11:03:52 +01:00
Eugen Rochko 4233c743e2 New translations strings.xml (Italian) 2022-10-31 22:06:56 +01:00
David Hewitt eea00b0d53
Load post privacy preference
This queries the user's post visibility preference when opening the composer, and sets it on the composer.

In the case of composing a reply, the user's preference is only respected if it is "more private" than the privacy of the post being replied to, as this appears to be the behaviour in the web interface (and is what I'd expect)
2022-10-31 20:51:28 +00:00
Eugen Rochko 7cef4d282c New translations strings.xml (German) 2022-10-31 19:11:31 +01:00
Eugen Rochko df6e085c97 New translations strings.xml (German) 2022-10-31 18:14:37 +01:00
Eugen Rochko 70cf48355e New translations strings.xml (German) 2022-10-31 10:54:54 +01:00
Eugen Rochko da06c798d7 New translations strings.xml (German) 2022-10-31 09:23:34 +01:00
Eugen Rochko 9055c094e8 New translations strings.xml (Kabyle) 2022-10-31 07:46:18 +01:00
Eugen Rochko 5ab3ae3d59 New translations strings.xml (Chinese Traditional) 2022-10-31 07:46:17 +01:00
Eugen Rochko 92ebb2f339 New translations strings.xml (German) 2022-10-31 07:46:16 +01:00
Eugen Rochko d8c034dfa3 New translations strings.xml (Arabic) 2022-10-31 07:46:15 +01:00
Eugen Rochko 247516849e New translations strings.xml (French) 2022-10-31 07:46:14 +01:00
Eugen Rochko aad9996b6f New translations strings.xml (Spanish) 2022-10-31 07:46:13 +01:00
Eugen Rochko 76c1ad07a3 New translations strings.xml (Catalan) 2022-10-31 07:46:12 +01:00
Eugen Rochko 49599f48bb New translations strings.xml (Czech) 2022-10-31 07:46:11 +01:00
Eugen Rochko 158d128316 New translations strings.xml (Greek) 2022-10-31 07:46:09 +01:00
Eugen Rochko 00897e7388 New translations strings.xml (Basque) 2022-10-31 07:46:08 +01:00
Eugen Rochko 1867f294c8 New translations strings.xml (Finnish) 2022-10-31 07:46:07 +01:00
Eugen Rochko eaa189d6b0 New translations strings.xml (Hebrew) 2022-10-31 07:46:06 +01:00