|
|
a9279c2001
|
adjust version code to match fdroid regex
|
2015-08-13 16:04:04 +02:00 |
|
|
|
639babfdb5
|
Merge branch 'trz/rebase' into trz/rename
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
|
2015-08-11 20:30:11 +02:00 |
|
|
|
8fd688ca96
|
Merge tag '1.5.2' into trz/rebase
|
2015-08-11 17:35:53 +02:00 |
|
steckbrief
|
553f41a2db
|
Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference
|
2015-06-19 23:12:24 +02:00 |
|
steckbrief
|
a73ce32e27
|
Status color added to "create conversation" (refers to ticket #22 in flyspray)
|
2015-06-19 23:11:44 +02:00 |
|
steckbrief
|
1b5966ae3b
|
App-Name changed to "Conversations+" in strings.xml
|
2015-06-19 09:47:04 +02:00 |
|
steckbrief
|
a7121b51b8
|
Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference
|
2015-06-19 09:47:04 +02:00 |
|
steckbrief
|
b6584dfd0b
|
Status color added to "create conversation" (refers to ticket #22 in flyspray)
|
2015-06-19 09:47:04 +02:00 |
|
steckbrief
|
7382e3af97
|
renaming eu.siacs.conversations to de.thedevstack.conversationsplus
"renaming eu.siacs.conversations to de.thedevstack.conversationsplus"
package renaming completed
|
2015-06-19 09:46:40 +02:00 |
|
|
|
b3b4a2902e
|
moved color picker to libs
|
2015-04-15 21:43:53 +02:00 |
|
|
|
549810783c
|
changed received and read confirmation setting to one list and put it to settings class
|
2015-04-14 23:48:28 +02:00 |
|
|
|
8932dd9fb3
|
adjusted todo
|
2015-04-14 00:06:53 +02:00 |
|
|
|
516c343e8a
|
check with lowercase to also match JPEG, JPeg ...
|
2015-04-13 15:55:00 +02:00 |
|
|
|
12486e9a29
|
adjusted todo
|
2015-04-13 11:19:42 +02:00 |
|
|
|
ae8a2467aa
|
changed last message in overview also to EmojiconTextView for displaying smileys correctly
|
2015-04-12 23:37:58 +02:00 |
|
|
|
573bfed961
|
adjusted todo
|
2015-04-12 23:10:21 +02:00 |
|
|
|
3ef609cfbd
|
better and perhaps faster way for checking if a message is downloadable
|
2015-04-12 23:09:53 +02:00 |
|
|
|
03bc7dcdc9
|
new settings to initialisation of Settings
|
2015-04-12 23:09:10 +02:00 |
|
|
|
7405d50c70
|
implementation for downloading only when enabled wlan
|
2015-04-12 21:28:45 +02:00 |
|
|
|
56e695cf1b
|
added settings for accepting and downloading files
fix in Settings, initialize with same values like in preferences.xml
|
2015-04-12 20:59:12 +02:00 |
|
|
|
98c09f18a2
|
add missing resource files
|
2015-04-12 17:25:50 +02:00 |
|
|
|
d64aa6407c
|
Merge remote-tracking branch 'origin/trz/master' into trz/master
|
2015-04-12 17:24:10 +02:00 |
|
|
|
cae106e310
|
whatsapp-like smiley implementation
|
2015-04-12 17:22:53 +02:00 |
|
|
|
972c65b775
|
whatsapp-like smiley implemantation
|
2015-04-12 17:21:35 +02:00 |
|
|
|
fd5f36b864
|
adjusted todo
|
2015-04-12 12:09:18 +02:00 |
|
steckbrief
|
deac0df707
|
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
|
2015-04-11 23:00:31 +02:00 |
|
steckbrief
|
17779e7700
|
Color choose dialog
|
2015-04-11 23:00:10 +02:00 |
|
|
|
82bfd8ac33
|
show online status under avatar in same way for muc as the send button does
|
2015-04-11 21:49:48 +02:00 |
|
|
|
ae520c2957
|
differ between received and read message
|
2015-04-11 21:48:55 +02:00 |
|
|
|
94a669fcb8
|
no trim of messages or password
check password with only spaces separately
|
2015-04-11 20:53:25 +02:00 |
|
|
|
3a814addab
|
correct parsing of led color
|
2015-04-11 20:23:25 +02:00 |
|
|
|
c829f612cd
|
todo added
|
2015-04-11 17:24:06 +02:00 |
|
|
|
df63c14617
|
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
|
2015-04-11 14:15:07 +02:00 |
|
|
|
87e56b534a
|
changed distribution url due to bug: http://stackoverflow.com/questions/29576097/gradle-sync-error-in-android-studio-when-importing-project/29576568#29576568
|
2015-04-11 14:14:43 +02:00 |
|
steckbrief
|
e17b75511e
|
timestamp parsing reverted
|
2015-03-31 16:30:47 +02:00 |
|
steckbrief
|
6220260df3
|
Configurable LED color (Attention: Expert setting because currently only text input)
|
2015-03-31 15:26:26 +02:00 |
|
steckbrief
|
52ed924a13
|
Changes for emoticon parser reactivated
|
2015-03-31 14:13:12 +02:00 |
|
steckbrief
|
75c5275f7e
|
Merge tag '1.2.0' into trz/master
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
|
2015-03-30 22:12:49 +02:00 |
|
iNPUTmice
|
7eabdfd80f
|
bump version code
|
2015-03-22 19:42:40 +01:00 |
|
iNPUTmice
|
ad8f1902d1
|
pulled translations
|
2015-03-22 18:56:28 +01:00 |
|
iNPUTmice
|
c47d1e83c1
|
properly set chat states when receiving otr status messages
|
2015-03-21 16:43:03 +01:00 |
|
iNPUTmice
|
99b2ef7e9d
|
respond to unreadable OTR messages with error message. fixed #1021
|
2015-03-21 16:07:17 +01:00 |
|
iNPUTmice
|
825278971e
|
Merge branch 'development' of github.com:siacs/Conversations into development
|
2015-03-20 22:40:06 +01:00 |
|
iNPUTmice
|
da099e5fa4
|
wait for session iq to return sucessfully before sending other stanzas. fixed #1017
|
2015-03-20 21:48:45 +01:00 |
|
Daniel Gultsch
|
30e2dee456
|
Update CHANGELOG.md
fixed plugin link
|
2015-03-19 19:45:47 +01:00 |
|
iNPUTmice
|
5793fb680f
|
version bump to 1.2.0-beta
|
2015-03-19 19:40:42 +01:00 |
|
iNPUTmice
|
442ae12ee5
|
don't update presence for muc messages
|
2015-03-19 19:40:24 +01:00 |
|
iNPUTmice
|
0d6475d0d9
|
pulled more translations
|
2015-03-19 19:32:24 +01:00 |
|
Daniel Gultsch
|
382bcc4cb5
|
Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen
add delivery receipts for private muc msgs & enable update last-seen for muc-msgs
|
2015-03-19 18:47:33 +01:00 |
|
BrianBlade
|
1c600fefcf
|
# add delivery receipts for private muc msgs
# enable update last-seen for muc-msgs
|
2015-03-18 21:49:41 +01:00 |
|
