Mastodon/Tusky-App-Android
1
0
Fork 0
mirror of https://github.com/tuskyapp/Tusky synced 2024-12-17 03:18:39 +01:00
Code Issues Releases Wiki Activity
567 Commits 36 Branches 121 Tags 126 MiB
09e8c9c811
Commit Graph

480 Commits

Author SHA1 Message Date
Vavassor
09e8c9c811 Merge branch 'master' of https://github.com/m4sk1n/Tusky-l10n 2017-05-30 20:15:43 -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
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
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
Marcin Mikołajczak
4784fa72f6 updated Polish translation 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-05-26 15:04:06 +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
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
12571a7556 Merge branch 'issue#228' of https://github.com/torrentcome/Tusky into torrentcome-issue#228 2017-05-11 18:08:01 -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
Vavassor
3c20f7a0c4 Adds a splash screen replacement. 2017-05-09 22:36:05 -04:00
Vavassor
1dc32323d5 Adds a higher-resolution elephant friend to the login page. Closes #99 2017-05-08 16:30:25 -04:00
Vavassor
88e2b7b382 Merge branch 'master' of https://github.com/Pangoraw/Tusky into Pangoraw-master 2017-05-08 15:40:08 -04:00
Vavassor
a2a600a9de Adds back button to the about page and for the Tusky's Profile button it searches for the account first and saves the ID for subsequent presses. Closes #279 2017-05-08 15:00:33 -04:00
Paul
17f347cab5 Add loading on login activity while fetching tokens 2017-05-08 11:24:30 +00:00
Vavassor
d2b5fb24a2 Removes an unused library from build.gradle. 2017-05-07 22:04:02 -04:00
Vavassor
551d73baee Makes about page work with light theme and landscape orientation. 2017-05-07 22:00:29 -04:00
Vavassor
daf0ec8e49 resolves merge conflict 2017-05-07 20:20:59 -04:00
Vavassor
b8cca0851f Merge pull request #262 from m4sk1n/patch-1 
i18n: fixed some things in Polish translation
 2017-05-07 20:14:07 -04:00
Vavassor
67db47abdf Merge pull request #263 from alerque/touchup-turkish 
Fix spelling and translate new strings for Turkish
 2017-05-07 20:13:57 -04:00
Vavassor
ac6327907c Merge pull request #271 from BoFFire/patch-2 
i18n - Updating Arabic strings translation
 2017-05-07 20:13:46 -04:00
Vavassor
eb13817bce Merge branch 'bugfix-4' of https://github.com/connyduck/Tusky into connyduck-bugfix-4 2017-05-07 18:03:34 -04:00
Vavassor
7f934e4f26 Resolves merge conflicts 2017-05-07 17:58:56 -04:00
Vavassor
c3f4473508 Merge pull request #268 from connyduck/textinputedittext 
use TextInputEditText instead of EditText inside TextInputLayout
 2017-05-07 17:44:42 -04:00
Vavassor
d658e6e7a3 Merge pull request #270 from connyduck/profile-header 
remove account_header_default.png
 2017-05-07 17:44:26 -04:00
Vavassor
e134e35a14 Merge branch 'light-header-background' of https://github.com/connyduck/Tusky into connyduck-light-header-background 2017-05-07 17:29:55 -04:00
Vavassor
e094765734 Merge branch 'logout-confirm-dialogue' of https://github.com/tryton-vanmeer/Tusky into tryton-vanmeer-logout-confirm-dialogue 2017-05-07 17:03:37 -04:00
Vavassor
bc7ac41a28 Merge pull request #275 from Pangoraw/master 
Add loader when waiting to display a media, closes #196
 2017-05-07 16:47:19 -04:00