Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | catch package manager has died exception | Daniel Gultsch | 2015-08-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | do not touch pictures that are already in the right format | Daniel Gultsch | 2015-08-11 | 1 | -0/+144 | |
| | | | | | | | | | | | | fixed #522 | |||||
| * | | changed logging. (work around logcat null pointer | Daniel Gultsch | 2015-07-28 | 1 | -1/+0 | |
| | | | ||||||
| * | | rewrote dns fallback | Daniel Gultsch | 2015-07-24 | 1 | -9/+6 | |
| | | | ||||||
| * | | Optimize imports | Andreas Straub | 2015-07-20 | 6 | -40/+39 | |
| | | | ||||||
| * | | Adapt prettifyFingerprint() to axolotl FP sizes | Andreas Straub | 2015-07-19 | 1 | -5/+4 | |
| | | | ||||||
| * | | made 'check image on http host' message more generic. fixed #1281 | Daniel Gultsch | 2015-07-16 | 1 | -1/+2 | |
| | | | ||||||
| * | | null check otr fingerprint before display | Daniel Gultsch | 2015-07-11 | 1 | -1/+3 | |
| | | | ||||||
| * | | renamed downloadable to transferable | Daniel Gultsch | 2015-07-10 | 1 | -10/+9 | |
| | | | ||||||
| * | | print stack trace instead of writing error message to log in case of unknown ↵ | Daniel Gultsch | 2015-07-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | exception in dnsutil | |||||
| * | | show contacts name in non anonymous mucs. fixes #1213 | Daniel Gultsch | 2015-07-05 | 1 | -2/+6 | |
| | | | ||||||
| * | | Merge branch 'master' into development | Daniel Gultsch | 2015-07-03 | 1 | -0/+1 | |
| |\ \ | ||||||
| | * | | added fallback for non-srv dns queries | Daniel Gultsch | 2015-07-03 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | changed mime type handling | Daniel Gultsch | 2015-07-01 | 2 | -10/+488 | |
| | | | | ||||||
| * | | | changed namespace of the http upload feature | Daniel Gultsch | 2015-06-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | initial http upload support | Daniel Gultsch | 2015-06-29 | 1 | -0/+1 | |
| |/ / | | | | | | | | | | be careful: little error handling and no encryption | |||||
| * | | don't perform dns lookups on domain parts that obviously look like ip addresses | Daniel Gultsch | 2015-06-19 | 1 | -10/+14 | |
| | | | ||||||
| * | | made i/o and memory intensive operations execute in serial order | Daniel Gultsch | 2015-06-05 | 1 | -0/+34 | |
| | | | ||||||
| * | | fixed obvious bug in dns helper | Daniel Gultsch | 2015-06-04 | 1 | -2/+2 | |
| | | | ||||||
| * | | streamlined dns helper by ignoring weight | Daniel Gultsch | 2015-06-04 | 1 | -55/+10 | |
| | | | ||||||
| * | | let dns library take care of no-srv style hosts as well | Daniel Gultsch | 2015-05-28 | 1 | -9/+16 | |
| | | | ||||||
| * | | use dns library to resolve missing ipv6 or ipv4 addresses | Daniel Gultsch | 2015-05-28 | 1 | -1/+30 | |
| | | | ||||||
| * | | fix to detect the sender jid correctly | M. Dietrich | 2015-05-20 | 1 | -3/+8 | |
| | | | ||||||
| * | | add extra jid to intend "show location" | M. Dietrich | 2015-05-20 | 1 | -0/+1 | |
| | | | ||||||
| * | | added a few location questions | Daniel Gultsch | 2015-05-14 | 1 | -3/+8 | |
| | | | ||||||
| * | | ignore question marks in location question | Daniel Gultsch | 2015-05-13 | 1 | -10/+13 | |
| | | | ||||||
| * | | show location quick action after receiving a question about the users location | Daniel Gultsch | 2015-05-13 | 1 | -0/+24 | |
| | | | ||||||
| * | | optimized heart render code a bit | Daniel Gultsch | 2015-05-10 | 1 | -3/+7 | |
| | | | ||||||
| * | | added white heart to new rendering as well | Daniel Gultsch | 2015-05-10 | 1 | -0/+1 | |
| | | | ||||||
| * | | paint single unicode hearts as red and slightly larger | Daniel Gultsch | 2015-05-10 | 1 | -0/+4 | |
| | | | ||||||
| * | | fixed #1039 | Daniel Gultsch | 2015-04-25 | 1 | -0/+3 | |
| | | | ||||||
| * | | fixed a bug in DNS helper code. fixes #1130 | iNPUTmice | 2015-04-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | fixed typos | iNPUTmice | 2015-04-13 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-01-04 | 1 | -1/+1 | |
|\ \ \ | | |/ | |/| | ||||||
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-11 | 1 | -153/+75 | |
|\| | | ||||||
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-10 | 4 | -15/+19 | |
|\| | | ||||||
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 1 | -1/+1 | |
|\| | | ||||||
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 4 | -13/+13 | |
|\| | | ||||||
* | | | Merge trz/rename into trz/rebase | steckbrief | 2015-10-22 | 1 | -5/+3 | |
|\| | | ||||||
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-05 | 1 | -13/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2015-10-05 | 1 | -0/+18 | |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |||||
| * | | renaming eu.siacs.conversations to de.thedevstack.conversationsplus | steckbrief | 2015-06-19 | 13 | -1622/+0 | |
| | | | | | | | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed | |||||
* | | | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module | lookshe | 2015-08-16 | 1 | -129/+0 | |
| | | | ||||||
* | | | Fixes FS#37 - Remove special treatment of unicode hearts | lookshe | 2015-08-16 | 1 | -3/+3 | |
| | | | | | | | | | | | | Fixes FS#34 - review all calls for String.trim() | |||||
* | | | Merge tag '1.5.2' into trz/rebase | lookshe | 2015-08-11 | 7 | -95/+660 | |
| | | | ||||||
* | | | Status color added to "create conversation" (refers to ticket #22 in flyspray) | steckbrief | 2015-06-19 | 1 | -0/+14 | |
|/ / | ||||||
* | | no trim of messages or password | lookshe | 2015-04-11 | 1 | -2/+1 | |
| | | | | | | | | check password with only spaces separately | |||||
* | | Merge tag '1.2.0' into trz/master | steckbrief | 2015-03-30 | 6 | -16/+120 | |
|\| | | | | | | | | | | | | | | | | | 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 | |||||
| * | show geo uris as 'location' in overview | iNPUTmice | 2015-03-10 | 1 | -1/+7 | |
| | | ||||||
| * | Merge pull request #1022 from Boris-de/cipher_blacklist | Daniel Gultsch | 2015-03-08 | 1 | -0/+16 | |
| |\ | | | | | | | disable all really weak cipher suites |