aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-02-093-2/+3
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-02-091-6/+7
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-154-87/+7
|\| | | | | | | Cast problem fixed
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-154-65/+62
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-151-3/+3
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-151-2/+12
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-1318-240/+246
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-081-1/+12
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-041-1/+1
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-166-189/+54
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-112-208/+98
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-1025-58/+89
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-063-2/+15
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-043-16/+44
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-042-9/+7
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-1/+1
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-0226-217/+217
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-0617-579/+226
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-037-170/+249
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-236-13/+19
|\|
* | Merge trz/rename into trz/rebasesteckbrief2015-10-2222-344/+236
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-153-36/+64
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-055-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 importslookshe2015-10-051-1/+1
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-056-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 location0.0.3lookshe2015-08-162-166/+0
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-162-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.conversationsplussteckbrief2015-06-19126-26217/+0
| | | | | | | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | | fixes FS#44 - IOException if content-length is not presentlookshe2015-08-211-3/+3
| |/ |/|
* | fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conferencelookshe2015-08-163-3/+15
| |
* | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-164-137/+8
| |
* | Fixes FS#15 - Adding smiley only possible at the endlookshe2015-08-161-21/+13
| | | | | | | | Removed unnecessary ClickedListeners
* | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-167-29/+21
| | | | | | | | Fixes FS#34 - review all calls for String.trim()
* | - Introduction of SwipeRefreshLayout for conversation viewsteckbrief2015-08-124-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 namelookshe2015-08-121-7/+18
| |
* | Fixes FS#33 - Get back the commentlookshe2015-08-121-0/+5
| |
* | Fixes FS#20: Limitation of end conversation swipe to left sidesteckbrief2015-08-111-58/+59
| |
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-1161-2117/+3770
| |
* | Show Online status in contact list with respect to SHOW_ONLINE_STATUS preferencesteckbrief2015-06-191-2/+4
| |
* | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-195-0/+33
|/
* changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-144-13/+7
| | | | settings class
* check with lowercase to also match JPEG, JPeg ...lookshe2015-04-131-1/+1
|
* changed last message in overview also to EmojiconTextView for displaying ↵lookshe2015-04-121-1/+3
| | | | smileys correctly
* better and perhaps faster way for checking if a message is downloadablelookshe2015-04-121-10/+18
|
* implementation for downloading only when enabled wlanlookshe2015-04-124-3/+30
|
* added settings for accepting and downloading fileslookshe2015-04-121-1/+2
| | | | fix in Settings, initialize with same values like in preferences.xml
* whatsapp-like smiley implementationlookshe2015-04-123-19/+143
|
* whatsapp-like smiley implemantationlookshe2015-04-121-1/+2
|
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵steckbrief2015-04-114-19/+25
|\ | | | | | | trz/master
| * show online status under avatar in same way for muc as the send button doeslookshe2015-04-111-13/+18
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 01:51:50 +0000