Commit Graph

301 Commits

Author SHA1 Message Date
Grishka 90645f4d90 Adding stuff from upstream 2022-12-16 10:30:42 -03:00
sk 9a47530ab8 Merge remote-tracking branch 'upstream/master' 2022-12-16 02:52:55 +01:00
Grishka e0febda372 Minor fixes 2022-12-15 20:16:32 +03:00
Grishka 166401ea18 Signup flow redesign 2022-12-15 19:41:38 +03:00
LucasGGamerM 024d358213 Bump version number 2022-12-13 15:56:38 -03:00
LucasGGamerM db9e427444 Bump version number 2022-12-12 21:45:48 -03:00
sk c9f4df3d4e bump version, update changelog 2022-12-12 23:35:54 +01:00
LucasGGamerM 1eeab25b7d Bumping version number 2022-12-10 17:30:11 -03:00
LucasGGamerM 028b88aa24 Bumping version code 2022-12-10 13:02:28 -03:00
LucasGGamerM acdccaf80a Bumping version code 2022-12-10 10:01:57 -03:00
LucasGGamerM 6926432a6c Bumping version number 2022-12-09 20:10:06 -03:00
LucasGGamerM 2ccbffa165 Merge branch 'main' into fork
# Conflicts:
#	README.md
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
#	mastodon/src/main/res/drawable/logo.xml
#	mastodon/src/main/res/layout/item_settings_color_picker.xml
#	mastodon/src/main/res/menu/color_picker.xml
#	mastodon/src/main/res/values-night/styles.xml
#	mastodon/src/main/res/values-v27/colors.xml
#	mastodon/src/main/res/values/colors.xml
#	mastodon/src/main/res/values/strings.xml
#	mastodon/src/main/res/values/styles.xml
2022-12-09 19:08:35 -03:00
sk e5fab4a555 update changelog, bump version 2022-12-09 21:25:24 +01:00
LucasGGamerM 3a24ff0d15 Bumping version code 2022-12-09 13:44:46 -03:00
sk 8714b24388 bump version 2022-12-09 03:15:01 +01:00
LucasGGamerM f7e3423f9c Bumping version number 2022-12-08 15:16:22 -03:00
sk 05c33be3f4 update readme, bump version 2022-12-07 19:01:58 +01:00
LucasGGamerM 18af6f5a12 Bumping version code 2022-12-07 14:24:52 -03:00
LucasGGamerM e15dd6024f Bumped version number 2022-12-07 13:28:07 -03:00
LucasGGamerM 5b85bb427d bumping version code 2022-12-07 09:50:03 -03:00
LucasGGamerM 3c34b6a7d2 Upping the version code once more, and fixing the self updater 2022-12-06 22:06:49 -03:00
LucasGGamerM de4964c2cd Upping the version code and changing notification icon. This should be the first release 2022-12-06 21:58:35 -03:00
LucasGGamerM fbcaa05c03 Changing the name of the archivesBaseName 2022-12-06 21:49:46 -03:00
LucasGGamerM f384d44f8f Changing my app id 2022-12-06 13:03:26 -03:00
LucasGGamerM 4ab6ed55f5 Changing my version number and string 2022-12-06 12:41:03 -03:00
Grishka 012cca550e New login screen 2022-12-04 01:34:03 +03:00
sk f0b9006c55 bump version 2022-12-01 16:17:51 +01:00
sk 5f3645f716 bump version 2022-11-29 19:25:18 +01:00
sk c2baf4e05f Revert "Revert "add release without federated timeline""
This reverts commit 851bf94c90.
2022-11-29 18:29:13 +01:00
sk 9e7923bc50 bump version 2022-11-29 00:25:18 +01:00
sk 851bf94c90 Revert "add release without federated timeline"
This reverts commit 5cce8ca72c.
2022-11-29 00:24:36 +01:00
sk ae80b7d098 minify play release 2022-11-28 20:59:13 +01:00
sk 3101f1ad17 bump version 2022-11-28 18:30:49 +01:00
sk 5cce8ca72c add release without federated timeline 2022-11-28 17:50:26 +01:00
surendrajat efa9f524f9 Get rid of Microsoft appcenter related stuff 2022-11-26 13:37:03 +05:30
sk bf8ac4bc69 set archive name 2022-11-25 23:37:12 +01:00
sk 7489c6ffbe bump version 2022-11-25 21:02:44 +01:00
sk 5415ab934f bump version 2022-11-24 20:45:18 +01:00
sk fa754bc03a add app id suffix for debug builds 2022-11-24 20:36:26 +01:00
sk 781332a7a9 Merge remote-tracking branch 'upstream/master' into fork 2022-11-23 22:01:37 +01:00
sk adf628de44 bump version 2022-11-21 23:14:58 +01:00
sk fbf4522260 remove "debuggable" from release config
fixes #72
2022-11-21 14:11:46 +01:00
sk 40868f90f9 bump version 2022-11-20 18:07:21 +01:00
sk 8256fbadb6 make release debuggable 2022-11-20 16:09:42 +01:00
sk 3b7a6e9385 bump version 2022-11-20 01:37:02 +01:00
sk 393c538464 bump version 2022-11-19 22:54:21 +01:00
sk 289564381d bump version 2022-11-19 20:41:27 +01:00
sk 4b9618cad5 bump version 2022-11-19 20:18:50 +01:00
sk eccda2ed61 bump version 2022-11-17 21:25:35 +01:00
sk 0c5cd2dc9e bump version 2022-11-17 01:05:27 +01:00
sk aab4284624 Merge branch 'main' into fork 2022-11-16 21:58:16 +01:00
Grishka 79d99a9484 Probably fix #297 2022-11-15 14:11:56 +04:00
sk 94d2406fa4 bump version 2022-11-12 20:32:30 +01:00
sk d78e3a738d bump version 2022-11-12 03:06:40 +01:00
sk c22a139a5d bump version 2022-11-11 21:09:31 +01:00
sk 53cb809996 bump version, update readme 2022-11-11 13:26:48 +01:00
sk 764ab60fea bump version 2022-11-11 03:15:52 +01:00
sk a1474fb461 bump version 2022-11-09 23:29:30 +01:00
sk 9692afb323 bump version 2022-11-09 18:38:58 +01:00
sk e6a67543f4 Bump version, update README 2022-11-09 15:54:33 +01:00
sk 6b226cdcad bump version 2022-11-08 00:21:33 +01:00
sk 58abdad62a bump version 2022-11-07 21:18:41 +01:00
sk 677f1cb42d Merge remote-tracking branch 'origin/upstream' into fork 2022-11-07 16:56:27 +01:00
Julien Humbert c35441f5f7 Add per-app language preferences 2022-11-07 12:27:26 +09:00
sk 095f234bd5 bump version 2022-11-06 11:16:31 +01:00
sk 48a5e262ce bump version 2022-11-03 17:18:57 +01:00
sk acb5778e0b bump version, again 2022-11-03 16:36:31 +01:00
sk 85b8bae42e bump version 2022-11-02 22:15:26 +01:00
sk 8c8eb395de Merge remote-tracking branch 'origin/upstream' into fork 2022-11-02 20:22:33 +01:00
Grishka b4c305d094 Add privacy policy step to the signup flow 2022-11-02 11:01:52 +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
sk a4cb05080a Merge branch 'upstream' into fork 2022-11-01 21:26:44 +01:00
Grishka e381de812c Add self-updater for github builds 2022-10-31 09:26:17 +03:00
Grishka 212e8893b9 Fix editing 2022-10-26 03:01:39 +03:00
Grishka 01970ab69b Compose media attachment redesign 2022-10-04 07:35:31 +03:00
Grishka 18633291e6 Add monochrome icon 2022-09-29 01:23:00 +03:00
sk 8aeda56fc8 merge upstream changes 2022-09-08 14:56:43 +02:00
Grishka f531a90b41 Better editing 2022-09-02 11:21:28 +03:00
sk 750fa4c112 Merge branch 'master' into fork 2022-07-22 11:30:17 +02:00
Grishka 8b40643e63 Update more colors 2022-07-15 00:45:17 +03:00
Grishka 74f03026cf Everything is purple now 2022-07-02 02:03:07 +03:00
sk c1e67c4f73 bump version 2022-06-08 21:44:39 +02:00
sk 705e98729d initial pink branding 2022-05-31 16:51:05 +02:00
sk 108d16a157 bump version 2022-05-26 22:44:31 +02:00
sk d280dc31e8 bump version 2022-05-26 19:35:36 +02:00
sk d33654c793 bump version 2022-05-22 02:08:01 +02:00
sk f21b647ee0 bump version 2022-05-21 23:35:10 +02:00
sk 99405f307d bump version 2022-05-21 18:49:59 +02:00
sk 1c16cfb09e bump version 2022-05-21 18:05:01 +02:00
sk b08415ca8f bump version 2022-05-15 20:35:10 +02:00
sk 31e3a8592f bump version 2022-05-14 13:49:49 +02:00
sk bde2e398a8 bump version and change app name 2022-05-06 22:10:45 +02:00
sk fad3ba3eae bump version 2022-05-06 19:49:36 +02:00
sk 7996e4ee4a change client name, versioning 2022-05-06 15:39:57 +02:00
sk 13c2adba56 update version and readme 2022-05-06 00:34:08 +02:00
sk 010095a50e Merge branch 'master' into fork 2022-05-06 00:30:23 +02:00
sk 8ed731a48b edit application id for fork 2022-05-06 00:27:59 +02:00
sk 8660d43cb1 bump version 2022-05-06 00:21:08 +02:00
Grishka 88504531d4 Crash fixes 2022-05-05 22:05:18 +03:00
sk 919d5cffb5 Merge branch 'master' into fork 2022-05-05 16:06:28 +02:00
Grishka 23ec3e64cf Add favorites/reblogs lists and extended footer for ThreadFragment
closes #41, closes #64
2022-05-04 01:04:59 +03:00
Grishka d4e4d9fcde Use random IDs to match FCM notifications to accounts 2022-05-03 03:01:18 +03:00
sk 12599db0ff change dev versioning 2022-05-02 23:00:55 +02:00
sk c751c85c1c add version number for upstream changes 2022-05-02 22:43:05 +02:00
sk f1331a0f6d start fork versioning 2022-05-02 21:35:51 +02:00
Grishka 02a1f2ef8c Add following/followers lists
closes #25
2022-05-02 05:45:51 +03:00
Grishka 8059120136 Better account switcher 2022-05-01 00:44:28 +03:00
Grishka 10a5bf0a82 Fix notification policy layout for long strings 2022-04-29 17:38:48 +03:00
Grishka 93fbc52f6a More crash fixes 2022-04-29 03:37:18 +03:00
Grishka 9a0c383da8 Change community -> server 2022-04-28 00:54:35 +03:00
Grishka 8e65459cb5 bump version 2022-04-26 00:58:33 +03:00
Grishka 61d537779b Local timeline 2022-04-24 13:51:03 +03:00
Grishka ed8128fb72 Bump version 2022-04-21 17:32:15 +03:00
Grishka 07fe859e35 Fix compose autocomplete for emojis 2022-04-20 18:37:04 +03:00
Grishka ad825d6803 Fix #43 2022-04-20 15:43:25 +03:00
Grishka c6ff84ce10 Update gradle plugin, remove build tools version, set source to 17 2022-04-18 12:14:55 +03:00
Grishka 25a3135de8 Fixes 2022-04-15 03:53:30 +03:00
Grishka bfbcb92ea5 Add readme and license and bump version 2022-04-13 19:38:41 +03:00
Grishka 3d7f2c154a Store screenshot generator as UI test 2022-04-13 04:39:14 +03:00
Grishka 0f61cb12d4 Fix crash 2022-04-13 01:21:17 +03:00
Grishka 12ac5e9425 Apply filters to statuses 2022-04-12 23:58:29 +03:00
Grishka 6e6f73f2c0 More crash fixes 2022-04-12 03:54:51 +03:00
Grishka 9b2f50d726 Fix crashes 2022-04-10 19:55:25 +03:00
Grishka d063eb32d2 More fixes 2022-04-08 01:49:08 +03:00
Grishka f73669124f Settings and other things 2022-04-06 03:11:15 +03:00
Grishka a0cbf0fa31 Push notifications 2022-04-03 23:54:31 +03:00
Grishka 10655e4c98 Fixes 2022-03-31 20:54:49 +03:00
Grishka fa9112e117 Enable minification for release builds 2022-03-29 10:38:38 +03:00
Grishka e087cf03cc Image resizing 2022-03-24 12:39:28 +03:00
Grishka d47eb752a5 Fix media layout for inset posts 2022-03-22 13:34:06 +03:00
Grishka 7186b6387f Compose: auto-complete mentions, hashtags, and emojis 2022-03-17 06:28:36 +03:00
Grishka 8c5d6cd4a6 Compose things 2022-03-15 21:40:52 +03:00
Grishka 938a6b6c78 Minor fixes 2022-03-12 22:02:51 +03:00
Grishka 160b32f0e8 I'm so stupid 2022-03-12 00:28:40 +03:00
Grishka 8ba3fecca3 fix 2022-03-11 20:25:14 +03:00
Grishka 04405b028c Local database 2022-03-11 20:13:11 +03:00
Grishka 03c0b183cb Onboarding & signup 2022-03-10 18:48:24 +03:00
Grishka 86892e4103 Reporting 2022-03-07 14:01:40 +03:00
Grishka 37bef85f6a Notifications 2022-03-05 12:59:27 +03:00
Grishka b437f6f3a3 Hashtag timeline 2022-03-02 22:39:59 +03:00
Grishka 4e59930d15 Audio player 2022-02-22 14:01:48 +03:00
Grishka f4e71cf130 Fix AppCenter SDK 2022-02-19 03:04:04 +03:00
Grishka bb463aa10a Post actions 2022-02-18 01:50:00 +03:00
Grishka 006fde1686 Add AppCenter SDK 2022-02-15 23:09:39 +03:00
Grishka aa193b8921 Profiles 2022-02-07 15:07:12 +03:00
Grishka c3b7fb7002 Photo viewer! 2022-01-22 22:34:05 +03:00
Grishka dc836b58f8 Account timelines 2022-01-18 22:49:14 +03:00
Grishka b3a99e0764 Tooting of text toots 2022-01-17 21:50:48 +03:00
Grishka dfbc1fd2e2 Basic status rendering 2022-01-17 13:27:34 +03:00
Grishka 42d5f52ff5 Initial 2022-01-14 15:02:10 +03:00