archive/conversations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3572 commits 48 branches 148 tags 28 MiB
Commit graph

3572 commits

This branch
This branch
All branches
Author SHA1 Message Date
steckbrief
aeda55ba7c Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message' 2016-04-07 16:13:03 +02:00
steckbrief
8c3245dd1f Implements FS#187: Add single line copy to logcat view 2016-04-07 14:28:19 +02:00
steckbrief
18548e9ebb Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences 2016-04-06 22:41:21 +02:00
lookshe
1e1f7f419e Merge branch 'trz/rebase' into trz/rename (skip beta logo) 2016-04-06 00:09:38 +02:00
lookshe
aa9b5036d2 update to beta-2 and new logo for beta 2016-04-06 00:08:12 +02:00
lookshe
0beb3ca30b Merge branch 'trz/rebase' into trz/rename 2016-04-05 23:35:38 +02:00
lookshe
6899b9b01e Merge branch 'trz/rebase' (early part) into trz/rename 2016-04-05 23:25:52 +02:00
lookshe
d6a076e112 Merge tag '1.11.3' into trz/rebase 2016-04-05 23:24:49 +02:00
lookshe
bfb3cb8445 Merge branch 'trz/rename' into trz/rebase (skip translation) 2016-04-03 20:49:51 +02:00
lookshe
f82adbac65 conversations->conversations+ 2016-04-03 20:47:22 +02:00
lookshe
d2834ccfd1 fixed installation error "W/PackageManager: Can't install because provider name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus" 2016-04-03 16:24:47 +02:00
lookshe
62b87d0796 update build.gradle for beta 2016-04-03 15:47:32 +02:00
lookshe
ea9e456583 fixed build error 2016-04-03 15:47:04 +02:00
Daniel Gultsch
5eedce91f9 version bump to 1.11.3 and changelog 2016-04-02 18:09:07 +02:00
Daniel Gultsch
701742f550 don't ask for resource when server uses http upload v0.1 2016-04-02 18:07:38 +02:00
lookshe
157c1ee2e1 Pulled translations from transifex 2016-04-01 16:18:39 +02:00
lookshe
1282896ae8 Fixes FS#180: Conference notification icon missing 2016-04-01 16:18:39 +02:00
lookshe
4fcefc8788 Merge branch 'trz/rename' into trz/rebase 2016-04-01 16:18:10 +02:00
lookshe
5f78282135 Pulled translations from transifex 2016-04-01 16:14:32 +02:00
lookshe
3f38eb3bf4 Fixes FS#180: Conference notification icon missing 2016-04-01 16:10:12 +02:00
Daniel Gultsch
2549ce89b0 check max http file size when attaching files 2016-04-01 00:03:14 +02:00
Daniel Gultsch
74c496fe3e add methods to check max file size for http upload 2016-03-31 21:56:59 +02:00
Daniel Gultsch
e074104004 save otr fingerprint in message 2016-03-31 21:15:49 +02:00
Daniel Gultsch
867d0ef191 include form fields into caps hash calculation 2016-03-31 14:21:56 +02:00
Daniel Gultsch
8d98c52803 closed some cursors under error conditions 2016-03-31 13:55:46 +02:00
Daniel Gultsch
343a6b4e6b made setting aes keys in DownloadableFile more readable 2016-03-31 13:55:25 +02:00
steckbrief
933905767c Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2016-03-30 22:57:17 +02:00
steckbrief
7c0c1b7e49 Fixes FS#179: Avoid showing always empty list of ressources for mucs 2016-03-30 22:54:05 +02:00
lookshe
a8f667e11f Merge branch 'trz/rename' into trz/rebase 2016-03-30 01:02:32 +02:00
lookshe
51d1d2226a no resize of input field when inserting emojicon (FS#175) 2016-03-30 01:02:00 +02:00
lookshe
b8f97a7072 Fixes FS#174: Displaying of ASCII emoticons differs 2016-03-30 01:02:00 +02:00
lookshe
403e5696d2 Logging for FS#80 to identify calling method 2016-03-30 01:02:00 +02:00
steckbrief
5021c1c194 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2016-03-29 23:10:31 +02:00
steckbrief
75659ddc12 Fixes FS#172: Conversations list not updated on status changes 2016-03-29 23:09:43 +02:00
steckbrief
074ff79fd9 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 
Conflicts:
	src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
 2016-03-29 22:38:11 +02:00
steckbrief
37c5a7c522 Removed unnecessary import 2016-03-29 22:36:40 +02:00
steckbrief
a0c4b022de Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 
Conflicts:
	src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
	src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
	src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
 2016-03-29 22:35:28 +02:00
steckbrief
bcf0d929dd Avoid unnecessary text change on activate account button 2016-03-29 22:30:13 +02:00
steckbrief
1d5d94080a Introduction of a TextViewUtil to easily set attributes for TextViews 2016-03-29 22:28:19 +02:00
steckbrief
e388dfc0b8 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 
Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
	src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
	src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
	src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
 2016-03-29 11:53:34 +02:00
steckbrief
6244834096 Implements FS#173: Move access to colors to separate helper class 2016-03-29 11:43:22 +02:00
steckbrief
77b1f2138e Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2016-03-28 23:20:44 +02:00
steckbrief
0c0676b7db Merge branch 'master' of repos.thedevstack.de:conversations-plus 2016-03-28 23:19:19 +02:00
steckbrief
f2e361d273 Fixes FS#170: Message Details: Status display has different Text color 2016-03-28 23:17:24 +02:00
steckbrief
eda5a98448 Implements FS#176: error logging for httpupload improved 2016-03-28 23:15:24 +02:00
Daniel Gultsch
d115f38361 Merge pull request #1784 from kriztan/patch-2 
Update ShortcutBadger to version 1.1.4
 2016-03-28 14:15:35 +02:00
Christian S
1d458e8ab3 Update ShortcutBadger to version 1.1.4 2016-03-27 20:17:51 +02:00
lookshe
27ca7f72d1 wrong import in new class 2016-03-27 17:27:06 +02:00
lookshe
0fab4767fd Merge branch 'trz/rename' into trz/rebase 2016-03-27 17:18:52 +02:00
lookshe
fd6f0a842b adjusted changelog and corrected wrong version in build.gradle due to merge 2016-03-27 17:17:07 +02:00