aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Compile Clean after mergetrz/merge_1.5.2steckbrief2015-08-112-40/+16
|
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-11351-457/+3246
|\
| * pulled new translations from transifexDaniel Gultsch2015-07-212-1/+6
| |
| * pulled translationsDaniel Gultsch2015-07-187-1/+15
| |
| * version bump to 1.5.0-beta.2Daniel Gultsch2015-07-161-1/+1
| |
| * fixed some ux glitches in editaccountDaniel Gultsch2015-07-162-2/+0
| |
| * removed empty translation fileDaniel Gultsch2015-07-161-2/+0
| |
| * made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-1627-103/+332
| |
| * renamed colorsDaniel Gultsch2015-07-1334-152/+153
| |
| * display toast in ui on failed http downloadDaniel Gultsch2015-07-101-0/+1
| | | | | | | | fixes #954
| * refactored message context menuDaniel Gultsch2015-07-022-10/+15
| |
| * pulled new translations from transifexDaniel Gultsch2015-06-232-3/+20
| |
| * pulled new translations from transifexDaniel Gultsch2015-06-102-0/+10
| |
| * upgrade build toolsDaniel Gultsch2015-06-021-2/+0
| |
| * pulled translations from transifexDaniel Gultsch2015-05-264-0/+20
| |
| * added choose picture as another quick action. fixes #1221Daniel Gultsch2015-05-2621-0/+2
| |
| * pulled translations from transifexDaniel Gultsch2015-05-207-0/+35
| |
| * pulled new translations from transifexDaniel Gultsch2015-05-163-52/+302
| |
| * pulled updated translations from transifexDaniel Gultsch2015-05-112-2/+4
| |
| * rewrote parts of message adapter to avoid using NULL viewsDaniel Gultsch2015-05-111-7/+0
| |
| * changed conversation red to material redDaniel Gultsch2015-05-1026-1/+1
| |
| * turn send button in cancel button while in whisper modeDaniel Gultsch2015-05-0320-0/+0
| |
| * replace send button with quick action button as long as no text has been enteredDaniel Gultsch2015-05-02115-405/+433
| |
| * pulled translations from transifexDaniel Gultsch2015-05-012-0/+70
| |
| * pulled translations from transifexDaniel Gultsch2015-04-298-1/+607
| |
| * adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar)Daniel Gultsch2015-04-283-0/+0
| |
| * increased padding on image buttons on v21 to match material guidelinesDaniel Gultsch2015-04-285-7/+9
| |
| * made material icons smaller (24dp)Daniel Gultsch2015-04-28133-17/+15
| |
| * increased padding around switches in manage accountsDaniel Gultsch2015-04-271-2/+4
| |
| * pulled translations from transifexDaniel Gultsch2015-04-269-3/+205
| |
| * Merge pull request #1135 from BrianBlade/manage_certificatesDaniel Gultsch2015-04-253-5/+33
| |\ | | | | | | Add option to remove manually approved certificates
| | * Add option to remove manually approved certificatesBrianBlade2015-04-193-5/+33
| | | | | | | | | | | | | | | | | | | | | - "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options"
| * | added missing translations from transifexDaniel Gultsch2015-04-2111-8/+24
| | |
| * | pulled latest translations from transifexDaniel Gultsch2015-04-206-3/+727
| |/
| * maintain state when rotating settings activityiNPUTmice2015-04-141-4/+10
| |
| * Merge branch 'dont_trust_cas_preference' of ↵iNPUTmice2015-04-143-1/+10
| |\ | | | | | | | | | | | | | | | | | | | | | 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-113-0/+9
| | | | | | | | | | | | | | | | | | 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.
| * | fixed regression where the selected conversation wasn't highlighted anymore ↵iNPUTmice2015-04-131-1/+1
| | | | | | | | | | | | on tabled layout
| * | Enable end-conversation by swipe gestureBrianBlade2015-04-086-62/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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()
| * | do not overlap account title and switchiNPUTmice2015-04-011-1/+4
| | |
| * | Merge branch 'account_state_switch' of ↵iNPUTmice2015-04-011-0/+8
| |\ \ | | | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-account_state_switch
| | * | Add toggle account-state switchBrianBlade2015-04-011-0/+8
| | |/ | | | | | | | | | | | | 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
| |/
* | Merge branch 'trz/rename' (early part) into trz/masterlookshe2015-06-191-2/+9
|\ \ | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
| * | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-2/+9
| | |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-193-6/+6
|/ / | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | moved color picker to libslookshe2015-04-1517-151/+0
| |
* | changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-144-68/+83
| | | | | | | | settings class
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 16:33:32 +0000