Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity
1,268 Commits 11 Branches 42 Tags 243 MiB
Commit Graph

1268 Commits

Author SHA1 Message Date
fgerber aa5c86d711 Merge fix_redraft into master 2022-11-19 15:16:34 +01:00
fgerber 4f3020e0be Restructure post creation activity into two fragments 2022-11-19 13:21:54 +01:00
Matthieu 80d8e40be9 Merge branch 'trendingRefactor' into 'master' 
Trending refactor

See merge request pixeldroid/PixelDroid!503
 2022-11-19 00:05:19 +00:00
Matthieu 651832d35e Refactor trending activity 2022-11-19 00:57:03 +01:00
Matthieu 4a2234dc78 Merge branch 'translations' into 'master' 
Translated using Weblate (Polish)

See merge request pixeldroid/PixelDroid!502
 2022-11-14 17:03:48 +00:00
MagT 2fe334d32e Translated using Weblate (Polish) 
Currently translated at 87.3% (208 of 238 strings)

Co-authored-by: MagT <magt@writeme.com>
Translate-URL: https://weblate.pixeldroid.org/projects/pixeldroid/app/pl/
Translation: PixelDroid/pixeldroid
 2022-11-14 17:02:48 +00:00
Matthieu d5f1358397 Merge branch 'fix_profile_theme2' into 'master' 
Fix profile edit theme

Closes #353

See merge request pixeldroid/PixelDroid!501
 2022-11-08 22:11:27 +00:00
Matthieu a1ea61a7bd Fix profile edit theme 2022-11-08 22:10:49 +00:00
fgerber ba26871572 Make redraft code more functional, adapt gradle and remove deprecated onBackPressed() 2022-11-04 16:18:01 +01:00
fgerber c879486153 Rebase and update dependencies 2022-11-04 10:16:25 +01:00
fgerber d60bce4b72 Merge branch 'fix_redraft' of gitlab.shinice.net:pixeldroid/PixelDroid into fix_redraft 2022-11-04 00:11:38 +01:00
fgerber 553c65f7bc Refactor redraft as functional code 2022-11-03 23:10:02 +00:00
fgerber 8325067566 Remove useless import 2022-11-03 23:10:02 +00:00
fgerber 2e558017f2 Account for NSFW status in redraft 2022-11-03 23:10:02 +00:00
fgerber 79c2f2a391 Move post deletion to ensure download is complete before 2022-11-03 23:10:02 +00:00
fgerber 20d38d3fa8 Pass existing description through to post submission activity 2022-11-03 23:10:02 +00:00
fgerber 1c8a7d8b7d Refactor redraft as functional code 2022-11-03 23:12:54 +01:00
Matthieu 8237cd03fd Merge branch 'fix_fdroid' into 'master' 
Fix F-Droid build

See merge request pixeldroid/PixelDroid!499
 2022-11-03 18:05:33 +00:00
Matthieu e6c1ef766d Fix proguard rules 2022-11-03 18:56:46 +01:00
Matthieu d78ef56489 Update permissions 2022-11-03 17:25:28 +01:00
Matthieu c6d43797cc Update dependencies 2022-11-03 15:03:50 +01:00
Matthieu 1481cdc909 Ignore proguard errors 2022-11-03 14:29:36 +01:00
Matthieu c518baa33d Remove extra translations 2022-11-03 14:28:36 +01:00
fgerber c726bbb448 Remove useless import 2022-11-03 13:52:41 +01:00
fgerber e5ff66a83e Account for NSFW status in redraft 2022-11-03 13:22:18 +01:00
fgerber 8ed13cdf2e Move post deletion to ensure download is complete before 2022-11-02 21:52:25 +01:00
fgerber e40a774b1f Pass existing description through to post submission activity 2022-11-02 17:38:55 +01:00
Matthieu 6572f0018a Merge branch 'load_spinner_quest' into 'master' 
Make load spinner exist again

Closes #336

See merge request pixeldroid/PixelDroid!497
 2022-10-31 00:38:06 +00:00
Matthieu 147046b7b4 Make load spinner exist again 2022-10-31 01:37:44 +01:00
Matthieu 1fa4b80fe7 Merge branch 'profile_description_clicks' into 'master' 
Fix profile description clicks

Closes #318

See merge request pixeldroid/PixelDroid!496
 2022-10-30 23:59:06 +00:00
Matthieu c21e277485 Fix hashtags and @ in profile description 2022-10-31 00:54:43 +01:00
Matthieu d2c9c1fd47 Merge branch 'multiline_comments' into 'master' 
Enable multiline comments

Closes #254

See merge request pixeldroid/PixelDroid!495
 2022-10-30 23:27:32 +00:00
Matthieu 35a609613b Enable multiline comments 2022-10-31 00:27:10 +01:00
Matthieu e2ee562841 Merge branch 'carousel_indicator_fix' into 'master' 
Carousel indicator fix

See merge request pixeldroid/PixelDroid!494
 2022-10-30 23:18:12 +00:00
Matthieu 214ba98bc4 Make carousel indicator count correctly 2022-10-31 00:17:58 +01:00
Matthieu b36fadd76c Merge branch 'post-creation' into 'master' 
Refactor of post submission activity

See merge request pixeldroid/PixelDroid!493
 2022-10-30 22:40:57 +00:00
Matthieu 5644a22d38 Refactor working 2022-10-30 23:37:14 +01:00
Marie 851d95bf0f Start post submission activity 2022-10-30 20:55:41 +01:00
Matthieu 2d712ed395 Merge branch 'profileEdit' into 'master' 
Edit profile in-app

See merge request pixeldroid/PixelDroid!434
 2022-10-30 19:52:34 +00:00
Matthieu 2497504530 Basic profile editing 2022-10-30 20:51:09 +01:00
Matthieu e35cb17879 start on profile editing functionality 2022-10-30 13:03:36 +01:00
Matthieu 5b3870b80d Merge branch 'collections' into 'master' 
Implement collections

See merge request pixeldroid/PixelDroid!492
 2022-10-30 11:46:55 +00:00
Matthieu 085a1f548c Implement collections 2022-10-30 12:34:52 +01:00
Matthieu 2ca9a9b896 Merge branch 'on-boarding' into 'master' 
On-boarding

See merge request pixeldroid/PixelDroid!489
 2022-10-29 18:01:19 +00:00
Matthieu 06ceb12f23 Finish onboarding document 2022-10-29 19:41:16 +02:00
Marie 849ce3a565 WIP on-boarding 2022-10-29 17:13:06 +00:00
Matthieu 442e07da59 Merge branch 'discover' into 'master' 
Search/Discover tab

See merge request pixeldroid/PixelDroid!490
 2022-10-29 17:07:59 +00:00
Marie Jaillot cb9180fb60 Search/Discover tab 2022-10-29 17:07:59 +00:00
Matthieu 269276f23d Merge branch 'librarisation' into 'master' 
Make library out of editing

See merge request pixeldroid/PixelDroid!491
 2022-10-29 17:01:07 +00:00
Matthieu 888b6aecc3 Update editing library dependency 2022-10-29 19:00:37 +02:00