Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | refactored user handling in conferences. show try again button when ↵ | Daniel Gultsch | 2016-02-01 | 4 | -86/+70 | |
| | | | | | | | | | | | | | | | | conference has errors | |||||
| * | | | fixed false set of subject in conference with empty body tag | Daniel Gultsch | 2016-01-31 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | prefer dns servers from networsk with the default route | Daniel Gultsch | 2016-01-29 | 1 | -2/+17 | |
| | | | | ||||||
* | | | | Update CHANGELOG.md | Christian S | 2016-01-31 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Merge branch 'siacs/master' | Christian S | 2016-01-31 | 20 | -75/+459 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Update README.md | Daniel Gultsch | 2016-01-31 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | be more careful with resetting the stream id | Daniel Gultsch | 2016-01-29 | 1 | -2/+1 | |
| | | | ||||||
| * | | try to make in-valid-session detection work for pgp | Daniel Gultsch | 2016-01-29 | 1 | -3/+10 | |
| | | | ||||||
| * | | show values in formfieldwrappers and allow form to be set to read only | Daniel Gultsch | 2016-01-26 | 6 | -7/+58 | |
| | | | ||||||
| * | | hide jid row in list item list when jid is null | Daniel Gultsch | 2016-01-26 | 1 | -1/+2 | |
| | | | ||||||
| * | | expert setting to trigger extended connection options | Daniel Gultsch | 2016-01-25 | 5 | -11/+48 | |
| | | | ||||||
| * | | changed FileBackend API to allow files instead of messages to be copied and ↵ | Daniel Gultsch | 2016-01-24 | 1 | -33/+34 | |
| | | | | | | | | | | | | resized | |||||
| * | | added FormWrapper and form field validation | Daniel Gultsch | 2016-01-23 | 8 | -4/+160 | |
| |/ | ||||||
| * | introduced boolean form field wrapper | Daniel Gultsch | 2016-01-23 | 6 | -14/+76 | |
| | | ||||||
| * | added support for field types jid-single and text-private | Daniel Gultsch | 2016-01-23 | 4 | -4/+59 | |
| | | ||||||
| * | reset stanza queue when resetting xmppconnection | Daniel Gultsch | 2016-01-23 | 1 | -0/+1 | |
| | | ||||||
| * | show fetch errors in trust keys activity | Daniel Gultsch | 2016-01-23 | 2 | -1/+15 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-23 | 31 | -149/+362 | |
|\| | ||||||
| * | use extract account from intent method and final EXTRA_ACCOUNT variable | Daniel Gultsch | 2016-01-22 | 13 | -70/+52 | |
| | | ||||||
| * | added UI wrapper for (some) form fields | Daniel Gultsch | 2016-01-22 | 6 | -1/+161 | |
| | | ||||||
| * | added convenience method to extract account from intent | Daniel Gultsch | 2016-01-22 | 1 | -1/+13 | |
| | | ||||||
| * | added config variable to allow non-tls connections | Daniel Gultsch | 2016-01-22 | 4 | -5/+7 | |
| | | ||||||
| * | changed spacing in create dialogs and notify user when no accounts are activated | Daniel Gultsch | 2016-01-22 | 5 | -23/+43 | |
| | | ||||||
| * | increased padding in create contact/conference dialog | Daniel Gultsch | 2016-01-21 | 2 | -15/+21 | |
| | | ||||||
| * | add convenience to get an account object from a spinner | Daniel Gultsch | 2016-01-21 | 1 | -15/+19 | |
| | | ||||||
| * | version bump to 1.9.2 + changelog | Daniel Gultsch | 2016-01-20 | 2 | -2/+9 | |
| | | ||||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-01-20 | 15 | -13/+718 | |
| | | ||||||
| * | catch security exception when user prevents access to address book | Daniel Gultsch | 2016-01-20 | 1 | -27/+45 | |
| | | ||||||
| * | add intent!=null check in onActivityResultin PublishProfilePicture | Daniel Gultsch | 2016-01-20 | 1 | -1/+1 | |
| | | ||||||
* | | make actionbar title/subtitle clickable | Christian S | 2016-01-23 | 3 | -26/+104 | |
| | | | | | | | | | | * show conference or contact details * hide button to show conference or contact details | |||||
* | | show warning on back pressed during update check | Christian S | 2016-01-22 | 3 | -2/+24 | |
| | | ||||||
* | | hide 'disable foreground service' in foreground notification | Christian S | 2016-01-20 | 1 | -3/+0 | |
| | | ||||||
* | | possible fix for showing link instead of button for files | Christian S | 2016-01-19 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-17 | 6 | -102/+32 | |
|\| | ||||||
| * | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-01-16 | 2 | -2/+5 | |
| |\ | ||||||
| | * | Merge pull request #1655 from adithyaphilip/pgp-fix | Daniel Gultsch | 2016-01-16 | 2 | -2/+5 | |
| | |\ | | | | | | | | | Fixes having to choose PGP twice, upgrades openpgp-api to 10 | |||||
| | | * | fixed PGP having to be selected twice | Adithya Abraham Philip | 2016-01-16 | 1 | -1/+4 | |
| | | | | ||||||
| | | * | upgraded to OpenKeychain api v10 | Adithya Abraham Philip | 2016-01-16 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | pulled translations from transifex | Daniel Gultsch | 2016-01-16 | 4 | -3/+49 | |
| |/ / | ||||||
| * | | make ConversationsActivity more resistent against being restarted | Daniel Gultsch | 2016-01-16 | 1 | -3/+9 | |
| | | | ||||||
| * | | reuse same xmppconnection for reconnects | Daniel Gultsch | 2016-01-16 | 2 | -9/+17 | |
| | | | ||||||
| * | | made constructor private in Account entity | Daniel Gultsch | 2016-01-16 | 1 | -5/+1 | |
| | | | ||||||
| * | | removed some unused methods from db backend | Daniel Gultsch | 2016-01-16 | 1 | -83/+0 | |
| |/ | ||||||
* | | modfied some avatar sizes | Christian S | 2016-01-16 | 3 | -6/+6 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-16 | 7 | -33/+61 | |
|\| | ||||||
| * | version bump to 1.9.1 | Daniel Gultsch | 2016-01-15 | 1 | -2/+2 | |
| | | ||||||
| * | hide prepare image toasts when attaching multiple images | Daniel Gultsch | 2016-01-15 | 1 | -11/+12 | |
| | | ||||||
| * | show toast when image cropper get oom | Daniel Gultsch | 2016-01-15 | 2 | -0/+8 | |
| | | ||||||
| * | catch exception when reading message id from database | Daniel Gultsch | 2016-01-15 | 1 | -8/+12 | |
| | | ||||||
| * | nimbuzz.com: don't wait for disco replies to set account to online | Daniel Gultsch | 2016-01-15 | 2 | -12/+27 | |
| | |