| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-05 | 5 | -35/+12 |
| |\ | | | | | | | | | | | | | | | Manually merged conflicting files: src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/ui/AboutPreference.java | ||||
| * | | fixed importstrz/1.5.2.2 | lookshe | 2015-10-05 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2015-10-05 | 6 | -9/+40 |
| |\| | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | ||||
| | * | moved merged files to correct location | lookshe | 2015-08-16 | 2 | -166/+0 |
| | | | |||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2015-08-16 | 2 | -0/+166 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java | ||||
| | * | | renaming eu.siacs.conversations to de.thedevstack.conversationsplus | steckbrief | 2015-06-19 | 126 | -26217/+0 |
| | | | | | | | | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed | ||||
| * | | | fixes FS#44 - IOException if content-length is not present | lookshe | 2015-08-21 | 1 | -3/+3 |
| | |/ |/| | |||||
| * | | fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conference | lookshe | 2015-08-16 | 3 | -3/+15 |
| | | | |||||
| * | | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module | lookshe | 2015-08-16 | 4 | -137/+8 |
| | | | |||||
| * | | Fixes FS#15 - Adding smiley only possible at the end | lookshe | 2015-08-16 | 1 | -21/+13 |
| | | | | | | | | | Removed unnecessary ClickedListeners | ||||
| * | | Fixes FS#37 - Remove special treatment of unicode hearts | lookshe | 2015-08-16 | 7 | -29/+21 |
| | | | | | | | | | Fixes FS#34 - review all calls for String.trim() | ||||
| * | | - Introduction of SwipeRefreshLayout for conversation view | steckbrief | 2015-08-12 | 4 | -169/+263 |
| | | | | | | | | | | | - OnScrollListener for ListView of messages removed and replaced with swipe refresh - Loading of messages now possible even if no message is present in conversation | ||||
| * | | Fixes FS#38 - Issues with URLs with multiple dots in file name | lookshe | 2015-08-12 | 1 | -7/+18 |
| | | | |||||
| * | | Fixes FS#33 - Get back the comment | lookshe | 2015-08-12 | 1 | -0/+5 |
| | | | |||||
| * | | Fixes FS#20: Limitation of end conversation swipe to left side | steckbrief | 2015-08-11 | 1 | -58/+59 |
| | | | |||||
| * | | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1 | lookshe | 2015-08-11 | 61 | -2117/+3770 |
| | | | |||||
| * | | Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference | steckbrief | 2015-06-19 | 1 | -2/+4 |
| | | | |||||
| * | | Status color added to "create conversation" (refers to ticket #22 in flyspray) | steckbrief | 2015-06-19 | 5 | -0/+33 |
| |/ | |||||
| * | changed received and read confirmation setting to one list and put it to ↵ | lookshe | 2015-04-14 | 4 | -13/+7 |
| | | | | | settings class | ||||
| * | check with lowercase to also match JPEG, JPeg ... | lookshe | 2015-04-13 | 1 | -1/+1 |
| | | |||||
| * | changed last message in overview also to EmojiconTextView for displaying ↵ | lookshe | 2015-04-12 | 1 | -1/+3 |
| | | | | | smileys correctly | ||||
| * | better and perhaps faster way for checking if a message is downloadable | lookshe | 2015-04-12 | 1 | -10/+18 |
| | | |||||
| * | implementation for downloading only when enabled wlan | lookshe | 2015-04-12 | 4 | -3/+30 |
| | | |||||
| * | added settings for accepting and downloading files | lookshe | 2015-04-12 | 1 | -1/+2 |
| | | | | | fix in Settings, initialize with same values like in preferences.xml | ||||
| * | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 3 | -19/+143 |
| | | |||||
| * | whatsapp-like smiley implemantation | lookshe | 2015-04-12 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵ | steckbrief | 2015-04-11 | 4 | -19/+25 |
| |\ | | | | | | | trz/master | ||||
| | * | show online status under avatar in same way for muc as the send button does | lookshe | 2015-04-11 | 1 | -13/+18 |
| | | | |||||
| | * | differ between received and read message | lookshe | 2015-04-11 | 3 | -6/+7 |
| | | | |||||
| * | | Color choose dialog | steckbrief | 2015-04-11 | 1 | -10/+2 |
| |/ | |||||
| * | no trim of messages or password | lookshe | 2015-04-11 | 5 | -9/+11 |
| | | | | | check password with only spaces separately | ||||
| * | correct parsing of led color | lookshe | 2015-04-11 | 1 | -1/+1 |
| | | |||||
| * | timestamp parsing reverted | steckbrief | 2015-03-31 | 1 | -5/+20 |
| | | |||||
| * | Configurable LED color (Attention: Expert setting because currently only ↵ | steckbrief | 2015-03-31 | 1 | -1/+10 |
| | | | | | text input) | ||||
| * | Changes for emoticon parser reactivated | steckbrief | 2015-03-31 | 2 | -6/+8 |
| | | |||||
| * | Merge tag '1.2.0' into trz/master | steckbrief | 2015-03-30 | 48 | -517/+1609 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml | ||||
| | * | properly set chat states when receiving otr status messages | iNPUTmice | 2015-03-21 | 1 | -1/+1 |
| | | | |||||
| | * | respond to unreadable OTR messages with error message. fixed #1021 | iNPUTmice | 2015-03-21 | 5 | -3/+42 |
| | | | |||||
| | * | wait for session iq to return sucessfully before sending other stanzas. ↵ | iNPUTmice | 2015-03-20 | 1 | -26/+42 |
| | | | | | | | | | fixed #1017 | ||||
| | * | don't update presence for muc messages | iNPUTmice | 2015-03-19 | 1 | -5/+2 |
| | | | |||||
| | * | Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen | Daniel Gultsch | 2015-03-19 | 4 | -8/+24 |
| | |\ | | | | | | | add delivery receipts for private muc msgs & enable update last-seen for muc-msgs | ||||
| | | * | # add delivery receipts for private muc msgs | BrianBlade | 2015-03-18 | 4 | -8/+24 |
| | | | | | | | | | | | | | # enable update last-seen for muc-msgs | ||||
| | * | | Merge pull request #1043 from strb/choose_contact_multiple_squashed | Daniel Gultsch | 2015-03-18 | 2 | -6/+121 |
| | |\ \ | | | | | | | | | Added multiple select to Choose Contact Activity (squashed) | ||||
| | | * | | Added multiple select to Choose Contact Activity | Andreas Straub | 2015-03-18 | 2 | -6/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing the Choose Contact Activity a boolean called "multiple" set to true, it now allows the user to select multiple contacts. Long pressing a contact enters multiple selection mode and the selection is confirmed using a button in the CAB. The Activity returns whether or not multiple contacts were selected using the same boolean. If multiple contacts were selected, an array of JID strings called "contacts" is returned. The Choose Contact Activity now also honors "filter_contacts", an array of strings containing JIDs that should not be displayed in the picker. The invite to conference dialog now uses this feature to enable inviting multiple contacts at once. Additionally, Invite Contact uses "filter_contacts" to only display contacts that are not yet participating in the conversation | ||||
| | * | | | Merge pull request #1036 from QuentinC/development | Daniel Gultsch | 2015-03-18 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | Green led color is better with "full-green" | ||||
| | | * | | | Green led color is better with "full-green" | Quentin | 2015-03-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Set file size also for cached avatars | Holger Weiß | 2015-03-17 | 1 | -29/+31 |
| | | |/ / | |/| | | |||||
| | * | | | Do not Strigprep JIDs from database | Mateusz "maxmati" Nowoty?ski | 2015-03-11 | 4 | -11/+13 |
| | | | | | |||||
| | * | | | add context menu entries for geo uris | iNPUTmice | 2015-03-11 | 1 | -17/+33 |
| | | | | | |||||
| | * | | | open location directly from notification | iNPUTmice | 2015-03-10 | 1 | -0/+25 |
| | | | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |