aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-031-0/+20
|\
| * Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-031-0/+20
| | | | | | | | picture or not
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-161-1/+2
|\|
| * Fixes FS#82: Background color of conversation list item set to primary ↵steckbrief2015-10-161-1/+2
| | | | | | | | background color
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-055-6/+188
|\| | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
| * Publishing additional information in message details dialog such as message ↵steckbrief2015-10-041-10/+51
| | | | | | | | type and message status
| * Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-042-0/+140
| | | | | | | | | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
| * Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-021-4/+5
| |
| * Fixes FS#50: Replace phone numbers and email addresses in messages with linkssteckbrief2015-09-022-2/+2
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-161-0/+8
| |\ | |/ |/| | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1124-201/+227
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml
| * | 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-192-3/+3
| | | | | | | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | | - Introduction of SwipeRefreshLayout for conversation viewsteckbrief2015-08-121-0/+8
| |/ |/| | | | | | | - OnScrollListener for ListView of messages removed and replaced with swipe refresh - Loading of messages now possible even if no message is present in conversation
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-1124-201/+227
| |
* | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-2/+9
|/
* moved color picker to libslookshe2015-04-152-145/+0
|
* changed last message in overview also to EmojiconTextView for displaying ↵lookshe2015-04-121-3/+6
| | | | smileys correctly
* whatsapp-like smiley implementationlookshe2015-04-123-7/+22
|
* Color choose dialogsteckbrief2015-04-112-0/+145
|
* Merge master-originsteckbrief2015-02-2010-136/+209
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
| * Use Material Design Icons on API 21+Sam Whited2015-01-293-4/+4
| |
| * always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-211-0/+7
| |
| * Fixed action bar search for Android 5.0iNPUTmice2015-01-201-4/+4
| |
| * explain read markeriNPUTmice2015-01-181-0/+13
| |
| * Fix bottom padding on about pageSam Whited2015-01-131-1/+1
| |
| * make use of different dimensions for different screen sizesDaniel Gultsch2015-01-136-15/+39
| |
| * Use margin instead of padding in about screenSam Whited2015-01-121-4/+4
| |
| * shortened some stringDaniel Gultsch2015-01-111-0/+1
| |
| * fixed #860Daniel Gultsch2015-01-101-0/+1
| |
| * allow for very basic muc configurationDaniel Gultsch2015-01-081-115/+142
| |
* | - Avoiding accessing shared preferences to know if emoticons should be ↵steckbrief2015-01-201-1/+11
|/ | | | | | parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")
* added missing layout fileDaniel Gultsch2015-01-031-0/+105
|
* migrated change password into separate activityDaniel Gultsch2015-01-031-9/+0
|
* fixed layout fileDaniel Gultsch2015-01-021-1/+1
|
* improved OTR verification part oneDaniel Gultsch2015-01-021-188/+146
|
* code cleanup for change password stuffDaniel Gultsch2014-12-251-1/+1
|
* Add ability to change password on serverSam Whited2014-12-251-2/+9
| | | | Fixes #260
* Add more server compatibility info.Sam Whited2014-12-231-4/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | Hide server info behind a checkbox. Add XEP-0352 support to the server info list Add XEP-0237 to server info list Add XEP-0352 support to the server info list Add MaM and Blocking to the account XEPs list Also add a toggle button to hide some of the list Rebase on current codebase Make MAM string more descriptive Change show more button to checkbox menu item Shorten `MAM (History)' to `MAM' Order XEP list and hide all by default Supress warning (which is wrong anyways) Change `Show more' to `Show more info'
* Accessibility: Add missing image descriptionsSam Whited2014-11-292-3/+6
|
* show dynamic tags in contacts activity as welliNPUTmice2014-11-181-12/+7
|
* happy hanukkahiNPUTmice2014-11-162-1/+20
|
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-161-5/+5
|
* added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-111-0/+12
|
* initial smp supportiNPUTmice2014-11-112-60/+177
|
* reformated license a bitiNPUTmice2014-11-041-3/+3
|
* Shorten license text and fix height of scrollviewSam Whited2014-11-041-2/+2
|
* Use normal text size and colorSam Whited2014-11-041-1/+4
|
* Make links clickable in about textSam Whited2014-11-041-1/+3
|
* Convert about dialog to activitySam Whited2014-11-041-0/+16
|