Commit graph

3437 commits

Author SHA1 Message Date
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
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
6f038cc23b Merge branch 'Pangoraw-master' 2017-05-08 15:45:44 -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
158a5ea467 Merge branch 'sbetelmal-feature/about-page' 2017-05-07 22:01:03 -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
5a33be310a Merge branch 'connyduck-bugfix-4' 2017-05-07 18:10:19 -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
44422ff8d2 Merge branch 'connyduck-update-dependencies' 2017-05-07 17:59:35 -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
c353460fb1 Merge branch 'connyduck-light-header-background' 2017-05-07 17:42:44 -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
6a397478da Merge branch 'tryton-vanmeer-logout-confirm-dialogue' Closes #235 2017-05-07 17:22:07 -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
Vavassor
8787cf6beb Moves out-of-place Firebase InstanceId call to the google build flavor. Closes #274 2017-05-07 16:14:28 -04:00
Paul
fc2d039d63 Add loader when waiting to display a media 2017-05-06 11:30:52 +00:00
Tryton Van Meer
08cd604e66 Added string 'action_logout_confirm' 2017-05-05 12:19:34 -04:00
Tryton Van Meer
a5e43446b5 logout() now creates a dialog asking the user if they wish to logout. 2017-05-05 12:19:11 -04:00
Conny Duck
d34f4429cd fixed light theme header background when no header image was set 2017-05-05 17:21:20 +02:00
Vavassor
31fff630f3 Fixes "google" build flavor, which was messed up by the repacking process. 2017-05-04 19:02:18 -04:00
Vavassor
aa2394748c Reorganizes the whole codebase. 2017-05-04 18:55:35 -04:00
ButterflyOfFire
189cff6a47 i18n - Updating Arabic strings translation
i18n - Updating Arabic strings translation
2017-05-04 20:32:35 +02:00
Conny Duck
b97c4e24ed remove redundant account_header background, fix weird flicker in header when opening AccountActivity 2017-05-04 18:07:59 +02:00
Conny Duck
310d9a3c91 use TextInputEditText instead of EditText inside TextInputLayout 2017-05-04 16:32:21 +02:00
Conny Duck
4e4c39e58e added missing quotation marks in MediaTypeDeserializer 2017-05-04 16:25:04 +02:00
Conny Duck
2898baf18d updated dependencies 2017-05-04 16:16:24 +02:00
Conny Duck
d5b4b0fe54 fixed crash when media type is unknown 2017-05-04 14:58:45 +02:00