tom79
|
7b92d0feff
|
Merge branch 'develop' into improves_conversations
# Conflicts:
# app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
# app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java
# app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java
|
2017-10-21 14:41:12 +02:00 |
|
tom79
|
3874c3495a
|
Fixes issues
|
2017-10-21 14:35:36 +02:00 |
|
tom79
|
7d08b745e5
|
improves showconversation
|
2017-10-21 14:02:39 +02:00 |
|
tom79
|
e7da61bdd3
|
Fixes issue
|
2017-10-21 12:34:59 +02:00 |
|
tom79
|
bb6dca8d73
|
Merge branch 'support_custom_emojis' into develop
|
2017-10-21 12:33:03 +02:00 |
|
tom79
|
90d7e6e3a6
|
Display more replies in context
|
2017-10-21 12:32:27 +02:00 |
|
tom79
|
2c3a925cc9
|
Improves emojis support
|
2017-10-21 08:43:57 +02:00 |
|
tom79
|
c32b394160
|
Improves emojis support
|
2017-10-21 08:07:04 +02:00 |
|
tom79
|
f36ddba6f9
|
Emojis support
|
2017-10-20 19:58:46 +02:00 |
|
tom79
|
a22d61c63d
|
Manages eomjis in helper
|
2017-10-20 07:11:44 +02:00 |
|
tom79
|
6cdfcd49c1
|
updates API
|
2017-10-20 06:57:53 +02:00 |
|
tom79
|
abd399a2da
|
updates classes
|
2017-10-20 06:54:21 +02:00 |
|
tom79
|
25fde58655
|
Improves cross actions
|
2017-10-18 18:58:02 +02:00 |
|
tom79
|
01fc898c04
|
Changes the url for media which are unknown
|
2017-10-18 17:12:40 +02:00 |
|
tom79
|
098da433bd
|
Detects unknown media
|
2017-10-18 17:07:50 +02:00 |
|
tom79
|
8bd6da0d6e
|
Merge branch 'upgrade_android_job' into bug_fix
|
2017-10-18 17:06:04 +02:00 |
|
tom79
|
30cbb89f23
|
manages unknown type of media
|
2017-10-18 16:59:47 +02:00 |
|
tom79
|
2cdb21c33d
|
Adds control on battery
|
2017-10-18 14:50:52 +02:00 |
|
tom79
|
f8696b129b
|
Upgrades lib & some codes
|
2017-10-18 14:46:54 +02:00 |
|
tom79
|
1ad15d5e02
|
Merge branch 'bug_fix' into develop
|
2017-10-18 14:32:49 +02:00 |
|
tom79
|
8c7ec2b0f3
|
Fixes null pointer exceptions
|
2017-10-18 14:31:29 +02:00 |
|
tom79
|
d4842eda35
|
Fixes index of bound
|
2017-10-18 14:25:51 +02:00 |
|
tom79
|
ab2fe48b8c
|
Fixes Issue #28
|
2017-10-18 09:42:20 +02:00 |
|
tom79
|
4dabcd1720
|
Merge branch 'bug_fix' into develop
|
2017-10-18 09:21:45 +02:00 |
|
tom79
|
4dad2bc4fb
|
Avoids a bad cast
|
2017-10-18 09:15:19 +02:00 |
|
tom79
|
dfb84622bd
|
Avoids deleted toots to be dealt
|
2017-10-18 09:10:07 +02:00 |
|
tom79
|
5c739d499a
|
Moves my account to mastodon.social
|
2017-10-17 19:20:56 +02:00 |
PhotonQyv
|
1a9abb9965
|
Merged in PhotonQyv/mastodon_etalab/DutchTranslationFix (pull request #144)
Corrected Dutch translation.
|
2017-10-17 16:57:19 +00:00 |
|
tom79
|
37cbb10a59
|
Merge branch 'bug_fix' into develop
|
2017-10-17 18:52:24 +02:00 |
|
tom79
|
652551fa87
|
Remove ugly button
|
2017-10-17 18:52:05 +02:00 |
|
tom79
|
faf995f0c9
|
Use String instead of Integer
|
2017-10-17 18:44:24 +02:00 |
|
PhotonQyv
|
1744d9613a
|
Corrected Dutch translation, removed a couple of string arrays that are no longer in base strings.xml.
|
2017-10-17 17:39:21 +01:00 |
|
tom79
|
b5a142b46a
|
possible null pointer ...
|
2017-10-17 18:35:10 +02:00 |
|
tom79
|
06afafc934
|
Merge branch 'bug_fixes_61' into develop
|
2017-10-17 18:28:36 +02:00 |
|
tom79
|
65ff99ef47
|
Bug fixes
|
2017-10-17 18:28:09 +02:00 |
friedger
|
65f01cb720
|
Merged in friedger/mastodon_etalab/develop (pull request #143)
Reduce duplicate code
|
2017-10-17 16:03:16 +00:00 |
jeroenpraat
|
6f1f4fd85e
|
Merged in jeroenpraat/mastodon_etalab/master (pull request #141)
Dutch translation
|
2017-10-17 16:01:58 +00:00 |
Friedger
|
a9a0c9388a
|
use base classes for login and main activity, fixes #27
|
2017-10-17 13:13:35 +02:00 |
|
jeroenpraat
|
d200ae8259
|
Fixed issues
|
2017-10-16 21:39:25 +00:00 |
|
jeroenpraat
|
3dee8ad9c0
|
Dutch translation (text about privacy untranslated, is not needed I think. Maybe later.)
|
2017-10-16 20:36:39 +00:00 |
|
PhotonQyv
|
2157ab20f1
|
Tweaked drawer_account_search_dev layout slightly to centre the account_pp ImageView. It was bugging me.
|
2017-10-16 12:54:09 +01:00 |
|
tom79
|
f7d3aa6263
|
Avoid issue with icon color
|
2017-10-15 18:44:08 +02:00 |
|
tom79
|
8ce0796e07
|
Avoid issue with icon color
|
2017-10-15 18:27:52 +02:00 |
|
tom79
|
d5c4175970
|
Search accounts: adds more info
|
2017-10-15 18:20:51 +02:00 |
|
tom79
|
febedc9b1f
|
Fixes an issue when removing chars during a search
|
2017-10-15 18:16:10 +02:00 |
|
tom79
|
bd5f2c9fa7
|
Prepares release 1.5.2
|
2017-10-15 16:48:54 +02:00 |
|
tom79
|
322edbf7fe
|
Fixes some actionbar text color
|
2017-10-15 16:24:18 +02:00 |
|
tom79
|
77c4e47a35
|
color changes
|
2017-10-15 16:20:37 +02:00 |
|
tom79
|
b1370143a7
|
Some improvements with show account activity
|
2017-10-15 15:40:19 +02:00 |
|
tom79
|
2cba689990
|
Some improvements with show account activity
|
2017-10-15 15:39:43 +02:00 |
|
tom79
|
f43a7ac0ac
|
For tablets and with some improvements
|
2017-10-15 15:09:09 +02:00 |
|
tom79
|
07054739e1
|
Changes some buttons
|
2017-10-15 12:05:26 +02:00 |
|
tom79
|
2245ed2d16
|
Replaces the boost icon
|
2017-10-15 12:00:00 +02:00 |
|
tom79
|
39c5a2b9e2
|
Removes some useless due to bad layout
|
2017-10-15 11:57:03 +02:00 |
|
tom79
|
5d54bb3667
|
Small fix for color
|
2017-10-15 11:41:05 +02:00 |
|
tom79
|
393d817f9d
|
Changes some colors
|
2017-10-15 11:37:36 +02:00 |
|
tom79
|
ac334ba3a4
|
Some icon changes
|
2017-10-15 11:35:36 +02:00 |
|
tom79
|
dc6fba7214
|
Some other color improvements
|
2017-10-15 11:16:43 +02:00 |
|
tom79
|
8397d3fae3
|
Change position of some elements in toots
|
2017-10-15 10:47:41 +02:00 |
|
tom79
|
4cabc66d7b
|
Changes some colors
|
2017-10-15 10:24:38 +02:00 |
|
tom79
|
7bf58eead8
|
Merge branch 'changes_font' into develop
# Conflicts:
# app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
|
2017-10-15 09:34:48 +02:00 |
|
tom79
|
80377b9112
|
Changes police
|
2017-10-15 09:29:59 +02:00 |
|
tom79
|
c68b7cf1cb
|
Applies changes to tabs
|
2017-10-15 09:24:22 +02:00 |
|
tom79
|
f868f2a425
|
Adds filter by long click on the tab
|
2017-10-15 09:22:56 +02:00 |
|
tom79
|
b09146fb54
|
Prepares missing menu in show accounts
|
2017-10-15 08:45:37 +02:00 |
|
tom79
|
e10d4fc788
|
Prepares release 1.5.1
|
2017-10-14 18:35:40 +02:00 |
|
tom79
|
dce8f447bd
|
Changes icons
|
2017-10-14 18:34:42 +02:00 |
|
tom79
|
3c6f9ccae8
|
Merge branch 'improves_toots' into develop
|
2017-10-14 17:50:34 +02:00 |
|
tom79
|
516ebe9ddc
|
Improves some colors
|
2017-10-14 17:48:28 +02:00 |
|
tom79
|
13bfb86266
|
Improves button sizes
|
2017-10-14 17:17:29 +02:00 |
|
tom79
|
4027fa75af
|
Merge branch 'improves_toots' into develop
|
2017-10-14 16:46:42 +02:00 |
|
tom79
|
5525b6fc86
|
Merge branch 'bug_fixes_v60' into develop
|
2017-10-14 16:46:35 +02:00 |
|
tom79
|
423ebfe008
|
Fixes an issue when removing picture
|
2017-10-14 16:45:18 +02:00 |
|
tom79
|
35e3ffa541
|
Improves pictures
|
2017-10-14 16:43:18 +02:00 |
|
PhotonQyv
|
e8a1589803
|
Corrected issues with Portuguese translation by removing strings marked as untranslatable, added English text where strings were missing.
|
2017-10-14 14:39:32 +01:00 |
|
tom79
|
206810c69d
|
Recyclerview beginning
|
2017-10-14 14:36:48 +02:00 |
|
tom79
|
67bd790a9e
|
For tablets
|
2017-10-14 11:09:12 +02:00 |
|
tom79
|
513513046d
|
Changes layout for accounts
|
2017-10-14 10:14:55 +02:00 |
|
tom79
|
6a5fe95956
|
changes behavior
|
2017-10-14 09:19:20 +02:00 |
|
tom79
|
46717c4fc2
|
Merge branch 'improves_toots' into develop
|
2017-10-13 20:25:36 +02:00 |
|
tom79
|
997c652cc7
|
Merge branch 'filter_toots' into develop
|
2017-10-13 20:23:58 +02:00 |
|
tom79
|
d062b4492c
|
Adds filter for boosts/replies on Fdroid version
|
2017-10-13 20:23:39 +02:00 |
|
tom79
|
880aa074a1
|
Fixes header issue api < 21
|
2017-10-13 19:38:36 +02:00 |
|
tom79
|
74750f7562
|
Merge branch 'improves_show_account' into develop
|
2017-10-13 19:29:34 +02:00 |
|
tom79
|
77e7d39223
|
Fixes header issue
|
2017-10-13 19:29:19 +02:00 |
|
tom79
|
e0df1aea85
|
Merge branch 'improves_show_account' into develop
|
2017-10-13 19:25:27 +02:00 |
|
tom79
|
cafe4ae2a6
|
Changes for tablets
|
2017-10-13 19:25:05 +02:00 |
|
tom79
|
ba9563eeb0
|
Changes the way to manage scroll
|
2017-10-13 19:06:39 +02:00 |
|
tom79
|
4ff6a977a5
|
Changes button color
|
2017-10-13 07:30:23 +02:00 |
|
tom79
|
e85b099bdf
|
Removes my code already added by @PhotonQyv
|
2017-10-13 06:53:27 +02:00 |
|
tom79
|
b477c06c80
|
Merge branch 'changes_font' into develop
|
2017-10-13 06:52:08 +02:00 |
|
PhotonQyv
|
e7d91131e1
|
Merged in PhotonQyv/mastodon_etalab/NotificationsListAdapter_FontChange (pull request #134)
Added code to change font for notifications (correct font).
|
2017-10-13 04:51:18 +00:00 |
|
tom79
|
5b8467c1c2
|
Adds font in notifications
|
2017-10-13 06:49:33 +02:00 |
|
PhotonQyv
|
ed74bb765d
|
Corrected the font name.
|
2017-10-12 23:47:41 +01:00 |
|
PhotonQyv
|
ef08f55b16
|
Added code to change font for notifications.
|
2017-10-12 23:38:52 +01:00 |
|
PhotonQyv
|
c87ad948c2
|
Added code to change font for translations too.
|
2017-10-12 22:30:34 +01:00 |
|
tom79
|
202ed4ad69
|
Merge branch 'changes_font' into develop
|
2017-10-12 18:29:32 +02:00 |
|
tom79
|
2cbbfe7971
|
Fixes small issue with top icon colors
|
2017-10-12 18:28:25 +02:00 |
|
tom79
|
d6c79a77c0
|
Adds Droid font
|
2017-10-12 18:11:57 +02:00 |
|
tom79
|
78751b2e5e
|
Adds Droid font
|
2017-10-12 07:22:59 +02:00 |
|
tom79
|
6d6985cf59
|
Fixes issue with icon boost color
|
2017-10-12 07:10:59 +02:00 |
|
tom79
|
11e8d5fb1b
|
Merge branch 'improves_toots' into develop
|
2017-10-11 19:28:27 +02:00 |
|
tom79
|
6b15005de5
|
Changes some colors
|
2017-10-11 19:28:02 +02:00 |
|
tom79
|
f53ca1a9e0
|
Changes some colors
|
2017-10-11 19:23:02 +02:00 |
|
tom79
|
cd06b9c7e0
|
Go back to star for fav and redraw the retweet button
|
2017-10-11 19:11:00 +02:00 |
|
tom79
|
f191369889
|
Merge branch 'filter_toots' into develop
|
2017-10-11 17:41:20 +02:00 |
|
tom79
|
6ba2d68b7d
|
removes some padding
|
2017-10-11 17:38:21 +02:00 |
|
tom79
|
c0dd8d01e3
|
Removes useless margin
|
2017-10-11 17:26:26 +02:00 |
|
tom79
|
dc1039bf17
|
Changes rounded corners
|
2017-10-11 17:18:32 +02:00 |
|
tom79
|
59874c498c
|
Fixes an error when filtering answers
|
2017-10-11 17:08:44 +02:00 |
|
tom79
|
8483046d64
|
Changes some other icons to material ones
|
2017-10-11 16:38:08 +02:00 |
|
tom79
|
345cea6979
|
Merge branch 'bug_fixes_v60' into improves_toots
|
2017-10-11 16:15:46 +02:00 |
|
tom79
|
ab730ec91b
|
Merge branch 'filter_toots' into improves_toots
|
2017-10-11 15:21:25 +02:00 |
|
tom79
|
4aad3f820a
|
Some other changes
|
2017-10-11 15:21:02 +02:00 |
|
tom79
|
889356b2ce
|
Some other changes
|
2017-10-11 14:58:52 +02:00 |
|
tom79
|
fea1c4eeaa
|
new insert mail icons
|
2017-10-11 14:16:56 +02:00 |
|
tom79
|
3038b59bb7
|
new insert lock open/close icons
|
2017-10-11 14:11:52 +02:00 |
|
tom79
|
e33fda3475
|
new insert photo icon
|
2017-10-11 14:09:28 +02:00 |
|
tom79
|
62b1b2dede
|
new tab icons
|
2017-10-11 14:06:41 +02:00 |
|
tom79
|
937ea41c6c
|
Changes settings icon
|
2017-10-11 13:52:40 +02:00 |
|
tom79
|
bdf474bd60
|
Changes public icon
|
2017-10-11 13:49:43 +02:00 |
|
tom79
|
bc92e15ff9
|
Changes home icon
|
2017-10-11 13:46:39 +02:00 |
|
tom79
|
3387f219e1
|
Changes edit/write icon
|
2017-10-11 12:52:44 +02:00 |
|
tom79
|
4b7ead3904
|
Changes cardview background color for dark mode
|
2017-10-11 12:49:44 +02:00 |
|
tom79
|
933ee2c10d
|
Uses material design icons for expand more
|
2017-10-11 10:52:01 +02:00 |
|
tom79
|
a334e444d9
|
Uses material design icons for favourites
|
2017-10-11 10:48:18 +02:00 |
|
tom79
|
c6a77e2b62
|
Fixes potential crashes when no status have been retrieved before first notifications
|
2017-10-11 10:11:59 +02:00 |
|
tom79
|
2175c17ce6
|
Filters boosts & replies in home timeline
|
2017-10-11 09:23:32 +02:00 |
|
tom79
|
e09dbbe307
|
Adds instance name after some usernames
|
2017-10-10 18:39:40 +02:00 |
|
tom79
|
47062a4bff
|
Makes all account clickable after a search
|
2017-10-10 18:31:59 +02:00 |
|
tom79
|
9521bc931b
|
Fixes potential index out of bounds when translating
|
2017-10-09 19:26:05 +02:00 |
|
tom79
|
d6e5c6d60d
|
Fixes potential index out of bounds when sharing
|
2017-10-09 19:24:21 +02:00 |
|
tom79
|
9901dacf8a
|
Merge branch 'autocomplete_tag' into develop
|
2017-10-09 18:56:25 +02:00 |
|
tom79
|
bc06c01bd6
|
Working with both tags and accounts search
|
2017-10-09 18:55:25 +02:00 |
|
tom79
|
c9605d6720
|
Order searches
|
2017-10-09 18:41:16 +02:00 |
|
tom79
|
bae92796c5
|
Adds search on tags
|
2017-10-09 18:35:43 +02:00 |
|
PhotonQyv
|
08c72581c9
|
Merged in PhotonQyv/mastodon_etalab/activity_about_layout-Tweak (pull request #131)
Tweak for layout of About Activity on larger screens.
|
2017-10-08 17:27:31 +00:00 |
|
tom79
|
dfa1849329
|
Adds Fdroid apk for release 1.5.0
|
2017-10-08 18:26:50 +02:00 |
|
PhotonQyv
|
1dbb209c2d
|
Tweak for layout of About Activity on larger screens.
|
2017-10-08 16:48:33 +01:00 |
|
tom79
|
b98d5a2966
|
Prepares release 1.5.0
|
2017-10-08 17:25:04 +02:00 |
|
tom79
|
7f95d5606d
|
changes icon inside the app
|
2017-10-08 17:02:18 +02:00 |
|
tom79
|
4b46edc5f4
|
default size
|
2017-10-08 16:54:47 +02:00 |
|
tom79
|
96f8a5ad6d
|
New notification icons
|
2017-10-08 16:43:30 +02:00 |
|
tom79
|
ececf62027
|
New notification icons
|
2017-10-08 15:12:58 +02:00 |
|
tom79
|
dd3ac5394d
|
Adds new icon launcher + adds thanks
|
2017-10-08 11:54:41 +02:00 |
|
tom79
|
c4b3b90444
|
Improves remote follow - 2
|
2017-10-07 18:34:29 +02:00 |
|
tom79
|
c6637eda44
|
Improves remote follow
|
2017-10-07 18:18:26 +02:00 |
|
tom79
|
9adeddb4e4
|
Fixes a bug with boost and cross-account actions
|
2017-10-07 14:18:02 +02:00 |
|
tom79
|
b6194eabfa
|
Some improvements
|
2017-10-07 13:00:08 +02:00 |
|
tom79
|
5d954f6902
|
Fixes jumps in list
|
2017-10-07 10:16:48 +02:00 |