aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:siacs/ConversationsiNPUTmice2014-09-091-1/+1
|\ | | | | | | | | | | | | Conflicts: src/eu/siacs/conversations/crypto/PgpEngine.java src/eu/siacs/conversations/persistance/FileBackend.java src/eu/siacs/conversations/ui/ShareWithActivity.java
| * more openpgp bug fixesiNPUTmice2014-09-031-3/+7
| |
| * fixed pgp signature creationiNPUTmice2014-09-031-3/+19
| |
| * fixed #406iNPUTmice2014-09-021-12/+8
| |
| * rotate avatarsiNPUTmice2014-09-021-37/+55
| | | | | | | | | | Conflicts: src/eu/siacs/conversations/persistance/FileBackend.java
| * fixed #403iNPUTmice2014-09-013-11/+18
| |
* | don't reset images from sending to waitingiNPUTmice2014-09-091-1/+2
| |
* | setting to increase font size. fixed #420iNPUTmice2014-09-0821-95/+126
| |
* | simplefied some code that might have been the source for some strange bugsiNPUTmice2014-09-081-25/+15
| |
* | introduced downloadable interface. reverted some of the changes made to OTRiNPUTmice2014-09-086-39/+20
| |
* | bug fixes for forcing encryptioniNPUTmice2014-09-081-1/+6
| |
* | fixed sending offline pgp messagesiNPUTmice2014-09-083-8/+11
| |
* | settings to force encryption and setting for not saving messages to disk. ↵iNPUTmice2014-09-085-46/+78
| | | | | | | | fixed #353
* | don't fail displayed or received messagesiNPUTmice2014-09-081-15/+17
| |
* | warn on missing presence subscriptioniNPUTmice2014-09-083-13/+27
| |
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-072-3/+0
|\ \
| * \ Merge pull request #426 from betheg/remove_stringsDaniel Gultsch2014-09-072-3/+0
| |\ \ | | | | | | | | deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
| | * | deleted some unused string-resources and imports, also deleted ↵Michael2014-09-072-3/+0
| | | | | | | | | | | | | | | | edit_account_dialog.xml.
* | | | fixed #321 - delete otr fingerprintsiNPUTmice2014-09-072-3/+54
|/ / /
* | | fixed #425iNPUTmice2014-09-071-1/+1
| | |
* | | trying to avoid rejectedexectioniNPUTmice2014-09-071-1/+8
|/ /
* | MUC: set the password from bookmarks.Michael2014-09-074-3/+59
| |
* | made shareing text with conferences possible againiNPUTmice2014-09-071-24/+28
| |
* | added missing breaks oOiNPUTmice2014-09-071-0/+2
| |
* | fixed npeiNPUTmice2014-09-071-0/+3
| |
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-061-0/+8
|\ \
| * | MUC: set password from invite message.Michael2014-09-051-0/+8
| | |
* | | made otr a little bit more solid when there is no presence subscriptioniNPUTmice2014-09-068-29/+55
|/ /
* | warn user if no presence subscription existsiNPUTmice2014-09-051-0/+34
| |
* | improved logging for avatar fetchesiNPUTmice2014-09-051-21/+38
| |
* | fixed #342 - otr with facebook and other services without resourcesiNPUTmice2014-09-041-2/+6
| |
* | reconnect accounts when resource has been changed in settingsiNPUTmice2014-09-041-3/+39
| |
* | made muc password dialog hide the password (password field)iNPUTmice2014-09-042-10/+29
| |
* | nick parsing (xep 0172) also enabled for messages and for pepiNPUTmice2014-09-041-5/+27
| |
* | Merge pull request #397 from GZep/developmentDaniel Gultsch2014-09-042-2/+12
|\ \ | | | | | | XEP-0172
| * | Contact presenceName propertyGayaz Yusipov2014-08-312-1/+8
| | |
| * | XEP-0172Gayaz Yusipov2014-08-301-2/+5
| | |
* | | Merge pull request #417 from emdete/unicode_emoticonsDaniel Gultsch2014-09-041-16/+32
|\ \ \ | | | | | | | | improve regex, implement pattern cache
| * | | improve emo mappingM. Dietrich2014-09-031-6/+9
| | | |
| * | | use class, use codepointM. Dietrich2014-09-031-25/+26
| | | |
| * | | make pattern staticM. Dietrich2014-09-031-16/+20
| | | |
| * | | improve regex, implement pattern cacheM. Dietrich2014-09-031-15/+23
| | | |
* | | | added support for password protected muc - fixed #203 and fixed #395iNPUTmice2014-09-033-17/+70
| | | |
* | | | changed order of snackbar hintsiNPUTmice2014-09-031-12/+11
| | | |
* | | | more openpgp bug fixesiNPUTmice2014-09-031-3/+7
| | | |
* | | | avoiding resource conflictsiNPUTmice2014-09-031-2/+7
| | | |
* | | | fixed pgp signature creationiNPUTmice2014-09-031-3/+19
| | | |
* | | | added ability to disable notifications for specific conversations - fixed #322iNPUTmice2014-09-034-0/+53
| | | |
* | | | made emoticon parsing enableable - default falseiNPUTmice2014-09-033-2/+12
| | | |
* | | | fixed #410 by removing that config optioniNPUTmice2014-09-028-40/+14
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:33:59 +0000