Commit Graph

Select branches

Hide Pull Requests

bugfix/#29

bugfix/#34

bugfix/buttons_cutting_out_in_notification_tab

develop

development_of_the_nord_theme

documentation/readme-revamp

feature/calckey-support

feature/camera-compose-shortcut

feature/direct_message_tab

feature/filters

feature/filters_for_real

feature/finefindus/settings-redesign

feature/fix_#34

feature/hide_dividers_in_the_main_timeline

feature/local-timelines

feature/long_press_discover

feature/maybe_polling_notifications

feature/private_notes

feature/publish_button_improvements

feature/remote-followers

feature/show_changelog_button

m3-merger

main

master

mastodon-android

merge-upstream

refactor/previewless_media_grid

revert-804-main

rewrite

upstream-release

upstream/fix-translations-crash

upstream/null-hashtags-derefence

#10

#100

#102

#106

#108

#111

#112

#115

#117

#12

#120

#121

#123

#124

#125

#131

#135

#136

#140

#144

#145

#15

#157

#16

#160

#17

#170

#174

#175

#176

#179

#18

#180

#183

#185

#188

#193

#193

#195

#196

#20

#200

#202

#203

#21

#213

#214

#22

#221

#23

#236

#24

#245

#246

#247

#249

#25

#252

#255

#261

#263

#264

#267

#268

#277

#278

#284

#284

#292

#297

#299

#30

#301

#302

#313

#313

#32

#321

#33

#35

#351

#352

#353

#355

#356

#357

#358

#36

#360

#362

#363

#364

#366

#367

#368

#371

#373

#374

#377

#38

#384

#385

#386

#396

#397

#399

#400

#404

#405

#406

#408

#409

#41

#410

#413

#414

#415

#416

#417

#419

#420

#422

#424

#425

#426

#427

#428

#429

#43

#431

#431

#432

#433

#438

#439

#44

#442

#445

#447

#448

#449

#45

#450

#451

#452

#454

#455

#457

#458

#459

#46

#460

#460

#461

#463

#467

#47

#470

#475

#48

#482

#484

#485

#487

#49

#490

#491

#495

#496

#50

#503

#505

#507

#508

#515

#516

#520

#521

#523

#526

#528

#529

#538

#54

#549

#55

#560

#570

#572

#572

#577

#58

#588

#589

#59

#599

#599

#6

#606

#608

#627

#628

#628

#7

#79

#82

#85

#9

#91

#92

#94

#95

#96

1.1.4+fork.54.moshinda

1.1.4+fork.55.moshinda

1.1.4+fork.56.moshinda

1.1.4+fork.57.moshinda

1.1.4+fork.58.moshinda

1.1.4+fork.59.moshinda

1.1.4+fork.60.moshinda

1.1.4+fork.61.moshinda

1.1.4+fork.62.moshinda

1.1.4+fork.63.moshinda

1.1.4+fork.64.moshinda

1.1.4+fork.65.moshinda

1.1.4+fork.66.moshinda

1.1.4+fork.67.moshinda

1.1.4+fork.68.moshinda

1.1.4+fork.69.moshinda

1.1.4+fork.70.moshinda

1.1.4+fork.71.moshinda

1.1.4+fork.72.moshinda

1.1.4+fork.73.moshinda

1.1.4+fork.74.moshinda

1.1.4+fork.75.moshinda

1.1.4+fork.76.moshinda

1.1.4+fork.77.moshinda

1.1.4+fork.78.moshinda

1.1.4+fork.79.moshinda

1.1.4+fork.80.moshinda

1.1.4+fork.81.moshinda

1.1.4+fork.82.moshinda

1.1.4+fork.83.moshinda

1.1.4+fork.84.moshinda

1.1.4+fork.85.moshinda

1.1.4+fork.86.moshinda

1.1.4+fork.87.moshinda

1.1.4+fork.88.moshinda

1.1.4+fork.89.moshinda

1.1.4+fork.90.moshinda

1.1.4+fork.91.moshinda

1.1.4+fork.92.moshinda

1.1.4+fork.93.moshinda

1.2.0+fork.94.moshinda

1.2.0+fork.95.moshinda

1.2.0+fork.96.moshinda

1.2.0+fork.97.moshinda

1.2.0+fork.98.moshinda

1.2.0+fork.99.moshinda

1.2.3+fork.101.moshinda

1.3.0+fork.100.moshinda

2.1.4+fork.102.moshinda

2.1.4+fork.103.moshinda

2.1.4+fork.104.moshinda

2.3.0+fork.105.moshinda

2.3.0+fork.106.moshinda

2.3.0+fork.107.moshinda

2.3.0+fork.108.moshinda

2.3.0+fork.109.moshinda

v1.0

v1.0.1

v1.0.2

v1.0.3

v1.0.4-dev+fork.1.1

v1.1.0

v1.1.0-dev+fork.1.0

v1.1.1

v1.1.1+fork.11

v1.1.1+fork.12

v1.1.1+fork.13

v1.1.1+fork.14

v1.1.1+fork.15

v1.1.1+fork.16

v1.1.1+fork.17

v1.1.1+fork.18

v1.1.1+fork.19

v1.1.1-dev+fork.1

v1.1.1-dev+fork.10

v1.1.1-dev+fork.6

v1.1.1-dev+fork.7

v1.1.1-dev+fork.8

v1.1.1-dev+fork.9

v1.1.2

v1.1.3

v1.1.3+fork.20

v1.1.3+fork.21

v1.1.3+fork.22

v1.1.3+fork.23

v1.1.3+fork.24

v1.1.4

v1.1.4+fork.25

v1.1.4+fork.26

v1.1.4+fork.27

v1.1.4+fork.28

v1.1.4+fork.29

v1.1.4+fork.30

v1.1.4+fork.31

v1.1.4+fork.32

v1.1.4+fork.33

v1.1.4+fork.34

v1.1.4+fork.35

v1.1.4+fork.36

v1.1.4+fork.37

v1.1.4+fork.38

v1.1.4+fork.39

v1.1.4+fork.40

v1.1.4+fork.41

v1.1.4+fork.42

v1.1.4+fork.43

v1.1.4+fork.44

v1.1.4+fork.45

v1.1.4+fork.46

v1.1.4+fork.47

v1.1.4+fork.48

v1.1.4+fork.49

v1.1.4+fork.50

v1.1.4+fork.51

v1.1.4+fork.55

v1.1.4+fork.56

v1.1.4+fork.57

v1.1.4+fork.58

v1.1.4+fork.59

v1.1.5+fork.60

v1.1.5+fork.61

v1.1.5+fork.62

v1.1.5+fork.63

v1.1.5+fork.64

v1.1.5+fork.65

v1.1.5+fork.66

v1.1.5+fork.67

v1.1.5+fork.68

v1.1.5+fork.69

v1.1.5+fork.70

v1.1.5+fork.71

v1.1.5+fork.73

v1.1.5+fork.74

v1.1.5+fork.75

v1.1.5+fork.76

v1.2.0

v1.2.0+fork.77

v1.2.0+fork.78

v1.2.0+fork.79

v1.2.0+fork.80

v1.2.0+fork.81

v1.2.0+fork.82

v1.2.0+fork.83

v1.2.1

v1.2.2

v1.2.3

v1.2.3+fork.84

v1.2.3+fork.85

v1.2.3+fork.86

v1.2.3+fork.87

v1.2.3+fork.89

v1.2.3+fork.90

v1.2.3+fork.91

v1.2.3+fork.92

v1.2.3+fork.93

v1.2.3+fork.94

v2.0.0

v2.0.1

v2.0.1+fork.96

v2.0.1+fork.97

v2.0.2

v2.0.3

v2.0.3+fork.98

v2.0.3+fork.99

v2.0.4

v2.1.0

v2.1.1

v2.1.2

v2.1.3

v2.1.4

v2.1.4+fork.100

v2.1.5

v2.1.6

v2.1.6+fork.101

v2.1.6+fork.102

v2.1.6+fork.103

v2.1.6+fork.104

v2.1.6+fork.105

v2.1.6+fork.106

v2.1.6+fork.107

v2.1.6+fork.108

v2.1.6+fork.109

v2.1.6+fork.110

v2.2.0

v2.2.1

v2.2.2

v2.2.3

v2.2.4

v2.3.0

v2.4.0

v2.4.1

v2.5.0

v2.5.1

v2.5.2

v2.5.3

v2.5.5

v2.5.6

v2.6.0

v2.6.1

v2.7.0

v2.7.1

v2.7.2

v2.7.3

v2.8.0

v2.9.0

v2.9.1

Mono Color

• f4b1629a1d Merge branch 'feature/filter-home-timeline' into fork sk 2022-11-09 10:34:47 +01:00
• 1fbb97021e align code sk 2022-11-09 10:34:36 +01:00
• 229c815a59 move option to home timeline section sk 2022-11-09 10:32:12 +01:00
• ee8d78637d Merge branch 'settings/load-new-posts' into fork sk 2022-11-09 10:31:30 +01:00
• 4ede842171 add option to disable automatically loading new posts sk 2022-11-09 10:30:25 +01:00
• 8306e78ce3 Merge branch 'feature/filter-home-timeline' into fork sk 2022-11-09 10:12:16 +01:00
• 65d093ee9d fix new posts not filtering sk 2022-11-09 10:11:55 +01:00
• aa48233a75 Merge branch 'main' into fork sk 2022-11-09 09:48:03 +01:00
• 20d838f576 Fix CJK text cut off for category names on Onboarding screen Julien Humbert 2022-11-08 23:48:04 +09:00
• ae50e618c0 Fix #316 Grishka 2022-11-08 09:41:07 +03:00
• defa8b014e Fix #315 Grishka 2022-11-08 09:38:26 +03:00
• 159d91f390 Crash fixes Grishka 2022-11-08 09:36:56 +03:00
• 430d4ec93b Merge branch 'spoiler-height-independent' into fork sk 2022-11-08 00:55:10 +01:00
• ae64784daf revert increased vertical padding i changed my mind sk 2022-11-08 00:54:48 +01:00
• 18df7c32a4 Merge branch 'feature/filter-home-timeline' into fork sk 2022-11-08 00:27:31 +01:00
• 4615612a65 use home_timeline string sk 2022-11-08 00:27:19 +01:00
• 6b226cdcad bump version v1.1.4+fork.31 sk 2022-11-08 00:21:33 +01:00
• 1776709b38 update readme sk 2022-11-08 00:21:17 +01:00
• 75a35cd680 Merge branch 'feature/filter-home-timeline' into fork sk 2022-11-08 00:18:19 +01:00
• 18d4f2fa36 add timeline filters for replies/boosts fixes #32, mastodon#210 sk 2022-11-08 00:13:06 +01:00
• bca936f6a2 move contribute to the spicy zone i've been planning to do this for a while :D sk 2022-11-07 23:37:10 +01:00
• 0b59379c4e update readme sk 2022-11-07 23:35:31 +01:00
• 58abdad62a bump version v1.1.4+fork.30 sk 2022-11-07 21:18:41 +01:00
• c693414cc3 update readme sk 2022-11-07 21:18:37 +01:00
• ee158e1aba Merge branch 'feature/mark-media-as-sensitive' into fork sk 2022-11-07 21:04:44 +01:00
• 40d478aaec tweak styles sk 2022-11-07 21:04:28 +01:00
• e7fb96b3ff Merge branch 'feature/mark-media-as-sensitive' into fork sk 2022-11-07 20:47:15 +01:00
• ef75427b45 fix option not being there when editing sk 2022-11-07 20:46:49 +01:00
• 2ff4f00774 Merge branch 'feature/mark-media-as-sensitive' into fork sk 2022-11-07 20:17:39 +01:00
• 534fd8c119 implement "mark media as sensitive" button fixes #21 sk 2022-11-07 20:15:16 +01:00
• 2d2cd89454 Merge branch 'spoiler-height-independent' into fork sk 2022-11-07 17:32:55 +01:00
• 9f3f5ca7c1 make spoiler height independent of content fixes #12, fixes mastodon/mastodon-android#166 sk 2022-11-07 17:32:37 +01:00
• c0e6f17c83 Merge pull request #28 from br4yd/patch-1 Samuel Kaiser 2022-11-07 16:57:21 +01:00
• 677f1cb42d Merge remote-tracking branch 'origin/upstream' into fork sk 2022-11-07 16:56:27 +01:00
• 1ac6a04a46 Merge pull request #309 from julroy67/perapp-language Gregory K 2022-11-07 06:49:58 +03:00
• 21927d2e25 Add missing line in Android Manifest Julien Humbert 2022-11-07 12:32:20 +09:00
• c35441f5f7 Add per-app language preferences Julien Humbert 2022-11-07 12:27:26 +09:00
• 3718fe6601 Add German translation for the federated timeline br4yd 2022-11-06 22:21:53 +01:00
• 095f234bd5 bump version v1.1.4+fork.29 sk 2022-11-06 11:16:31 +01:00
• f10c0e06db Merge branch 'fork' of github.com:sk22/mastodon-android-fork into fork sk 2022-11-06 11:13:42 +01:00
• ebbd5d1fa3 Merge branch 'upstream' into fork sk 2022-11-06 11:13:26 +01:00
• c8abf26040 Fix #301 Grishka 2022-11-06 05:43:17 +03:00
• bc733af147 Actually no, this makes more sense Grishka 2022-11-06 05:39:22 +03:00
• 77a2fd2a60 Fix #298 Grishka 2022-11-06 05:36:43 +03:00
• 5cfc5eb08a Update README.md Samuel Kaiser 2022-11-05 11:27:02 +01:00
• b832d2df26 Update README.md Samuel Kaiser 2022-11-04 18:02:33 +01:00
• db34dc40ba Merge branch 'mastodon:master' into fork Samuel Kaiser 2022-11-04 14:32:13 +01:00
• bfa48c2d3e Merge pull request #289 from sk22/fix-editing-cw Gregory K 2022-11-04 07:02:40 +03:00
• b5e229a84d Merge pull request #288 from sk22/fix-editing-visibility Gregory K 2022-11-04 07:02:19 +03:00
• ef207f885b increase update check interval v1.1.4+fork.28 sk 2022-11-04 03:37:32 +01:00
• c4eee28335 Merge branch 'feature/check-for-update-button' into fork sk 2022-11-04 03:34:06 +01:00
• 6fe466779e add toash message sk 2022-11-04 03:33:41 +01:00
• e71db1b883 custom app name in strings sk 2022-11-04 03:11:10 +01:00
• b6efafe99d Merge branch 'feature/check-for-update-button' into fork sk 2022-11-04 03:09:39 +01:00
• 688d466f8e implement manual update check settings item sk 2022-11-04 03:09:19 +01:00
• 3c5797932e add download badge Samuel Kaiser 2022-11-03 17:42:31 +01:00
• 48a5e262ce bump version sk 2022-11-03 17:18:57 +01:00
• 63b0365208 remove reverted default visibility sk 2022-11-03 17:18:42 +01:00
• 972c05d60b Revert "set unlisted as default visibility" sk 2022-11-03 17:13:10 +01:00
• acb5778e0b bump version, again v1.1.4+fork.27 sk 2022-11-03 16:36:31 +01:00
• 7694c50358 Merge branch 'fix-editing-cw' into fork sk 2022-11-03 16:35:31 +01:00
• 7ffa368d10 fix spoiler not being published when editing sk 2022-11-03 16:33:12 +01:00
• 53f8f41d88 remain visibility when editing Y32Gcnte8z 2022-09-15 22:34:59 +08:00
• 93d57d847e fix newly published posts appearing twice see https://github.com/mastodon/mastodon-android/issues/283 sk 2022-11-03 16:14:12 +01:00
• 83a4f5eec2 re-add missing onStatusUpdate event listener sk 2022-11-03 16:11:44 +01:00
• 21a526dda9 Add list timelines view obstsalatschuessel 2022-11-03 08:18:48 +01:00
• 836c2dba8d Merge branch 'mastodon:master' into fork Samuel Kaiser 2022-11-02 22:32:57 +01:00
• 13ae8d2ebe Update README.md Samuel Kaiser 2022-11-02 22:30:16 +01:00
• 98dafb4e49 Merge pull request #280 from sk22/fix-notifications-crash Gregory K 2022-11-03 00:27:07 +03:00
• 85b8bae42e bump version sk 2022-11-02 22:15:26 +01:00
• 64416ef9ee Merge pull request #26 from Y32Gcnte8z/fork v1.1.4+fork.26 Samuel Kaiser 2022-11-02 21:55:20 +01:00
• 6274ab3384 Merge pull request #27 from Y32Gcnte8z/visibility Samuel Kaiser 2022-11-02 21:53:34 +01:00
• 4ea5d94dc6 Merge branch 'fix-notifications-crash' into fork v1.1.4+fork.25 sk 2022-11-02 21:41:30 +01:00
• db4dd436b7 more concise null check sk 2022-11-02 21:36:14 +01:00
• 6906ac6c8f remove unnecessary import sk 2022-11-02 21:34:05 +01:00
• 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 sk 2022-11-02 21:31:44 +01:00
• 349d95b8ee fix syntax error sk 2022-11-02 20:25:42 +01:00
• 8c8eb395de Merge remote-tracking branch 'origin/upstream' into fork sk 2022-11-02 20:22:33 +01:00
• 50c844aa25 It was the wrong icon this whole time Grishka 2022-11-02 11:06:00 +03:00
• 85b232330b Merge branch 'l10n_master' Grishka 2022-11-02 11:02:18 +03:00
• b4c305d094 Add privacy policy step to the signup flow Grishka 2022-11-02 11:01:52 +03:00
• be2ee3a029 Fix #277 Grishka 2022-11-02 09:07:48 +03:00
• 596799bf2f enable github update check v1.1.3+fork.24 sk 2022-11-01 23:27:50 +01:00
• 10a405ef13 change self updater api url v1.1.3+fork.23 sk 2022-11-01 21:38:19 +01:00
• 118c5d4b44 New translations strings.xml (French) Eugen Rochko 2022-11-01 21:31:10 +01:00
• a4cb05080a Merge branch 'upstream' into fork v1.1.3+fork.22 sk 2022-11-01 21:26:44 +01:00
• 699ececc42 New translations strings.xml (French) Eugen Rochko 2022-11-01 20:17:30 +01:00
• 4f8f698911 Merge pull request #275 from davidmhewitt/fix-duplicate-emoji-crash Gregory K 2022-11-01 21:51:24 +03:00
• 30083837a5 New translations full_description.txt (Vietnamese) Eugen Rochko 2022-11-01 18:21:16 +01:00
• ea7aa6c52f New translations strings.xml (Vietnamese) Eugen Rochko 2022-11-01 18:21:15 +01:00
• 244f2ed911 Fix crash on duplicate custom emojis David Hewitt 2022-11-01 14:45:00 +00:00
• 99a71c67e4 New translations full_description.txt (German) Eugen Rochko 2022-11-01 15:23:49 +01:00
• b3c0550a86 New translations strings.xml (German) Eugen Rochko 2022-11-01 15:23:47 +01:00
• 39a0c6d08a New translations strings.xml (Vietnamese) Eugen Rochko 2022-11-01 11:03:52 +01:00
• 0ee494bcfc Merge pull request #273 from davidmhewitt/load-post-visibility-preference Gregory K 2022-11-01 00:30:01 +03:00
• 4233c743e2 New translations strings.xml (Italian) Eugen Rochko 2022-10-31 22:06:56 +01:00
• eea00b0d53 Load post privacy preference David Hewitt 2022-10-31 20:39:22 +00:00
• 7cef4d282c New translations strings.xml (German) Eugen Rochko 2022-10-31 19:11:31 +01:00
• df6e085c97 New translations strings.xml (German) Eugen Rochko 2022-10-31 18:14:37 +01:00
• 70cf48355e New translations strings.xml (German) Eugen Rochko 2022-10-31 10:54:54 +01:00