Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #836 from kriztan/development | Daniel Gultsch | 2015-01-05 | 14 | -416/+437 | |
|\ \ \ | |/ / |/| | | Updated languages ... | |||||
| * | | Updated languages for higher auto accept file sizes and changed labeling to ↵ | Christian Schneppe | 2015-01-05 | 14 | -416/+437 | |
|/ / | | | | | | | MiB and KiB | |||||
* | | made checks for valid image extensions case insensitive | Daniel Gultsch | 2015-01-04 | 3 | -3/+3 | |
| | | ||||||
* | | do not run mam queries in findOrCreateConversation() when isn't available | Daniel Gultsch | 2015-01-04 | 1 | -5/+7 | |
| | | ||||||
* | | added higher auto accept file sizes | Daniel Gultsch | 2015-01-04 | 2 | -35/+39 | |
| | | | | | | | | also changed labeling to MiB and KiB | |||||
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | Daniel Gultsch | 2015-01-04 | 1 | -0/+7 | |
|\ \ | | | | | | | | | | development | |||||
| * \ | Merge pull request #833 from SamWhited/travis | Daniel Gultsch | 2015-01-04 | 1 | -0/+7 | |
| |\ \ | | | | | | | | | Add travis config | |||||
| | * | | Add travis config | Sam Whited | 2015-01-04 | 1 | -0/+7 | |
| |/ / | ||||||
* / / | added travis build icon to README | Daniel Gultsch | 2015-01-04 | 1 | -0/+3 | |
|/ / | ||||||
* | | code cleanup + logging of spoofed iq packets | Daniel Gultsch | 2015-01-04 | 1 | -35/+33 | |
| | | ||||||
* | | Merge pull request #823 from SamWhited/issue20 | Daniel Gultsch | 2015-01-04 | 10 | -116/+123 | |
|\ \ | | | | | | | Verify IQ responses | |||||
| * | | Verify IQ responses | Sam Whited | 2015-01-04 | 4 | -18/+39 | |
| | | | | | | | | | | | | | | | | | | Fixes #20 Move fromServer/toServer to AbstractStanza | |||||
| * | | Make IqPacket type an enum | Sam Whited | 2015-01-04 | 9 | -99/+85 | |
|/ / | ||||||
* | | Merge pull request #832 from svetlemodry/development | Daniel Gultsch | 2015-01-04 | 1 | -1/+39 | |
|\ \ | | | | | | | Czech translation update | |||||
| * | | Czech translation update | Jaroslav Lichtblau | 2015-01-04 | 1 | -1/+39 | |
| | | | ||||||
* | | | deal with prosodys muc namespace tagging of messages | Daniel Gultsch | 2015-01-04 | 1 | -4/+5 | |
| | | | ||||||
* | | | Use packet callbacks only for IqPackets. Removed unnecessary code | Daniel Gultsch | 2015-01-04 | 2 | -71/+37 | |
|/ / | ||||||
* | | Merge pull request #829 from kriztan/patch-1 | Daniel Gultsch | 2015-01-04 | 1 | -1/+1 | |
|\ \ | | | | | | | corrected German 'private_message_to' | |||||
| * | | corrected German 'private_message_to' | kriztan | 2015-01-04 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #830 from kruks23/translation4 | Daniel Gultsch | 2015-01-04 | 1 | -1/+15 | |
|\ \ \ | |/ / |/| / | |/ | Update spanish translations | |||||
| * | Update spanish translations | sergio | 2015-01-04 | 1 | -1/+15 | |
|/ | ||||||
* | no longer use ConcurrentHashMap in favor of synchronize on a final HashMap | Daniel Gultsch | 2015-01-04 | 1 | -19/+27 | |
| | ||||||
* | Merge branch 'development' | Daniel Gultsch | 2015-01-03 | 1 | -5/+11 | |
|\ | ||||||
| * | Merge pull request #827 from kriztan/patch-2 | Daniel Gultsch | 2015-01-03 | 1 | -5/+11 | |
| |\ | | | | | | | Added and modified German translations | |||||
| | * | Added and modified German translations | kriztan | 2015-01-03 | 1 | -5/+11 | |
| |/ | ||||||
* / | version bump to 0.10 | Daniel Gultsch | 2015-01-03 | 3 | -3/+13 | |
|/ | ||||||
* | void messages getting reloaded through mam after clear history | Daniel Gultsch | 2015-01-03 | 1 | -0/+1 | |
| | ||||||
* | record voice and attachment refactor | Daniel Gultsch | 2015-01-03 | 5 | -74/+73 | |
| | ||||||
* | disable / enable all accounts | Daniel Gultsch | 2015-01-03 | 3 | -27/+103 | |
| | ||||||
* | update last presence only for messages | Daniel Gultsch | 2015-01-03 | 2 | -6/+2 | |
| | ||||||
* | added missing layout file | Daniel Gultsch | 2015-01-03 | 1 | -0/+105 | |
| | ||||||
* | code cleanup | Daniel Gultsch | 2015-01-03 | 3 | -11/+22 | |
| | ||||||
* | migrated change password into separate activity | Daniel Gultsch | 2015-01-03 | 6 | -88/+138 | |
| | ||||||
* | some further otr improvements | Daniel Gultsch | 2015-01-02 | 6 | -9/+31 | |
| | ||||||
* | click on dynamic tag to filter for that tag | Daniel Gultsch | 2015-01-02 | 2 | -0/+34 | |
| | ||||||
* | Merge remote-tracking branch 'origin/development' into development | Daniel Gultsch | 2015-01-02 | 1 | -0/+7 | |
|\ | ||||||
| * | Merge pull request #826 from kriztan/patch-1 | Daniel Gultsch | 2015-01-02 | 1 | -0/+7 | |
| |\ | | | | | | | Added German translations | |||||
| | * | Added German translations | kriztan | 2015-01-02 | 1 | -0/+7 | |
| | | | ||||||
* | | | allow cancellation of waiting files | Daniel Gultsch | 2015-01-02 | 2 | -19/+23 | |
|/ / | ||||||
* / | put Conversations into background mode earlier | Daniel Gultsch | 2015-01-02 | 5 | -19/+44 | |
|/ | ||||||
* | prefer PLAIN over DIGEST-MD5 | Daniel Gultsch | 2015-01-02 | 2 | -3/+3 | |
| | | | | | DIGEST-MD5 seems to be broken for a lot of cases (OpenFire) switched priority of PLAIN to not cause any security errors | |||||
* | fixed layout file | Daniel Gultsch | 2015-01-02 | 1 | -1/+1 | |
| | ||||||
* | improved OTR verification part one | Daniel Gultsch | 2015-01-02 | 12 | -352/+403 | |
| | ||||||
* | Merge remote-tracking branch 'origin/development' into development | Daniel Gultsch | 2014-12-30 | 15 | -22/+8 | |
|\ | ||||||
| * | Merge pull request #821 from SamWhited/appnametranslation | Daniel Gultsch | 2014-12-30 | 15 | -22/+8 | |
| |\ | | | | | | | Several translation fixes | |||||
| | * | Make `app_name' string untranslatable | Sam Whited | 2014-12-29 | 15 | -22/+8 | |
| |/ | | | | | | | | | | | Remove untranslatable about message Escape single quote in NL translation | |||||
* / | improved fromServer filter | Daniel Gultsch | 2014-12-30 | 1 | -1/+4 | |
|/ | ||||||
* | refactor swithOverToTls stuff | Daniel Gultsch | 2014-12-30 | 1 | -56/+45 | |
| | ||||||
* | fixed npe in block menu item | Daniel Gultsch | 2014-12-30 | 1 | -1/+1 | |
| | ||||||
* | fixed nl strings | Daniel Gultsch | 2014-12-30 | 1 | -25/+1 | |
| |