Commit Graph

341 Commits

Author SHA1 Message Date
stom79 1e8c2ded46 Adds the possibility to block/mute from the account page. 2017-10-28 12:30:40 +02:00
stom79 61ca865e18 Hides tool bar when scrolling on hashtag activity 2017-10-28 10:38:37 +02:00
stom79 02675ecdb7 Removes bottom bar 2017-10-27 18:05:57 +02:00
stom79 b800dab0d3 Merge branch 'develop' into ui_improvements 2017-10-27 16:50:14 +02:00
stom79 f9e3584b97 Fixes a bug with remote follows 2017-10-27 16:35:01 +02:00
stom79 400bf263ec Cleans code in activities 2017-10-27 15:34:53 +02:00
stom79 fa1d976678 Fixes input text 2017-10-27 11:45:37 +02:00
stom79 7e6ad26348 updates description 2017-10-27 11:15:47 +02:00
stom79 ddc1647313 Prepares AlertDialog 2017-10-27 10:47:29 +02:00
stom79 d5ddc319ee Store instance version + changes into long click 2017-10-27 10:38:22 +02:00
stom79 902c80d35c Fixes a bug with local timeline 2017-10-26 09:06:24 +02:00
stom79 a34a00b07b Merge branch 'develop' into ui_improvements 2017-10-26 07:19:25 +02:00
stom79 28cc83faee Adds counters 2017-10-25 13:45:22 +02:00
stom79 3988f7bc59 Changes title 2017-10-25 11:00:04 +02:00
stom79 f2de4e559d Adds picture 2017-10-25 10:51:36 +02:00
stom79 c5b087c7bc some cleaning 2017-10-25 09:46:05 +02:00
stom79 17f4a0aa9f Put cursor at the end 2017-10-25 09:43:38 +02:00
stom79 d908010955 Adds users in a list 2017-10-25 09:04:34 +02:00
stom79 6439090493 Manages accounts in context 2017-10-25 07:53:31 +02:00
stom79 0429d09ef5 Adds bottom action bar 2017-10-24 17:56:42 +02:00
stom79 7112b45dfc Removes improvements which are not related to this branch 2017-10-24 16:02:21 +02:00
stom79 f6ad7d74e2 Fixes some issues 2017-10-24 11:44:07 +02:00
stom79 10ad34cfc3 Merge branch 'ui_improvements' into recyclerview 2017-10-24 10:42:59 +02:00
stom79 32b753b3d9 Merge branch 'develop' into recyclerview
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
#	app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
#	app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
#	app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
2017-10-24 10:30:49 +02:00
stom79 ace213df6e Starting two actionbars 2017-10-24 10:11:07 +02:00
tom79 28f1cf0958 Merge branch 'improves_stream_tl' into develop 2017-10-21 19:24:00 +02:00
tom79 586535840f some cleaning 2017-10-21 17:15:52 +02:00
tom79 201afec571 Some cleaning 2017-10-21 16:56:17 +02:00
tom79 e8997edae1 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 16:36:05 +02:00
tom79 3874c3495a Fixes issues 2017-10-21 14:35:36 +02:00
tom79 90d7e6e3a6 Display more replies in context 2017-10-21 12:32:27 +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 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 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 5c739d499a Moves my account to mastodon.social 2017-10-17 19:20:56 +02:00
tom79 faf995f0c9 Use String instead of Integer 2017-10-17 18:44:24 +02:00
Friedger a9a0c9388a use base classes for login and main activity, fixes #27 2017-10-17 13:13:35 +02:00
tom79 febedc9b1f Fixes an issue when removing chars during a search 2017-10-15 18:16:10 +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 ac334ba3a4 Some icon changes 2017-10-15 11:35:36 +02:00
tom79 f868f2a425 Adds filter by long click on the tab 2017-10-15 09:22:56 +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 5525b6fc86 Merge branch 'bug_fixes_v60' into develop 2017-10-14 16:46:35 +02:00