aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOG.mdChristian S2016-01-311-0/+2
* Merge branch 'siacs/master'Christian S2016-01-3120-75/+459
|\
| * Update README.mdDaniel Gultsch2016-01-311-1/+1
| * be more careful with resetting the stream idDaniel Gultsch2016-01-291-2/+1
| * try to make in-valid-session detection work for pgpDaniel Gultsch2016-01-291-3/+10
| * show values in formfieldwrappers and allow form to be set to read onlyDaniel Gultsch2016-01-266-7/+58
| * hide jid row in list item list when jid is nullDaniel Gultsch2016-01-261-1/+2
| * expert setting to trigger extended connection optionsDaniel Gultsch2016-01-255-11/+48
| * changed FileBackend API to allow files instead of messages to be copied and r...Daniel Gultsch2016-01-241-33/+34
| * added FormWrapper and form field validationDaniel Gultsch2016-01-238-4/+160
| * introduced boolean form field wrapperDaniel Gultsch2016-01-236-14/+76
| * added support for field types jid-single and text-privateDaniel Gultsch2016-01-234-4/+59
| * reset stanza queue when resetting xmppconnectionDaniel Gultsch2016-01-231-0/+1
| * show fetch errors in trust keys activityDaniel Gultsch2016-01-232-1/+15
* | Merge branch 'siacs/master' into developmentChristian S2016-01-2331-149/+362
|\|
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-2213-70/+52
| * added UI wrapper for (some) form fieldsDaniel Gultsch2016-01-226-1/+161
| * added convenience method to extract account from intentDaniel Gultsch2016-01-221-1/+13
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-224-5/+7
| * changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-225-23/+43
| * increased padding in create contact/conference dialogDaniel Gultsch2016-01-212-15/+21
| * add convenience to get an account object from a spinnerDaniel Gultsch2016-01-211-15/+19
| * version bump to 1.9.2 + changelogDaniel Gultsch2016-01-202-2/+9
| * pulled translations from transifexDaniel Gultsch2016-01-2015-13/+718
| * catch security exception when user prevents access to address bookDaniel Gultsch2016-01-201-27/+45
| * add intent!=null check in onActivityResultin PublishProfilePictureDaniel Gultsch2016-01-201-1/+1
* | make actionbar title/subtitle clickableChristian S2016-01-233-26/+104
* | show warning on back pressed during update checkChristian S2016-01-223-2/+24
* | hide 'disable foreground service' in foreground notificationChristian S2016-01-201-3/+0
* | possible fix for showing link instead of button for filesChristian S2016-01-191-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-176-102/+32
|\|
| * Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-01-162-2/+5
| |\
| | * Merge pull request #1655 from adithyaphilip/pgp-fixDaniel Gultsch2016-01-162-2/+5
| | |\
| | | * fixed PGP having to be selected twiceAdithya Abraham Philip2016-01-161-1/+4
| | | * upgraded to OpenKeychain api v10Adithya Abraham Philip2016-01-161-1/+1
| * | | pulled translations from transifexDaniel Gultsch2016-01-164-3/+49
| |/ /
| * | make ConversationsActivity more resistent against being restartedDaniel Gultsch2016-01-161-3/+9
| * | reuse same xmppconnection for reconnectsDaniel Gultsch2016-01-162-9/+17
| * | made constructor private in Account entityDaniel Gultsch2016-01-161-5/+1
| * | removed some unused methods from db backendDaniel Gultsch2016-01-161-83/+0
| |/
* | modfied some avatar sizesChristian S2016-01-163-6/+6
* | Merge branch 'siacs/master' into developmentChristian S2016-01-167-33/+61
|\|
| * version bump to 1.9.1Daniel Gultsch2016-01-151-2/+2
| * hide prepare image toasts when attaching multiple imagesDaniel Gultsch2016-01-151-11/+12
| * show toast when image cropper get oomDaniel Gultsch2016-01-152-0/+8
| * catch exception when reading message id from databaseDaniel Gultsch2016-01-151-8/+12
| * nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-152-12/+27
* | Merge branch 'siacs/master' into developmentChristian S2016-01-153-5/+6
|\|
| * pulled translations for 1.9.0 release from transifexDaniel Gultsch2016-01-1420-26/+169
| * version bump to 1.9.0Daniel Gultsch2016-01-141-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 04:54:43 +0000