aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cleaned up file handlingDaniel Gultsch2015-04-253-71/+87
|
* send invite to other instanzes after creating ad hoc conference. fixes #1136Daniel Gultsch2015-04-231-0/+8
|
* fixed direct invitesDaniel Gultsch2015-04-211-12/+28
|
* added missing translations from transifexDaniel Gultsch2015-04-2111-8/+24
|
* Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-04-201-2/+3
|\
| * added reference to the location plugin to READMEDaniel Gultsch2015-04-201-1/+2
| |
| * added amazon app store link (us store)Daniel Gultsch2015-04-201-1/+1
| |
* | pulled latest translations from transifexDaniel Gultsch2015-04-206-3/+727
|/
* always hide pgp snackbar after decrypting a message. fixes #1075Daniel Gultsch2015-04-201-0/+1
|
* removed some dead codeDaniel Gultsch2015-04-201-19/+0
|
* fixed weird touch on snackbar switched conversation bugDaniel Gultsch2015-04-201-3/+2
| | | | when touching the border of the snackbar or more precisely the space between the input field and the snackbar Conversations would switch into a random conversation for yet unknown reasons.
* some code clean up to fix some rare NPE’sDaniel Gultsch2015-04-192-4/+7
|
* increased undo delayiNPUTmice2015-04-171-1/+1
|
* fixed a bug in DNS helper code. fixes #1130iNPUTmice2015-04-162-2/+2
|
* bumped version to 1.3.0-alphaiNPUTmice2015-04-151-2/+2
|
* some bug fixes concerning 0byte files. fixes #1126iNPUTmice2015-04-152-1/+2
|
* maintain state when rotating settings activityiNPUTmice2015-04-142-18/+26
|
* Merge branch 'BrianBlade-dont_trust_cas_preference' into developmentiNPUTmice2015-04-145-5/+28
|\
| * Merge branch 'dont_trust_cas_preference' of ↵iNPUTmice2015-04-145-5/+28
|/| | | | | | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference Conflicts: src/main/res/values-de/strings.xml src/main/res/values/strings.xml
| * Add option to use MTM without default TrustManagerBrianBlade2015-04-115-4/+27
| | | | | | | | | | | | Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked.
* | always show save button when account info was modified. fixes #918iNPUTmice2015-04-141-5/+9
| |
* | fixed disable account when sliding and not clicking the toggleiNPUTmice2015-04-132-8/+9
| |
* | fixed typosiNPUTmice2015-04-132-2/+2
| |
* | Merge pull request #1123 from lookshe/developmentDaniel Gultsch2015-04-131-10/+18
|\ \ | | | | | | Bugfix for issue #1121
| * | Bugfix for issue #1121lookshe2015-04-131-10/+18
| | | | | | | | | | | | | | | | | | check with lowercase to also match JPEG, JPeg ... changed image url in comment
* | | shut up linteriNPUTmice2015-04-131-0/+1
| | |
* | | Maintain private chat on MUC. fixes #1097iNPUTmice2015-04-131-1/+0
| | |
* | | fixed regression where the selected conversation wasn't highlighted anymore ↵iNPUTmice2015-04-133-13/+12
|/ / | | | | | | on tabled layout
* | allow sharing multiple images at once. fixes #1090iNPUTmice2015-04-113-59/+111
| |
* | don't resume old session when changing resourceiNPUTmice2015-04-095-7/+35
| |
* | Merge pull request #1104 from BrianBlade/feature/swipe_out_conversationDaniel Gultsch2015-04-099-71/+185
|\ \ | | | | | | Enable end-conversation by swipe gesture
| * | Enable end-conversation by swipe gestureBrianBlade2015-04-089-71/+185
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4 to enable swipe-out for ListViews Re-enable selectableItemBackground Dont end selectedConversation on swipe Call mConversationFragment.reinit() instead. Add separate undo string for swipe MUC. Add blacklistedConversation for undo swipe Update title_undo_swipe_* strings Fix undo(), rename blacklistedConversation Fix discardUndo(); re-init selectedConversation maintain scroll position after undo clear notification when dismissing a conversation modified / simplified maintain scroll position code simplify handling of selectedConversation change undo_muc string, remove notifyDataSetChanged()
* | Merge pull request #1099 from BrianBlade/fix_otr_error_msgsDaniel Gultsch2015-04-022-18/+24
|\ \ | | | | | | Fix OTR-Error messages (#1021)
| * | Fix OTR-Error messagesBrianBlade2015-04-012-18/+24
| |/ | | | | | | | | Send out OTR-Errors on unreadableMessageReceived() as well, not only on messageFromAnotherInstanceReceived
* | Merge branch 'BrianBlade-account_state_switch' into developmentiNPUTmice2015-04-013-17/+49
|\ \
| * | do not overlap account title and switchiNPUTmice2015-04-011-1/+4
| | |
| * | Merge branch 'account_state_switch' of ↵iNPUTmice2015-04-013-16/+45
|/| | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-account_state_switch
| * | Add toggle account-state switchBrianBlade2015-04-013-16/+45
| |/ | | | | | | | | Add a switch to AccountAdapter that allows self-contained enabling/disabling of accounts without the need to bring up the context-menu
* | Merge pull request #1076 from rk4an/patch-1Daniel Gultsch2015-04-011-0/+4
|\ \ | | | | | | Update french translation
| * | Update french translationErkan2015-03-221-0/+4
| |/
* / pulled translations from transifexiNPUTmice2015-04-017-15/+466
|/
* bump version code1.2.0iNPUTmice2015-03-221-2/+2
|
* pulled translationsiNPUTmice2015-03-225-0/+21
|
* properly set chat states when receiving otr status messagesiNPUTmice2015-03-211-1/+1
|
* respond to unreadable OTR messages with error message. fixed #1021iNPUTmice2015-03-215-3/+42
|
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2015-03-201-1/+1
|\
| * Update CHANGELOG.mdDaniel Gultsch2015-03-191-1/+1
| | | | | | fixed plugin link
* | wait for session iq to return sucessfully before sending other stanzas. ↵iNPUTmice2015-03-201-26/+42
|/ | | | fixed #1017
* version bump to 1.2.0-beta1.2.0-betaiNPUTmice2015-03-192-3/+5
|
* don't update presence for muc messagesiNPUTmice2015-03-191-5/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 03:51:05 +0000