70a8338695
Merge branch 'master' of https://github.com/Elarcis/Tusky into Elarcis-master
2017-04-25 07:45:29 -04:00
b6e72a94be
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
6723bd82fe
(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
f9722ac2c2
Merge branch 'connyduck-bugfix-3'
2017-04-23 19:18:38 -04:00
1ca5923ea9
Merge branch 'bugfix-3' of https://github.com/connyduck/Tusky into connyduck-bugfix-3
2017-04-23 19:07:06 -04:00
d766551071
Merge branch 'alerque-normalize-strings'
2017-04-23 17:43:44 -04:00
ff56a6ca62
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
322f89863d
Merge pull request #218 from FlameArche/add_japanese_translation
...
Adds Japanese new translations
2017-04-23 17:39:06 -04:00
74d1870a95
fixes typo in merged fix
2017-04-23 17:37:59 -04:00
ca6aa39ff3
Merge branch 'jeroenpraat-patch-1'
2017-04-23 17:36:42 -04:00
5b1facbc2c
Merge branch 'patch-1' of https://github.com/jeroenpraat/Tusky into jeroenpraat-patch-1
2017-04-23 17:36:17 -04:00
7ab19e9e30
Merge branch 'PeterCxy-patch-fix-media'
2017-04-23 17:20:08 -04:00
dd8963a9fb
Merge branch 'patch-fix-media' of https://github.com/Petercxy/Tusky into PeterCxy-patch-fix-media
2017-04-23 17:19:36 -04:00
3e50026c99
Merge pull request #217 from connyduck/icon-1
...
use material design icon for local timeline tab
2017-04-23 05:31:03 -04:00
d7f6525386
Small fix: Improved instances example
2017-04-22 15:41:23 +02:00
bb2c0f83b3
Adds Japanese new translations
2017-04-22 22:08:21 +09:00
61d79ff28e
Correct French spelling per @SkyzohKey's comment in PR review
2017-04-22 15:33:07 +03:00
e150e14c1c
Traduction vers le français
2017-04-22 15:33:06 +03:00
1a94e5337f
Update TR translation with recently added and edited strings
2017-04-22 15:33:06 +03:00
e433118372
Copy new untranslated strings from EN → DE and re-order to match
2017-04-22 15:33:06 +03:00
f673e81495
Copy new untranslated strings from EN → AR
2017-04-22 15:33:06 +03:00
d24774fa17
Copy new untranslated strings from EN → JA
2017-04-22 15:30:12 +03:00
bc085f292f
Copy new untranslated strings from EN → NL
2017-04-22 15:30:12 +03:00
32a397904b
use material design icon for local timeline tab
2017-04-22 11:32:55 +02:00
7c3feb7136
fix bugs with fab showing/hiding on scroll
2017-04-22 10:41:49 +02:00
01997012de
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
90b903a1d0
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
b36ad24286
Fix #198 : Use OkHttp3Downloader by default
2017-04-22 13:13:48 +08:00
5179d7e9b3
Blocking and muting now removes all statuses by that user in EVERY currently-loaded timeline.
2017-04-21 23:16:05 -04:00
fcebbc2bdb
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
852c484d68
Adds a list of muted users.
2017-04-21 19:02:04 -04:00
2d913a1cef
Copy new untranslated strings from EN → FR and re-order to match
2017-04-21 11:01:18 +03:00
c4ca7a386b
Copy new untranslated strings from EN → TR
2017-04-21 10:54:27 +03:00
5e155badf5
Merge pull request #207 from connyduck/user-agent-2
...
Add a custom User-Agent
2017-04-21 01:53:38 -04:00
f8657f289a
Merge pull request #201 from daycode/missing-icons-menu
...
Add missing icons in Menu
2017-04-21 01:52:42 -04:00
1c1328449a
Merge pull request #200 from tahnok/master
...
Make compose EditText TYPE_TEXT_FLAG_CAP_SENTENCES
2017-04-21 01:52:28 -04:00
d266605206
Merge branch 'daycode-direct-message'
2017-04-21 01:51:38 -04:00
681c70d056
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
db021b948b
resolve merge conflicts
2017-04-21 01:25:07 -04:00
63349d6df8
Merge pull request #208 from jeroenpraat/patch-1
...
Dutch translation strings
2017-04-21 01:23:21 -04:00
264c49d8b2
Merge branch 'cyweo-patch-1'
2017-04-21 01:22:22 -04:00
c94888435d
resolve merge conflicts
2017-04-21 01:22:08 -04:00
39e45cb3a8
Merge pull request #184 from FlameArche/improve_japanese_translation
...
Improves Japanese translation
2017-04-21 01:19:53 -04:00
255bf4e15c
Merge pull request #182 from Dryusdan/patch-5
...
Correct mistake (again)
2017-04-21 01:19:38 -04:00
1f6f40bd04
Merge branch 'connyduck-bugfix-2'
2017-04-21 01:18:56 -04:00
2434c62d13
Merge branch 'bugfix-2' of https://github.com/connyduck/Tusky into connyduck-bugfix-2
2017-04-21 01:17:42 -04:00
70f8b6dc40
Merge branch 'raphaelm-issue_139'
2017-04-21 01:08:55 -04:00
fdd92f25a6
fix build issues
2017-04-21 01:08:38 -04:00
2d88571b14
Merge branch 'issue_139' of https://github.com/raphaelm/Tusky into raphaelm-issue_139
2017-04-21 00:57:31 -04:00
a2079c602a
Merge branch 'daycode-new-icon'
2017-04-21 00:54:36 -04:00
Vavassor
Elarcis
jeroenpraat
FlameArche
Caleb Maclennan
BOSCH, Cedric
Konrad Pozniak
Peter Cai