Commit Graph

  • 20b9dc8c53 Merge remote-tracking branch 'origin/NSFW_Timed_Reveal' into NSFW_Timed_Reveal PhotonQyv 2017-05-09 21:11:02 +0100
  • f995dd6a23 Finally got NSFW image timeout to be user configurable. With some basic range checking. PhotonQyv 2017-05-09 21:09:08 +0100
  • 74a666a3b6 Fixed a daft error that stopped the code working more than once. PhotonQyv 2017-05-09 14:32:39 +0100
  • 904142fe5e Fixed a daft error tht stopped the code working more than once. PhotonQyv 2017-05-09 14:27:12 +0100
  • a7bd65b39a Removed an import statement that isn't required. PhotonQyv 2017-05-09 13:18:35 +0100
  • f55ef1004f Updated code to match that in NSFW_Timed_Reveal branch. (temporary comment out onLongClick() listener). Also removed an import statement that isn't required. PhotonQyv 2017-05-09 13:15:43 +0100
  • cd75dc6c58 Timeout put back to 10 seconds. PhotonQyv 2017-05-09 12:58:59 +0100
  • 1cad09dc6f Temporarily commented out the onLongClick() listener. PhotonQyv 2017-05-09 12:56:01 +0100
  • 091ebbbc62 Removed so extra line-breaks. PhotonQyv 2017-05-08 22:38:40 +0100
  • cea23914be Removed so extra line-breaks. PhotonQyv 2017-05-08 22:27:30 +0100
  • 8458b1044e Merge pull request #9 from Vavassor/master PhotonQyv 2017-05-08 22:23:13 +0100
  • e87470f638 Merge pull request #8 from PhotonQyv/master PhotonQyv 2017-05-08 22:21:16 +0100
  • e61538b599 Merge pull request #7 from Vavassor/master PhotonQyv 2017-05-08 22:18:43 +0100
  • d9323b043c Corrected the code so it allows you to reveal more than once. PhotonQyv 2017-05-08 22:15:39 +0100
  • a12913f890 First pass at getting NSFW images to hide again. PhotonQyv 2017-05-08 22:00:45 +0100
  • 1dc32323d5 Adds a higher-resolution elephant friend to the login page. Closes #99 Vavassor 2017-05-08 16:30:25 -0400
  • 215761a7f1 First pass at getting NSFW images to hide again. PhotonQyv 2017-05-08 21:24:12 +0100
  • 6f038cc23b Merge branch 'Pangoraw-master' Vavassor 2017-05-08 15:45:44 -0400
  • 88e2b7b382 Merge branch 'master' of https://github.com/Pangoraw/Tusky into Pangoraw-master Vavassor 2017-05-08 15:40:08 -0400
  • 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 Vavassor 2017-05-08 15:00:33 -0400
  • 0e7a56f0f9 Updated spacing slightly. PhotonQyv 2017-05-08 13:12:07 +0100
  • bef9855a64 Changed if() set to a switch() in onSharedPreferenceChanged(). PhotonQyv 2017-05-08 13:00:30 +0100
  • 17f347cab5 Add loading on login activity while fetching tokens #278 Paul 2017-05-08 10:17:41 +0000
  • c52a4a9215 Merge pull request #6 from Vavassor/master PhotonQyv 2017-05-08 10:11:56 +0100
  • 879e85a5ed Merge pull request #5 from Vavassor/master PhotonQyv 2017-05-08 10:09:18 +0100
  • d2b5fb24a2 Removes an unused library from build.gradle. Vavassor 2017-05-07 22:04:02 -0400
  • 158a5ea467 Merge branch 'sbetelmal-feature/about-page' Vavassor 2017-05-07 22:01:03 -0400
  • 551d73baee Makes about page work with light theme and landscape orientation. Vavassor 2017-05-07 22:00:29 -0400
  • daf0ec8e49 resolves merge conflict Vavassor 2017-05-07 20:20:59 -0400
  • b8cca0851f Merge pull request #262 from m4sk1n/patch-1 Vavassor 2017-05-07 20:14:07 -0400
  • 67db47abdf Merge pull request #263 from alerque/touchup-turkish Vavassor 2017-05-07 20:13:57 -0400
  • ac6327907c Merge pull request #271 from BoFFire/patch-2 Vavassor 2017-05-07 20:13:46 -0400
  • 88a46ea036 Merge pull request #4 from PhotonQyv/master PhotonQyv 2017-05-07 23:15:45 +0100
  • 1f463b54fb Merge pull request #3 from Vavassor/master PhotonQyv 2017-05-07 23:13:18 +0100
  • 5a33be310a Merge branch 'connyduck-bugfix-4' Vavassor 2017-05-07 18:10:19 -0400
  • eb13817bce Merge branch 'bugfix-4' of https://github.com/connyduck/Tusky into connyduck-bugfix-4 Vavassor 2017-05-07 18:03:34 -0400
  • 44422ff8d2 Merge branch 'connyduck-update-dependencies' Vavassor 2017-05-07 17:59:35 -0400
  • 7f934e4f26 Resolves merge conflicts Vavassor 2017-05-07 17:58:56 -0400
  • 14ccc7623f Merge pull request #2 from PhotonQyv/master PhotonQyv 2017-05-07 22:56:36 +0100
  • c3f4473508 Merge pull request #268 from connyduck/textinputedittext Vavassor 2017-05-07 17:44:42 -0400
  • d658e6e7a3 Merge pull request #270 from connyduck/profile-header Vavassor 2017-05-07 17:44:26 -0400
  • c353460fb1 Merge branch 'connyduck-light-header-background' Vavassor 2017-05-07 17:42:44 -0400
  • 238c577bbe Merge pull request #1 from Vavassor/master PhotonQyv 2017-05-07 22:38:57 +0100
  • e134e35a14 Merge branch 'light-header-background' of https://github.com/connyduck/Tusky into connyduck-light-header-background Vavassor 2017-05-07 17:29:55 -0400
  • 6a397478da Merge branch 'tryton-vanmeer-logout-confirm-dialogue' Closes #235 Vavassor 2017-05-07 17:22:07 -0400
  • e094765734 Merge branch 'logout-confirm-dialogue' of https://github.com/tryton-vanmeer/Tusky into tryton-vanmeer-logout-confirm-dialogue Vavassor 2017-05-07 17:03:37 -0400
  • bc7ac41a28 Merge pull request #275 from Pangoraw/master Vavassor 2017-05-07 16:47:19 -0400
  • 8787cf6beb Moves out-of-place Firebase InstanceId call to the google build flavor. Closes #274 Vavassor 2017-05-07 16:14:28 -0400
  • e1a3cb26a0 Updated and cleaned code so that it now only relaunches MainActivity if the 'Light Theme', 'Screen Keep on' settings are changed. PhotonQyv 2017-05-07 09:32:22 +0100
  • 85f0ef293b Moved the 'Keep Screen On' code to the BaseActivity class and also cleaned up some coding errors. Removed CheckPreferences class I added. PhotonQyv 2017-05-06 21:46:18 +0100
  • fc2d039d63 Add loader when waiting to display a media #275 Paul 2017-05-06 11:30:52 +0000
  • 2341eed133 Added Preference to Keep Screen n PhotonQyv 2017-05-05 22:54:59 +0100
  • 08cd604e66 Added string 'action_logout_confirm' #273 Tryton Van Meer 2017-05-05 12:19:34 -0400
  • a5e43446b5 logout() now creates a dialog asking the user if they wish to logout. Tryton Van Meer 2017-05-05 12:19:11 -0400
  • d34f4429cd fixed light theme header background when no header image was set #272 Conny Duck 2017-05-05 17:21:20 +0200
  • 31fff630f3 Fixes "google" build flavor, which was messed up by the repacking process. Vavassor 2017-05-04 19:02:18 -0400
  • aa2394748c Reorganizes the whole codebase. Vavassor 2017-05-04 18:55:34 -0400
  • 189cff6a47 i18n - Updating Arabic strings translation #271 ButterflyOfFire 2017-05-04 20:32:35 +0200
  • b97c4e24ed remove redundant account_header background, fix weird flicker in header when opening AccountActivity #270 Conny Duck 2017-05-04 18:07:59 +0200
  • 310d9a3c91 use TextInputEditText instead of EditText inside TextInputLayout #268 Conny Duck 2017-05-04 16:32:21 +0200
  • 4e4c39e58e added missing quotation marks in MediaTypeDeserializer #266 Conny Duck 2017-05-04 16:25:04 +0200
  • 2898baf18d updated dependencies #267 Conny Duck 2017-05-04 16:16:24 +0200
  • d5b4b0fe54 fixed crash when media type is unknown Conny Duck 2017-05-04 14:58:45 +0200
  • f93638e58d Fix spelling and translate new strings for Turkish #263 Caleb Maclennan 2017-05-04 10:54:38 +0300
  • ff073a6abf i18n: fixed some things in Polish translation #262 m4sk1n 2017-05-04 07:14:44 +0200
  • bdca1d1c94 Release 1.1.3 v1.1.3 Vavassor 2017-05-03 21:49:53 -0400
  • f313884f7d Adds a link to the text of a post when media is attached. Vavassor 2017-05-03 20:27:59 -0400
  • bd687fb45d Fixes crash on android version Lollipop and earlier due to an unsupported way vector drawable icons were assigned to radio buttons. Vavassor 2017-05-03 18:33:15 -0400
  • 24b7e4db4c Fixes reorienting creating a visual duplicate of the thread. Closes #237 Vavassor 2017-05-03 16:28:46 -0400
  • 7749c7f70b Merge branch 'nore715-patch-1' Vavassor 2017-05-03 15:17:09 -0400
  • 986e012dcf fixes merge conflicts Vavassor 2017-05-03 15:16:45 -0400
  • 229f1571b9 Merge branch 'BoFFire-patch-1' Vavassor 2017-05-03 15:07:51 -0400
  • 4e475b2a17 Merge branch 'patch-1' of https://github.com/BoFFire/Tusky into BoFFire-patch-1 Vavassor 2017-05-03 14:59:55 -0400
  • 1884ed3785 Merge branch 'm4sk1n-master' Vavassor 2017-05-03 14:57:29 -0400
  • b9a6ed00d1 Merge branch 'master' of https://github.com/m4sk1n/Tusky-i18n into m4sk1n-master Vavassor 2017-05-03 14:56:41 -0400
  • 495672a742 Merge branch 'connyduck-translation-2' Vavassor 2017-05-03 14:55:08 -0400
  • 4e88d5ecc4 Merge branch 'translation-2' of https://github.com/connyduck/Tusky into connyduck-translation-2 Vavassor 2017-05-03 14:51:42 -0400
  • 070c13e2f1 Merge branch 'Poulpette-french-tl-fixes' Vavassor 2017-05-03 14:44:00 -0400
  • 5c4456b164 Merge branch 'french-tl-fixes' of https://github.com/Poulpette/Tusky into Poulpette-french-tl-fixes Vavassor 2017-05-03 14:41:48 -0400
  • dc971ec36d Merge branch 'PhotonQyv-Fixed-issues-#190-&-#259-Screen-Orientation' Vavassor 2017-05-03 14:30:21 -0400
  • b047204577 fixes line endings back to LF Vavassor 2017-05-03 14:29:33 -0400
  • 89c984fe84 Add files via upload #261 PhotonQyv 2017-05-03 17:03:29 +0100
  • 7993fbc5b5 Add files via upload PhotonQyv 2017-05-03 17:02:22 +0100
  • ee8ad60d8c i18n: added Polish translation #260 Marcin Mikołajczak 2017-05-03 17:14:36 +0200
  • 9304410ece Update strings.xml in french translation #258 Paul 2017-05-03 11:35:49 +0200
  • 93e40dd53f Merge a1a631718b into f7915d614d #251 Yannick A 2017-05-03 09:28:34 +0000
  • 0950908d6a Merge cd46bc26cb into f7915d614d #254 S. Veyrié 2017-05-03 09:28:34 +0000
  • f7915d614d Fixes a crash when reorienting and downsizing an image for upload. Closes #247 Vavassor 2017-05-02 20:06:48 -0400
  • ab76121692 Change locked accounts to default visibility to "followers-only", and reorganizes the composer because it was getting cluttered. Vavassor 2017-05-02 18:17:54 -0400
  • 533466d811 Merge 27060690e1 into b6cf99602b #144 Zac 2017-05-02 03:40:05 +0000
  • b6cf99602b Switches back a foolish last second change that ruined the light theme toolbar text fix. Vavassor 2017-05-01 23:39:06 -0400
  • ba0ad09f19 Merge branch 'raphaelm-account_activity_title' Vavassor 2017-05-01 23:31:59 -0400
  • 07f22b2560 Fixes the text colour in the light theme for the collapsed toolbar in the account page. Vavassor 2017-05-01 23:31:31 -0400
  • 800ab8001e Adds content descriptions to header and avatar buttons in the profile editor and puts the page in a scroll view so it's navigable in landscape mode. Vavassor 2017-05-01 22:30:49 -0400
  • 34873423c7 Merge branch 'master' of http://github.com/Vavassor/Tusky Vavassor 2017-05-01 22:07:31 -0400
  • d4df8322b7 Merge branch 'daycode-profile-edition-design' Closes #77 Vavassor 2017-05-01 22:06:44 -0400
  • cfb0219536 Merge branch 'profile-edition-design' of https://github.com/daycode/Tusky into daycode-profile-edition-design Vavassor 2017-05-01 21:52:11 -0400
  • 9bb8c96f00 Merge branch 'issue_133' of https://github.com/raphaelm/Tusky into raphaelm-issue_133 Vavassor 2017-05-01 21:50:24 -0400
  • a592adbb56 Merge pull request #252 from PeterCxy/patch-super-create Vavassor 2017-05-01 21:46:37 -0400
  • b7a98ad228 updated german translation #257 Conny Duck 2017-05-01 16:18:01 +0200