Commit Graph

363 Commits

Author SHA1 Message Date
Vavassor 4c582bdf3d Merge branch 'new-icon' of https://github.com/daycode/Tusky into daycode-new-icon 2017-04-21 00:32:03 -04:00
Vavassor 9f3a7c2b04 Merge branch 'master' of http://github.com/Vavassor/Tusky 2017-04-21 00:29:54 -04:00
Vavassor ba295cfe9d Merge branch 'ntngrtltr-image_downloads' 2017-04-21 00:29:04 -04:00
Vavassor c6988415ae merge resolved 2017-04-21 00:19:37 -04:00
Vavassor 22bf5e2251 Merge pull request #65 from alerque/i8n-turkish
Turkish translation
2017-04-21 00:02:41 -04:00
Vavassor 2b34454cc9 Changes the profile editor save icon to something better. 2017-04-20 23:57:04 -04:00
Vavassor b9f0c51e70 Provisional profile editor complete. 2017-04-20 18:56:36 -04:00
Vavassor 5941a2f5b3 Profile editor functionally complete. 2017-04-19 00:01:04 -04:00
Caleb Maclennan 4f0b0d5c0a
Translate new strings and edits since original branch point 2017-04-17 15:44:11 +03:00
Caleb Maclennan 6c1549a87e
Finish all strings and fix escaping 2017-04-17 15:25:07 +03:00
Caleb Maclennan c84604cf0f
Finish off all short stings and normalize usage 2017-04-17 15:16:40 +03: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 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 1701ef67d9 Margins in account tab 2017-04-15 20:36:21 +02: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