Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | count all messages in a query | Daniel Gultsch | 2016-02-03 | 2 | -8/+3 | |
| | | ||||||
| * | Revert "get rid of broken totalMessageCount for mam queries" | Daniel Gultsch | 2016-02-03 | 2 | -4/+16 | |
| | | | | | | | | This reverts commit 58c6f9bfb283f5c54695b9662b5b4b08e5d4357f. | |||||
| * | refactored disco cache. avoid making duplicate call. check hash | Daniel Gultsch | 2016-02-03 | 6 | -43/+116 | |
| | | ||||||
| * | Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵ | Daniel Gultsch | 2016-02-02 | 11 | -152/+467 | |
| |\ | | | | | | | | | | into singpolyma-disco-caps | |||||
| | * | Do disco for caps hashes we have never seen | Stephen Paul Weber | 2016-01-24 | 1 | -2/+23 | |
| | | | | | | | | | | | | Then cache it | |||||
| | * | Fetch cached caps result on new presence | Stephen Paul Weber | 2016-01-24 | 2 | -3/+14 | |
| | | | ||||||
| | * | Use a Presence class for presence information | Stephen Paul Weber | 2016-01-24 | 8 | -102/+121 | |
| | | | | | | | | | | | | Only has status for now, but doing it so I can add disco to it | |||||
| | * | Persisitence and loading for ServiceDiscoveryResult | Stephen Paul Weber | 2016-01-23 | 2 | -11/+98 | |
| | | | ||||||
| | * | Implement toJSON on ServiceDiscoveryResult | Stephen Paul Weber | 2016-01-23 | 1 | -0/+34 | |
| | | | ||||||
| | * | Generate capHash from any discovery result | Stephen Paul Weber | 2016-01-23 | 1 | -4/+80 | |
| | | | ||||||
| | * | Factor out a representation of XEP-0030 results | Stephen Paul Weber | 2016-01-23 | 2 | -47/+114 | |
| | | | | | | | | | | | | And the parser from Element to this representation. | |||||
| * | | fixed 'unencrypted' not showing up for conferences when encryption is forced | Daniel Gultsch | 2016-02-02 | 1 | -1/+1 | |
| | | | ||||||
| * | | get rid of broken totalMessageCount for mam queries | Daniel Gultsch | 2016-02-02 | 2 | -16/+4 | |
| | | | ||||||
| * | | re-read common name from certificates on startup | Daniel Gultsch | 2016-02-02 | 2 | -2/+32 | |
| | | | ||||||
| * | | avoid npe when accessing the pgp connection service | Daniel Gultsch | 2016-02-02 | 1 | -1/+1 | |
| | | | ||||||
| * | | catch a few NPE when parsing invalid pep nodes | Daniel Gultsch | 2016-02-02 | 1 | -3/+3 | |
| | | | ||||||
| * | | respect autojoin setting on newly created bookmarks as well | Daniel Gultsch | 2016-02-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | opt out handling of the autojoin flag. fixes #1666 | Daniel Gultsch | 2016-02-01 | 3 | -5/+12 | |
| | | | ||||||
| * | | made create context menu call in StartConversationsActivity more failsafe | Daniel Gultsch | 2016-02-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | refactored user handling in conferences. show try again button when ↵ | Daniel Gultsch | 2016-02-01 | 3 | -86/+69 | |
| | | | | | | | | | | | | 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 | |
| | | | ||||||
* | | | Merge branch 'siacs/master' | Christian S | 2016-01-31 | 16 | -74/+436 | |
|\| | | ||||||
| * | | 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 | 3 | -11/+40 | |
| | | | ||||||
| * | | 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 | 7 | -4/+159 | |
| |/ | ||||||
| * | introduced boolean form field wrapper | Daniel Gultsch | 2016-01-23 | 4 | -13/+62 | |
| | | ||||||
| * | 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 | 24 | -133/+306 | |
|\| | ||||||
| * | 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 | 5 | -1/+140 | |
| | | ||||||
| * | 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 | 2 | -17/+32 | |
| | | ||||||
| * | add convenience to get an account object from a spinner | Daniel Gultsch | 2016-01-21 | 1 | -15/+19 | |
| | | ||||||
| * | 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 | 1 | -23/+70 | |
| | | | | | | | | | | * 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 | 1 | -1/+16 | |
| | | ||||||
* | | 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 | 5 | -101/+31 | |
|\| | ||||||
| * | Merge pull request #1655 from adithyaphilip/pgp-fix | Daniel Gultsch | 2016-01-16 | 1 | -1/+4 | |
| |\ | | | | | | | 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 | |
| | | |