Pixelfed/PixelDroid-App-Android
1
0
Fork 0
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid synced 2025-01-03 10:40:04 +01:00
Code Issues Releases Wiki Activity
513 Commits 11 Branches 48 Tags 236 MiB
3029691b18
Commit Graph

513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthieu
3029691b18 add .gitattributes 2021-03-27 15:55:53 +01:00
Matthieu
d8a6aaa4b7 Merge branch 'follow_requests' into 'master' 
Private accounts and follow requests

Closes #279

See merge request pixeldroid/PixelDroid!321
 2021-03-27 14:41:08 +00:00
Matthieu
49630b2ad5 move string 2021-03-27 15:27:26 +01:00
Matthieu
9f9d0e23bc make json fields nullable, correct request logic 2021-03-27 15:24:58 +01:00
Matthieu
8dacdc1970 Merge branch 'master' into follow_requests 2021-03-27 13:26:15 +01:00
Matthieu
173b8e8e01 allow follow requests 2021-03-26 19:54:04 +01:00
Marie Jaillot
2816c232c0 Merge branch 'profile_feed' into 'master' 
Infinite profile feed

Closes #166

See merge request pixeldroid/PixelDroid!307
 2021-03-26 18:09:56 +00:00
mjaillot
dce7c45e21 Added some strings 2021-03-26 17:51:42 +01:00
mjaillot
3972ffd093 Merge branch 'master' into profile_feed 2021-03-26 14:13:56 +01:00
Matthieu
34446fc9de Merge branch 'fix_double_tap_like' into 'master' 
Fix double tap like

See merge request pixeldroid/PixelDroid!319
 2021-03-26 11:25:04 +00:00
Matthieu
3e219fa321 fix ci 2021-03-26 11:56:30 +01:00
mjaillot
a992fac150 Merge branch 'master' into profile_feed 2021-03-26 10:43:28 +01:00
Matthieu
d43f296495 Merge branch 'master' into fix_double_tap_like 2021-03-26 10:43:26 +01:00
mjaillot
5da2750b1c Finished refactor 2021-03-26 10:42:51 +01:00
Matthieu
2be2617d24 Merge branch 'translations' into 'master' 
Translated using Weblate (Basque)

See merge request pixeldroid/PixelDroid!320
 2021-03-26 09:42:42 +00:00
Matthieu
191aa3ff57 Fix double tap like 2021-03-26 10:26:00 +01:00
Xose M
ea449ceab2 Translated using Weblate (Galician) 
Currently translated at 100.0% (150 of 150 strings)

Translation: PixelDroid/pixeldroid
Translate-URL: https://weblate.pixeldroid.org/projects/pixeldroid/pixeldroid/gl/
 2021-03-25 12:11:25 +00:00
Mostafa Ahangarha
4db8f39830 Translated using Weblate (Persian) 
Currently translated at 100.0% (150 of 150 strings)

Translation: PixelDroid/pixeldroid
Translate-URL: https://weblate.pixeldroid.org/projects/pixeldroid/pixeldroid/fa/
 2021-03-23 20:11:25 +00:00
Asier Iturralde Sarasola
ccc2173c2a Translated using Weblate (Basque) 
Currently translated at 100.0% (150 of 150 strings)

Translation: PixelDroid/pixeldroid
Translate-URL: https://weblate.pixeldroid.org/projects/pixeldroid/pixeldroid/eu/
 2021-03-21 21:11:24 +00:00
Matthieu
be7d35e4f7 Merge branch 'translations' into 'master' 
Translations

See merge request pixeldroid/PixelDroid!318
 2021-03-21 13:12:42 +00:00
Weblate Admin
60f0df8ae1 Translated using Weblate (Italian) 
Currently translated at 98.0% (147 of 150 strings)

Translation: PixelDroid/pixeldroid
Translate-URL: https://weblate.pixeldroid.org/projects/pixeldroid/pixeldroid/it/
 2021-03-21 13:01:41 +00:00
Weblate Admin
981aa34a80 Translated using Weblate (Persian) 
Currently translated at 98.6% (148 of 150 strings)

Translation: PixelDroid/pixeldroid
Translate-URL: https://weblate.pixeldroid.org/projects/pixeldroid/pixeldroid/fa/
 2021-03-21 12:55:06 +00:00
Weblate Admin
423d7dda90 Translated using Weblate (Galician) 
Currently translated at 98.6% (148 of 150 strings)

Translation: PixelDroid/pixeldroid
Translate-URL: https://weblate.pixeldroid.org/projects/pixeldroid/pixeldroid/gl/
 2021-03-21 12:55:06 +00:00
Weblate Admin
96f2a3e78a Translated using Weblate (Swedish) 
Currently translated at 58.0% (87 of 150 strings)

Translation: PixelDroid/pixeldroid
Translate-URL: https://weblate.pixeldroid.org/projects/pixeldroid/pixeldroid/sv/
 2021-03-21 12:55:06 +00:00
Weblate Admin
2a0eaadaef Translated using Weblate (French) 
Currently translated at 98.6% (148 of 150 strings)

Translation: PixelDroid/pixeldroid
Translate-URL: https://weblate.pixeldroid.org/projects/pixeldroid/pixeldroid/fr/
 2021-03-21 12:55:06 +00:00
Matthieu
bfb5d93f01 Merge branch 'edit_fixes' into 'master' 
Fix upload of edited images

See merge request pixeldroid/PixelDroid!317
 2021-03-21 12:46:29 +00:00
Matthieu
8c9b8d540f update dependencies 2021-03-21 13:40:30 +01:00
Matthieu
f270c5a718 add dependency 2021-03-21 13:35:58 +01:00
Matthieu
9d602efbb3 Fix upload of edited images, and replace deprecated onactivityresult with resultcontracts 2021-03-21 13:04:09 +01:00
mjaillot
4096af2872 Profile fixes 2021-03-20 12:43:13 +01:00
mjaillot
c2dd66c54f Refactor initAdapter 2021-03-19 17:28:13 +01:00
Matthieu
6b6c006bd7 Merge branch 'tracedroid_fix' into 'master' 
Fix tracedroid, accept json as responses from api

See merge request pixeldroid/PixelDroid!315
 2021-03-19 14:08:02 +00:00
Matthieu
758726b18a Merge branch 'fastlane_changes' into 'master' 
Fastlane changes

See merge request pixeldroid/PixelDroid!316
 2021-03-19 13:53:56 +00:00
Matthieu
0afa6bb8c9 Update screenshot 2021-03-19 14:42:13 +01:00
Matthieu
2cb2ecdb72 Fix tracedroid, accept json as responses from api 2021-03-19 10:34:43 +01:00
Matthieu
af770c546e New screenshots 2021-03-17 17:27:07 +01:00
Matthieu
d6fb67357c Merge branch 'tracedroid_jcenter' into 'master' 
Update TraceDroid to jitpack

See merge request pixeldroid/PixelDroid!314
 2021-03-17 14:28:14 +00:00
Matthieu
0085f7e5a4 Add trove4j to allprojects repos 2021-03-17 15:07:21 +01:00
Matthieu
2c50c599e4 Add licenses of new or changed dependencies 2021-03-16 00:59:23 +01:00
Matthieu
eba80f6f13 Add licenses of new or changed dependencies 2021-03-16 00:54:06 +01:00
Matthieu
bd68012026 Make jcenter exceptions explicit 2021-03-16 00:48:08 +01:00
Matthieu
2632e045ab Update TraceDroid to jitpack 2021-03-16 00:23:10 +01:00
Matthieu
3f90f16fef Merge branch 'bug_fixes' into 'master' 
Fix some bugs

Closes #282 and #281

See merge request pixeldroid/PixelDroid!313
 2021-03-15 19:27:11 +00:00
Matthieu
0fdcdf3c21 Update instance if it already exists (to enable multiple accounts of same instance) 2021-03-15 19:54:42 +01:00
Matthieu
960eb0cdc1 Enable choosing english language explicitly 2021-03-15 19:21:15 +01:00
Matthieu
29906a355b Fix discover icon not showing 2021-03-15 19:01:43 +01:00
Matthieu
d13b34ed0d Update for paging dependency update 2021-03-14 23:03:36 +01:00
Matthieu
10bf68978d Merge branch 'master' into profile_feed 2021-03-14 22:54:39 +01:00
Matthieu
ad39fdb9f6 Merge branch 'update_dependencies' into 'master' 
Update dependencies

See merge request pixeldroid/PixelDroid!312
 2021-03-14 21:44:47 +00:00
Matthieu
ffecf6e805 what 2021-03-14 22:34:06 +01:00