Commit graph

574 commits

Author SHA1 Message Date
torrentcome
f83c1470a4 Merge branch 'master-upstream' 2017-06-02 16:58:28 +02:00
Vavassor
9e7229bfcc Adds a forgotten keystore. 2017-06-02 04:47:22 -04:00
Vavassor
94639eeb69 Fixes long content warnings in posts wasting space. Closes #173 2017-06-02 03:12:02 -04:00
Vavassor
85f7b16736 Removes "fillable loader" library, since it's no longer used for the splash screen. 2017-05-31 20:50:11 -04:00
Vavassor
5b0a1792e8 Merge branch 'FlameArche-add_japanese_new_translation' 2017-05-30 20:45:40 -04:00
Vavassor
09e11fdff7 Merge branch 'add_japanese_new_translation' of https://github.com/FlameArche/Tusky into FlameArche-add_japanese_new_translation 2017-05-30 20:42:52 -04:00
Vavassor
09e8c9c811 Merge branch 'master' of https://github.com/m4sk1n/Tusky-l10n 2017-05-30 20:15:43 -04:00
Vavassor
f88b88c73a Merge branch 'connyduck-fix-collapsing-toolbar-bug' 2017-05-30 19:48:08 -04:00
Vavassor
35ee60f601 Merge branch 'fix-collapsing-toolbar-bug' of https://github.com/connyduck/Tusky into connyduck-fix-collapsing-toolbar-bug 2017-05-30 19:36:19 -04:00
Vavassor
20410024f4 Fixes a mistake made while merging #294. 2017-05-30 19:35:04 -04:00
Vavassor
86ee4fe706 Merge branch 'connyduck-log-improvement' 2017-05-30 19:24:32 -04:00
Vavassor
fe7771b813 Merge branch 'log-improvement' of https://github.com/connyduck/Tusky into connyduck-log-improvement 2017-05-30 19:21:11 -04:00
Vavassor
ad49c258b3 Merge pull request #289 from Pangoraw/translation
Improve french translation.
2017-05-30 19:20:19 -04:00
Vavassor
90ed68d316 Merge branch 'Pangoraw-design' 2017-05-30 19:18:32 -04:00
Vavassor
da596a4f5c Merge branch 'design' of https://github.com/Pangoraw/Tusky into Pangoraw-design 2017-05-30 19:12:21 -04:00
Vavassor
a8e8732979 Fixes a validation error on login when instance names are entered with multiple @ symbols like @username@example.com. 2017-05-30 16:57:30 -04:00
FlameArche
7cf72be4b1 Adds Japanese translations. 2017-05-28 02:59:29 +09:00
Marcin Mikołajczak
4784fa72f6 updated Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-05-26 15:04:06 +02:00
m4sk1n
23e3663b40 Merge pull request #1 from Vavassor/master
xd
2017-05-26 14:33:56 +02:00
Konrad Pozniak
7501fcaeaa Merge branch 'master' into log-improvement 2017-05-25 19:17:20 +02:00
Conny Duck
a2c019e8f1 fix bug in CollapsingToolbarLayout 2017-05-25 19:10:49 +02:00
Conny Duck
2eaff99b29 log some more exceptions 2017-05-25 17:21:11 +02:00
Vavassor
52aa32061a release 1.1.4-beta.1 2017-05-23 21:03:18 -04:00
Vavassor
3ef7e685ea Merge branch 'mqtt-push' 2017-05-23 19:51:03 -04:00
Vavassor
036a305782 pretty much finishes the prototype 2017-05-23 19:48:54 -04:00
Conny Duck
1a39e58d3c remove unnecessary Log utility class, replace Exception.printStackTrace with logging 2017-05-23 21:34:31 +02:00
Vavassor
6ee6157b7f Adds TLS to the push notification client (keystore_tusky_api is omitted). 2017-05-22 02:05:37 -04:00
Vavassor
b396f2afc8 First notification received successfully from the wryk/tusky-api prototype! 2017-05-21 22:21:23 -04:00
Vavassor
c90c909ca6 Integrates with wryk/tusky-api, but only partially working.
Registers to the web-service fine but loses connection when subscribing with the broker.
2017-05-20 02:39:29 -04:00
Vavassor
e282f13fdc Setup client-side for integration with the wryk/tusky-api prototype. 2017-05-19 21:28:12 -04:00
Vavassor
73a5144741 Adds notification clearing and makes the client a little more stable. 2017-05-19 20:00:57 -04:00
Vavassor
388ecfcf2e Removes the product flavor split. 2017-05-18 18:10:46 -04:00
Vavassor
6752d45d4b Initial client working for MQTT push notifications. 2017-05-16 22:19:34 -04:00
Pangoraw
881a1380b5 Improve french translation. 2017-05-14 11:40:00 +00:00
Pangoraw
ac7428ec57 Use softer color for light theme. 2017-05-14 11:02:12 +00:00
Vavassor
1815d574c8 Makes the view media toolbar transparent. 2017-05-11 21:31:29 -04:00
Vavassor
fa0641bfd9 changes terminology 2017-05-11 19:02:43 -04:00
Vavassor
66bac21236 fixes merge conflicts 2017-05-11 18:58:38 -04:00
Vavassor
68eaa742ee Merge branch 'Pangoraw-master' 2017-05-11 18:34:45 -04:00
Vavassor
08a6095251 Merge branch 'torrentcome-issue#228' Closes #228 2017-05-11 18:15:10 -04:00
Vavassor
12571a7556 Merge branch 'issue#228' of https://github.com/torrentcome/Tusky into torrentcome-issue#228 2017-05-11 18:08:01 -04:00
Vavassor
584f7bae94 Merge branch 'connyduck-bugfix-5' Closes #286 2017-05-11 18:03:36 -04:00
Vavassor
17d1eead67 Merge branch 'bugfix-5' of https://github.com/connyduck/Tusky into connyduck-bugfix-5 2017-05-11 18:02:45 -04:00
Vavassor
6dbdb31101 Fixes the Amazon badge in README.md. 2017-05-11 16:29:36 -04:00
Vavassor
98229d2bb7 Moves store badges and normalizes their sizes. 2017-05-11 16:16:31 -04:00
Vavassor
6be10527ef Adds store badges to README.md. 2017-05-11 16:13:49 -04:00
Conny Duck
082e038688 sharing of own toots now possible 2017-05-11 18:29:16 +02:00
Pangoraw
72ac4e5581 Allow broadcasting event across activities. 2017-05-11 09:11:15 +00:00
torrentcome
a015637785 (media) add toolbar and download button 2017-05-10 15:24:45 +02:00
torrentcome
b5c2b62d7a (icon) add icon download 2017-05-10 15:24:03 +02:00