Sam Whited
|
ccba01ef19
|
Remove minidns dir
|
2014-10-28 12:13:53 -04:00 |
|
Sam Whited
|
41d2e72be7
|
Subtree merged in MemorizingTrustManager
|
2014-10-28 12:11:51 -04:00 |
|
Sam Whited
|
89c294af11
|
Don't use submodules
|
2014-10-28 12:07:04 -04:00 |
|
iNPUTmice
|
7dcce220cb
|
reworked dns retry
|
2014-10-27 21:48:25 +01:00 |
|
iNPUTmice
|
915def24f9
|
removed unnecessary logging from avatar service
|
2014-10-27 21:48:09 +01:00 |
|
iNPUTmice
|
698572d218
|
proper cleanup after pgp image decryption
|
2014-10-27 21:47:41 +01:00 |
|
iNPUTmice
|
f45a841caf
|
fixed url parsing
|
2014-10-27 21:47:17 +01:00 |
|
iNPUTmice
|
da822ebae8
|
check for links in pgp encrypted messages as well
|
2014-10-27 11:00:03 +01:00 |
|
Daniel Gultsch
|
b7f596363b
|
Merge pull request #590 from weiss/update-german-translations
Update German translations
|
2014-10-27 10:00:03 +01:00 |
|
Holger Weiß
|
08fc3c7f04
|
Update German translations
|
2014-10-26 23:49:25 +01:00 |
|
iNPUTmice
|
b045dea549
|
set divider for image meta information to '|' to not conflict with URL. breaks images downloaded in between 0.7.3 and now
|
2014-10-26 20:18:57 +01:00 |
|
Daniel Gultsch
|
d86b7f3192
|
Merge pull request #588 from betheg/remove_unused_cast
remove some unused cast
|
2014-10-26 20:17:50 +01:00 |
|
Daniel Gultsch
|
cb21eac501
|
Merge pull request #587 from betheg/fix_possible_fallthrough
fix possible fallthrough.
|
2014-10-26 20:14:09 +01:00 |
|
Michael
|
020dc863b1
|
remove some unused cast
|
2014-10-26 18:54:10 +01:00 |
|
Michael
|
8dae4b1eb9
|
fix possible fallthrough.
|
2014-10-26 18:30:58 +01:00 |
|
Sam Whited
|
b888967b35
|
Set the root project name
|
2014-10-26 10:58:50 -04:00 |
|
Daniel Gultsch
|
284ad1b053
|
Merge pull request #586 from SamWhited/issue585
Use consistent numbering
|
2014-10-26 15:48:18 +01:00 |
|
Sam Whited
|
a5e73850b8
|
Use consistent numbering
Fixes #585
|
2014-10-26 10:37:21 -04:00 |
|
Sam Whited
|
ef25720f0f
|
Include build number in output of release builds
|
2014-10-26 10:22:37 -04:00 |
|
Sam Whited
|
4024136b1c
|
Use full URI for android application Gradle plugin
|
2014-10-26 10:14:38 -04:00 |
|
Sam Whited
|
b82a0e6528
|
Remove useless include from Gradle settings
|
2014-10-26 10:13:16 -04:00 |
|
Sam Whited
|
a6d0042e5c
|
Move submodules back to libs/
|
2014-10-26 09:54:41 -04:00 |
|
Sam Whited
|
90898ec3d4
|
Add some logic for signing releases
|
2014-10-26 09:11:28 -04:00 |
|
Sam Whited
|
c83e49d1b8
|
Update otr4j to 0.21
|
2014-10-26 09:05:12 -04:00 |
|
Sam Whited
|
7f484513be
|
Pull otr4j form Maven repo
|
2014-10-26 08:54:41 -04:00 |
|
iNPUTmice
|
8171633eb9
|
don't merge downloadable messages
|
2014-10-24 23:18:19 +02:00 |
|
iNPUTmice
|
8fb8985412
|
added message option to download images
|
2014-10-24 19:30:03 +02:00 |
|
Daniel Gultsch
|
1ea8feaf24
|
Merge pull request #582 from kruks23/translation7
Update Spanish Translations
|
2014-10-24 18:55:23 +02:00 |
|
kruks23
|
192e9d3d99
|
Update Spanish Translations
|
2014-10-24 18:52:38 +02:00 |
|
iNPUTmice
|
e1f11a5735
|
also show some text in new image notification
|
2014-10-24 18:27:53 +02:00 |
|
iNPUTmice
|
864f3610b3
|
picture notification and some drive by bug fixes
|
2014-10-24 14:34:46 +02:00 |
|
iNPUTmice
|
1dae59141d
|
Merge branch 'development' of github.com:siacs/Conversations into development
|
2014-10-24 13:29:39 +02:00 |
|
iNPUTmice
|
cbc3d9bd6f
|
notify only after image has been received over http. introduced mini grace for catching up with SM or offline messages
|
2014-10-24 13:29:18 +02:00 |
|
Daniel Gultsch
|
581e96349c
|
Merge pull request #581 from kruks23/translation7
Update Spanish Translations
|
2014-10-23 21:35:41 +02:00 |
|
iNPUTmice
|
d73a77643d
|
context menu for messages. allow to resend single messages
|
2014-10-23 21:27:41 +02:00 |
|
kruks23
|
80c512f197
|
Update Spanish Translations
|
2014-10-23 20:36:17 +02:00 |
|
Sam Whited
|
5e3b713286
|
Add non-project files back
|
2014-10-22 18:26:47 -04:00 |
|
Sam Whited
|
5f4b6e39bc
|
Use proguard on release builds
We don't need obfuscation (it's an open source project), but proguard
wil shrink the apk by stripping out unused code.
|
2014-10-22 18:22:49 -04:00 |
|
Sam Whited
|
1f49e99c46
|
Suppress lint errors and remove bcprov
|
2014-10-22 18:17:49 -04:00 |
|
Sam Whited
|
bf0c447fec
|
Add proguard rules
|
2014-10-22 15:49:48 -04:00 |
|
Sam Whited
|
281ce3105f
|
Make conversations the root project
|
2014-10-22 15:47:11 -04:00 |
|
Sam Whited
|
07b47172a0
|
Add build deps and move build props to build file
|
2014-10-22 15:39:53 -04:00 |
|
iNPUTmice
|
de3739970b
|
Merge branch 'development' of github.com:siacs/Conversations into development
|
2014-10-22 19:05:28 +02:00 |
|
iNPUTmice
|
d04afe453a
|
ability to download pgp encrypted files over http as well
|
2014-10-22 19:05:15 +02:00 |
|
Sam Whited
|
038f7afd88
|
Add gradle directory
|
2014-10-22 12:42:28 -04:00 |
|
Sam Whited
|
64bdd7e731
|
Use Gradle build system
|
2014-10-22 12:38:44 -04:00 |
|
Daniel Gultsch
|
f6cf5e9c2f
|
Merge pull request #577 from beriain/development
Update strings.xml for 0.8
|
2014-10-22 17:34:20 +02:00 |
|
iNPUTmice
|
c067bf96b0
|
small bug fixes for the conversation activity
|
2014-10-22 17:32:59 +02:00 |
|
Aitor Beriain
|
451bc8e4eb
|
Update strings.xml
|
2014-10-22 16:04:21 +02:00 |
|
iNPUTmice
|
62b0fc3fda
|
made httpconnection accept aes encrypted files
|
2014-10-22 13:06:46 +02:00 |