Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity
2,358 Commits 39 Branches 120 Tags 118 MiB
Commit Graph

2358 Commits

Author SHA1 Message Date
Raphael Michel 834ad78c36 Allow to filter boosts and replies from home (closes #133) 2017-04-17 12:37:44 +02:00
Konrad Pozniak 2e3d8b8cae fixes crash when media url is empty 2017-04-17 11:03:05 +02:00
Raphael Michel 15088fa42a Allow taking photos directly from the app (closes #139) 2017-04-17 10:56:30 +02:00
Vavassor 18e40855ad Profile edits for display name and bio are working. Avatar and header image picking are in but not uploaded. 2017-04-17 02:49:56 -04:00
Vavassor e15f1cfcab Merge branch 'master' into edit-profile 2017-04-17 01:10:20 -04:00
Vavassor 8b4bf0ab33 Merge branch 'account_activity_title' of https://github.com/raphaelm/Tusky into raphaelm-account_activity_title 2017-04-17 00:31:10 -04:00
Vavassor a33c259760 Ties composer readying state and control states together. 2017-04-17 00:29:47 -04:00
Vavassor cc0aaf6162 Fixes a couple cases in the composer where buttons enabled are out of sync with whether a status is already in flight. 2017-04-17 00:18:55 -04:00
Vavassor c343f9b497 Merge branch 'raphaelm-error_handling_bug' 2017-04-17 00:11:10 -04:00
Vavassor 962bd79d3f Merge branch 'error_handling_bug' of https://github.com/raphaelm/Tusky into raphaelm-error_handling_bug 2017-04-17 00:09:16 -04:00
Vavassor 029b698fab Merge branch 'raphaelm-issue_62' 2017-04-16 23:41:43 -04:00
Vavassor 61fdda5fa3 Merge branch 'issue_62' of https://github.com/raphaelm/Tusky into raphaelm-issue_62 2017-04-16 23:04:00 -04:00
Vavassor 820ef1305e Merge pull request #168 from raphaelm/account_tab_margin 
Margins in account tab
 2017-04-16 22:57:21 -04:00
Vavassor 7deec354af Merge branch 'raphaelm-issue_74' 2017-04-16 22:40:53 -04:00
Vavassor 1c1931b87c Merge branch 'issue_74' of https://github.com/raphaelm/Tusky into raphaelm-issue_74 2017-04-16 22:11:29 -04:00
Vavassor f724cb35ce Merge branch 'raphaelm-refresh_thread' 2017-04-16 21:51:42 -04:00
Vavassor ab0481c08a Merge branch 'refresh_thread' of https://github.com/raphaelm/Tusky into raphaelm-refresh_thread 2017-04-16 21:37:30 -04:00
Vavassor a4ad9046fb Merge pull request #176 from indication/add_japanese 
Add Japanese translation
 2017-04-16 20:30:30 -04:00
Vavassor 7cece2d07d Merge pull request #162 from BoFFire/master 
Adding arabic localization for Tusky
 2017-04-16 20:26:45 -04:00
Vavassor cbcd860ba6 Merge branch 'connyduck-translation-5' 2017-04-16 19:46:42 -04:00
Vavassor 0c0a4f7530 Merge branch 'translation-5' of https://github.com/connyduck/Tusky into connyduck-translation-5 2017-04-16 19:46:23 -04:00
Vavassor c6fd141095 Merge branch 'goofy-bz-patch-1' 
Conflicts:
	app/src/main/res/values-fr/strings.xml
 2017-04-16 19:30:47 -04:00
Vavassor 69641fcdeb Merge branch 'patch-1' of https://github.com/goofy-bz/Tusky into goofy-bz-patch-1 
Conflicts:
	app/src/main/res/values-fr/strings.xml
 2017-04-16 19:27:33 -04:00
Vavassor 73ed3d0852 Fixes merge errors. 2017-04-16 19:23:18 -04:00
Vavassor 6527dcc9a5 Merge pull request #154 from Dryusdan/patch-3 
Correct mistake and add new translation
 2017-04-16 18:57:08 -04:00
Vavassor 1e5c272ae1 Merge pull request #153 from boced66/Traduction 
Traduction
 2017-04-16 18:55:56 -04:00
Vavassor fcffea08a3 Merge pull request #143 from theZacAttacks/variedSharing 
Share menu now allows for sharing of link/actual post
 2017-04-16 18:54:31 -04:00
Vavassor 84741c1f1b Adds a partial profile editor (non-working). 2017-04-16 18:51:09 -04:00
in_dow 60b3d4bb97 Add translation (japanese) 
Signed-off-by: in_dow <in_dow@hotmail.com>
 2017-04-17 01:54:21 +09:00
Raphael Michel c7772d0f56 Useful title for AccountActivity 2017-04-15 20:49:31 +02:00
Raphael Michel 1701ef67d9 Margins in account tab 2017-04-15 20:36:21 +02:00
serage.betelmal 642e2af23e Adding an about activity to the App 2017-04-15 19:05:25 +01:00
Raphael Michel fce573f1ec Update thread view after sent reply (closes #74) 2017-04-15 19:59:06 +02:00
Raphael Michel d732c5d0a7 Timeline footer improvements 2017-04-15 19:25:39 +02:00
Raphael Michel ee4d0739db Re-enable controls after failed toot 2017-04-15 17:52:21 +02:00
ButterflyOfFire ffcfaafc76 Merge pull request #1 from BoFFire/arabic 
Adding arabic strings
 2017-04-15 16:41:51 +01:00
ButterflyOfFire 13c1136e1f Update strings.xml 
Localisation was made here : https://www.transifex.com/opendz/tusky-in-arabic/
 2017-04-15 16:40:37 +01:00
Raphael Michel f4109f38a8 Allow pull-to-refresh in thread view (closes #73) 2017-04-15 12:28:22 +02:00
ButterflyOfFire 3e5eb47dcf Create strings.xml 
Preparing file to arabic translation from "en" source file.
 2017-04-15 11:01:18 +01:00
Vavassor 69c1b88ff4 Addresses mispronunciation of timestamps like 7m as meters instead of minutes. 2017-04-14 20:23:07 -04:00
Vavassor 77285c9966 Adds missing content description for the profile avatar in the navigation drawer. 2017-04-14 19:46:33 -04:00
Konrad Pozniak 597b696d70 fixed German translation 2017-04-15 00:14:16 +02:00
goofy-bz 96c4369753 Update strings.xml 
various typo fix + changing escaping apostrophes for French typographic apostrophes which are xml compliant.
 2017-04-14 22:20:38 +02:00
Dryusdan 424968ff4f Mistake (again...) 2017-04-14 10:59:59 +02:00
Dryusdan bb9bc42a58 mistake 2017-04-14 10:31:21 +02:00
Dryusdan 8a6aa19f41 Update traduction and use some #153 sentences 2017-04-14 10:22:08 +02:00
Dryusdan 3aa10233e0 Correct mistake and add new translation 2017-04-14 10:06:47 +02:00
BOSCH, Cedric b1a2761eae Traduction fr 
Ajout de "Boost"
 2017-04-14 07:33:51 +02:00
BOSCH, Cedric d30b592b48 Merge remote-tracking branch 'refs/remotes/origin/master' into Traduction 2017-04-14 07:25:03 +02:00
Boced66 50f31d3f00 Merge pull request #1 from Vavassor/master 
Rebase
 2017-04-14 07:19:29 +02:00