3eb1387299
Merge branch 'trz/rebase' into trz/rename
2015-08-16 23:44:01 +02:00
b936af529f
fix wrong class type usage
2015-08-16 22:39:26 +02:00
caefd38f96
moved merged files to correct location
2015-08-16 19:14:01 +02:00
9181767ac6
version bump to 0.0.3
2015-08-16 18:47:25 +02:00
89b28a4965
Merge branch 'trz/rebase' into trz/rename
...
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
2015-08-16 18:45:08 +02:00
0321ebb7a6
fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conference
2015-08-16 18:33:10 +02:00
3be4dbf66a
fixes FS#13 - Change smiley replacement patterns to be case insensitive
2015-08-16 17:56:46 +02:00
ea1debd8f7
Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module
2015-08-16 17:30:06 +02:00
b670609893
Fixes FS#15 - Adding smiley only possible at the end
...
Removed unnecessary ClickedListeners
2015-08-16 00:32:12 +02:00
fe3a3c2471
Fixes FS#37 - Remove special treatment of unicode hearts
...
Fixes FS#34 - review all calls for String.trim()
2015-08-16 00:02:14 +02:00
cfefe9a0bd
Merged https://github.com/ankushsachdeva/emojicon/pull/16
2015-08-15 23:45:43 +02:00
a76de90fe7
resolve of some compiler errors
2015-08-13 16:15:14 +02:00
a9279c2001
adjust version code to match fdroid regex
2015-08-13 16:04:04 +02:00
steckbrief
79c585144d
- Introduction of SwipeRefreshLayout for conversation view
...
- OnScrollListener for ListView of messages removed and replaced with swipe refresh
- Loading of messages now possible even if no message is present in conversation
2015-08-12 23:01:37 +02:00
0ee1992da2
Fixes FS#38 - Issues with URLs with multiple dots in file name
2015-08-12 19:20:24 +02:00
473f035355
Fixes FS#33 - Get back the comment
2015-08-12 18:28:56 +02:00
steckbrief
b085643555
Fixes FS#20: Limitation of end conversation swipe to left side
2015-08-11 22:19:48 +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
