Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | reverse order in contact chooser | Daniel Gultsch | 2016-04-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | minor code cleanup | Daniel Gultsch | 2016-04-12 | 1 | -3/+1 | |
| | | | | ||||||
| * | | | republish avatar if server offers non-persistent pep :-( | Daniel Gultsch | 2016-04-11 | 4 | -37/+144 | |
| | | | | ||||||
| * | | | version bump to 1.11.6 + changelog1.11.6 | Daniel Gultsch | 2016-04-10 | 2 | -2/+6 | |
| | | | | ||||||
| * | | | pulled translations from transifex | Daniel Gultsch | 2016-04-10 | 29 | -86/+27 | |
| | | | | ||||||
| * | | | add entries to gitignore | Daniel Gultsch | 2016-04-10 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | don't throw IO exception at end of stream | Daniel Gultsch | 2016-04-10 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | fixed 'connecting…' button | Daniel Gultsch | 2016-04-10 | 1 | -3/+6 | |
| | | | | ||||||
| * | | | moved authentication into seperate method. force close socket before ↵ | Daniel Gultsch | 2016-04-10 | 1 | -38/+44 | |
| | | | | | | | | | | | | | | | | changing status | |||||
| * | | | introduced setting to turn of notification led | Daniel Gultsch | 2016-04-09 | 3 | -5/+15 | |
| | | | | ||||||
| * | | | update gradle and gradle plugin | Daniel Gultsch | 2016-04-09 | 3 | -4/+4 | |
| | | | | ||||||
| * | | | use startdate as lower bound when querying archive with after=x | Daniel Gultsch | 2016-04-09 | 1 | -13/+3 | |
| | | | | ||||||
| * | | | don't show contact details when in conversations with self | Daniel Gultsch | 2016-04-09 | 3 | -1/+8 | |
| | | | | ||||||
| * | | | use last received message id when querying archive | Daniel Gultsch | 2016-04-09 | 1 | -7/+17 | |
| | | | | ||||||
| * | | | transform nimbuzz workaround into a more general 'waitForDisco' condition | Daniel Gultsch | 2016-04-09 | 1 | -6/+11 | |
| | | | | ||||||
| * | | | add required disco#items query to timeout list | Daniel Gultsch | 2016-04-08 | 1 | -1/+4 | |
| | | | | ||||||
| * | | | increase version code to fix nasty bug in 1.11.5 beta1.11.5 | Daniel Gultsch | 2016-04-08 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | removed ernoexception in exchange for a regular exeption to prevent verify ↵ | Daniel Gultsch | 2016-04-08 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | error on <5.0 | |||||
| * | | | version bump to 1.11.5 + changelog | Daniel Gultsch | 2016-04-08 | 2 | -2/+5 | |
| | | | | ||||||
| * | | | pulled translations from transifex | Daniel Gultsch | 2016-04-08 | 2 | -3/+23 | |
| | | | | ||||||
| * | | | check file owner when attaching files or using them as avatar | Daniel Gultsch | 2016-04-07 | 4 | -2/+55 | |
| | | | | ||||||
| * | | | prevent null pointer when checking http upload max size | Daniel Gultsch | 2016-04-07 | 1 | -6/+6 | |
| | | | | ||||||
| * | | | tell people to build debug instead of release | Daniel Gultsch | 2016-04-06 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | version bump to 1.11.4 + changelog1.11.4 | Daniel Gultsch | 2016-04-05 | 2 | -2/+6 | |
| | | | | ||||||
| * | | | better detect broken pep | Daniel Gultsch | 2016-04-05 | 2 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | mark pep as broken when publishing bundle or device list failed reset 'brokenness' when account is getting disabled | |||||
| * | | | fixing travis | Daniel Gultsch | 2016-04-04 | 2 | -4/+11 | |
| | | | | ||||||
| * | | | switched around info and items query to avoid race condition | Daniel Gultsch | 2016-04-04 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | pulled translations from transifex | Daniel Gultsch | 2016-04-04 | 12 | -26/+71 | |
| | | | | ||||||
| * | | | removed unnecessary wait for disconnect | Daniel Gultsch | 2016-04-04 | 1 | -6/+0 | |
| | | | | ||||||
| * | | | made sure the disco#items query has returned before finalizing the bind | Daniel Gultsch | 2016-04-04 | 1 | -12/+24 | |
| | | | | ||||||
| | * | | Merge branch 'trz/rebase' (early part) into trz/rename | lookshe | 2016-04-17 | 0 | -0/+0 | |
| | |\ \ | |_|/ / |/| | / | | |/ | ||||||
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-16 | 2 | -3/+8 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Fixed null pointer exception in case of IOException before uploading file to ↵ | steckbrief | 2016-04-16 | 1 | -2/+7 | |
| | | | | | | | | | | | | http host | |||||
| * | | Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message' | steckbrief | 2016-04-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-07 | 6 | -56/+131 | |
|\| | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java | |||||
| * | | Implements FS#187: Add single line copy to logcat view | steckbrief | 2016-04-07 | 6 | -56/+129 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-06 | 12 | -144/+135 | |
|\| | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | |||||
| * | | Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences | steckbrief | 2016-04-06 | 12 | -144/+134 | |
| | | | ||||||
* | | | Merge commit 'remotes/origin/trz/rename~1' into trz/rebase | steckbrief | 2016-04-06 | 0 | -0/+0 | |
|\| | | ||||||
| * | | Merge branch 'trz/rebase' into trz/rename (skip beta logo) | lookshe | 2016-04-06 | 0 | -0/+0 | |
| |\ \ | |/ / |/| | | ||||||
* | | | update to beta-2 and new logo for betatrz/beta-2 | lookshe | 2016-04-06 | 34 | -5/+740 | |
| | | | ||||||
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-04-05 | 21 | -54/+201 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge tag '1.11.3' into trz/rebase | lookshe | 2016-04-05 | 21 | -55/+202 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | version bump to 1.11.3 and changelog1.11.3 | Daniel Gultsch | 2016-04-02 | 2 | -2/+6 | |
| | | | ||||||
| * | | don't ask for resource when server uses http upload v0.1 | Daniel Gultsch | 2016-04-02 | 3 | -6/+8 | |
| | | | ||||||
| * | | check max http file size when attaching files | Daniel Gultsch | 2016-04-01 | 6 | -12/+83 | |
| | | | ||||||
| * | | add methods to check max file size for http upload | Daniel Gultsch | 2016-03-31 | 5 | -12/+41 | |
| | | | ||||||
| * | | save otr fingerprint in message | Daniel Gultsch | 2016-03-31 | 6 | -12/+15 | |
| | | | ||||||
| * | | include form fields into caps hash calculation | Daniel Gultsch | 2016-03-31 | 2 | -6/+25 | |
| | | | ||||||
| * | | closed some cursors under error conditions | Daniel Gultsch | 2016-03-31 | 1 | -3/+13 | |
| | | |