Commit Graph

632 Commits

Author SHA1 Message Date
Vavassor
1e6df9c56c Emojione shortcodes now converted to unicode in display names. closes #82, closes #129 2017-04-25 18:31:27 -04:00
Vavassor
9b461d8bec Merge branch 'Elarcis-master' 2017-04-25 07:49:37 -04:00
Vavassor
04f2813de1 Merge branch 'master' of https://github.com/Elarcis/Tusky into Elarcis-master 2017-04-25 07:45:29 -04:00
Vavassor
80971e2fc4 Custom tabs are now used for login and links on account pages, with a fallback to the default browser if not supported.
Also, fixes crashes when entering tag and threads due to me forgetting to implement the interfaces required by the code that removes posts from timelines when blocking/muting.

Also fixes a small bug where for mentions of users from other instances, clicking on the mention would open the profile in the browser instead of in-app.
2017-04-25 07:30:57 -04:00
Elarcis
35f8e2aff7 (untested) Fixed grammatical errors in the french translation
I don't have the necessary SDK for Android apps, however I was able to fix some awful grammatical errors in the french locales. Nuff said.
2017-04-24 19:07:23 +02:00
Vavassor
93e4545fcf Merge branch 'connyduck-bugfix-3' 2017-04-23 19:18:38 -04:00
Vavassor
1dc1b5082b Merge branch 'bugfix-3' of https://github.com/connyduck/Tusky into connyduck-bugfix-3 2017-04-23 19:07:06 -04:00
Vavassor
44ad9e9226 Merge branch 'alerque-normalize-strings' 2017-04-23 17:43:44 -04:00
Vavassor
39ec582ce9 Merge branch 'normalize-strings' of https://github.com/alerque/Tusky into alerque-normalize-strings
Conflicts:
	app/src/main/res/values-ja/strings.xml
2017-04-23 17:42:34 -04:00
Vavassor
69cd197187 Merge pull request #218 from FlameArche/add_japanese_translation
Adds Japanese new translations
2017-04-23 17:39:06 -04:00
Vavassor
ee9dc79ff3 fixes typo in merged fix 2017-04-23 17:37:59 -04:00
Vavassor
c1013beb4c Merge branch 'jeroenpraat-patch-1' 2017-04-23 17:36:42 -04:00
Vavassor
470470070e Merge branch 'patch-1' of https://github.com/jeroenpraat/Tusky into jeroenpraat-patch-1 2017-04-23 17:36:17 -04:00
Vavassor
74ee7a1f82 Merge branch 'PeterCxy-patch-fix-media' 2017-04-23 17:20:08 -04:00
Vavassor
928b1a97cc Merge branch 'patch-fix-media' of https://github.com/Petercxy/Tusky into PeterCxy-patch-fix-media 2017-04-23 17:19:36 -04:00
Vavassor
bbe98a3b5b Merge pull request #217 from connyduck/icon-1
use material design icon for local timeline tab
2017-04-23 05:31:03 -04:00
jeroenpraat
d12bb9d6d0 Small fix: Improved instances example 2017-04-22 15:41:23 +02:00
FlameArche
2ca1d9a60f Adds Japanese new translations 2017-04-22 22:08:21 +09:00
Caleb Maclennan
c56482d30a Correct French spelling per @SkyzohKey's comment in PR review 2017-04-22 15:33:07 +03:00
BOSCH, Cedric
323fbee2e8 Traduction vers le français 2017-04-22 15:33:06 +03:00
Caleb Maclennan
b714bd128f Update TR translation with recently added and edited strings 2017-04-22 15:33:06 +03:00
Caleb Maclennan
7c50f6b829 Copy new untranslated strings from EN → DE and re-order to match 2017-04-22 15:33:06 +03:00
Caleb Maclennan
a205024f9a Copy new untranslated strings from EN → AR 2017-04-22 15:33:06 +03:00
Caleb Maclennan
a9be5a2fca Copy new untranslated strings from EN → JA 2017-04-22 15:30:12 +03:00
Caleb Maclennan
6d03219b5d Copy new untranslated strings from EN → NL 2017-04-22 15:30:12 +03:00
Konrad Pozniak
b561232b5e use material design icon for local timeline tab 2017-04-22 11:32:55 +02:00
Konrad Pozniak
dcf3e2836e fix bugs with fab showing/hiding on scroll 2017-04-22 10:41:49 +02:00
Vavassor
a299473dba Block and mute lists now remove the entries when you unmute/unblock a user, with a short popup to undo if it's unintentional. Just for clearer feedback. 2017-04-22 02:06:19 -04:00
Peter Cai
4048d04338 Let OkHttp3Downloader create an OkHttpClient by default
This re-enables the local cache in default cache directory
2017-04-22 13:29:00 +08:00
Peter Cai
c11606e7bd Fix #198: Use OkHttp3Downloader by default 2017-04-22 13:13:48 +08:00
Vavassor
c6cf2d034a Blocking and muting now removes all statuses by that user in EVERY currently-loaded timeline. 2017-04-21 23:16:05 -04:00
Vavassor
0da98f4f67 Adds ability to mute from an individual status. Also, all statuses from that user are removed from the timeline on the spot. 2017-04-21 20:58:44 -04:00
Vavassor
b6e3edaa32 Adds a list of muted users. 2017-04-21 19:02:04 -04:00
Caleb Maclennan
00e9acfa23 Copy new untranslated strings from EN → FR and re-order to match 2017-04-21 11:01:18 +03:00
Caleb Maclennan
032ab5bc66 Copy new untranslated strings from EN → TR 2017-04-21 10:54:27 +03:00
Vavassor
bda6787548 Merge pull request #207 from connyduck/user-agent-2
Add a custom User-Agent
2017-04-21 01:53:38 -04:00
Vavassor
a23bed8c8d Merge pull request #201 from daycode/missing-icons-menu
Add missing icons in Menu
2017-04-21 01:52:42 -04:00
Vavassor
95bdae5d7d Merge pull request #200 from tahnok/master
Make compose EditText TYPE_TEXT_FLAG_CAP_SENTENCES
2017-04-21 01:52:28 -04:00
Vavassor
98cb5513eb Merge branch 'daycode-direct-message' 2017-04-21 01:51:38 -04:00
Vavassor
52ff86982f Changes the icon for the visibility menu in the composer to match the current visibility. Also, fixes build errors with the dutch translation file. 2017-04-21 01:50:59 -04:00
Vavassor
e01b3c265e resolve merge conflicts 2017-04-21 01:25:07 -04:00
Vavassor
68f7b81869 Merge pull request #208 from jeroenpraat/patch-1
Dutch translation strings
2017-04-21 01:23:21 -04:00
Vavassor
472681952f Merge branch 'cyweo-patch-1' 2017-04-21 01:22:22 -04:00
Vavassor
4fd46dff18 resolve merge conflicts 2017-04-21 01:22:08 -04:00
Vavassor
c571281fc8 Merge pull request #184 from FlameArche/improve_japanese_translation
Improves Japanese translation
2017-04-21 01:19:53 -04:00
Vavassor
dc623742bf Merge pull request #182 from Dryusdan/patch-5
Correct mistake (again)
2017-04-21 01:19:38 -04:00
Vavassor
16da5adf36 Merge branch 'connyduck-bugfix-2' 2017-04-21 01:18:56 -04:00
Vavassor
5e47a4514b Merge branch 'bugfix-2' of https://github.com/connyduck/Tusky into connyduck-bugfix-2 2017-04-21 01:17:42 -04:00
Vavassor
456198a9e5 Merge branch 'raphaelm-issue_139' 2017-04-21 01:08:55 -04:00
Vavassor
c235985911 fix build issues 2017-04-21 01:08:38 -04:00