aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-26109-630/+2671
Conflicts: README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java src/main/java/eu/siacs/conversations/entities/Bookmark.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/res/layout/activity_contact_details.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml
* removed unused stringlookshe2016-04-171-1/+0
|
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-1771-275/+573
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * @Overrides addedtrz/merge_1.11.7lookshe2016-04-171-0/+6
| |
| * Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-1771-310/+573
| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
* Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-04-170-0/+0
* Merge branch 'trz/rebase' into trz/rename (skip beta logo)lookshe2016-04-060-0/+0
|\
| * update to beta-2 and new logo for betatrz/beta-2lookshe2016-04-0634-5/+740
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-0521-54/+201
|\|
| * Merge tag '1.11.3' into trz/rebaselookshe2016-04-0521-55/+202
| |
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-04-050-0/+0
|\|
| * Merge branch 'trz/rename' into trz/rebase (skip translation)lookshe2016-04-030-0/+0
| |\ | |/ |/|
* | conversations->conversations+lookshe2016-04-0329-327/+327
| |
* | Pulled translations from transifexlookshe2016-04-012-25/+31
| |
* | Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
/
* fixed installation error "W/PackageManager: Can't install because provider ↵trz/beta-1lookshe2016-04-033-3/+3
| | | | name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus"
* update build.gradle for betalookshe2016-04-031-2/+2
|
* fixed build errorlookshe2016-04-031-0/+2
|
* Merge branch 'trz/rename' into trz/rebaselookshe2016-04-013-26/+37
|
* Pulled translations from transifexlookshe2016-04-012-25/+31
|
* Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
|
| * Merge branch 'trz/rename' into trz/rebaselookshe2016-03-309-32/+61
|/
* no resize of input field when inserting emojicon (FS#175)lookshe2016-03-301-1/+1
|
* Fixes FS#174: Displaying of ASCII emoticons differslookshe2016-03-305-31/+54
|
* Logging for FS#80 to identify calling methodlookshe2016-03-303-0/+6
* wrong import in new classtrz/1.11.2.1lookshe2016-03-271-1/+1
|
* Merge branch 'trz/rename' into trz/rebaselookshe2016-03-272-2/+10
|\
| * adjusted changelog and corrected wrong version in build.gradle due to mergelookshe2016-03-272-3/+11
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-275-3/+57
|\|
| * Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-275-3/+57
| |
* | Merge branch 'trz/rename' (early part) into trz/rebaselookshe2016-03-270-0/+0
|\|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-2518-42/+96
| |\ | |/ |/|
* | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-2518-42/+95
| |
| * Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-250-0/+0
| |\ | |/ |/|
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-231-0/+0
|\|
| * deleted unused library (FS#51)lookshe2016-03-231-0/+0
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-2332-317/+450
|\|
| * pulled from transifexlookshe2016-03-2332-317/+450
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-222-26/+42
|\|
| * Correct notifications to user if swiping with disabled or not connected ↵lookshe2016-03-221-25/+37
| | | | | | | | account (FS#159)
| * Fixes FS#87 - Crash on load messages after delete accountlookshe2016-03-221-1/+5
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-211-4/+19
|\|
| * One more fix in Message.equals() (FS#104)lookshe2016-03-211-4/+19
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+2
|\|
| * changed configuration to conversations+ project (FS#32)lookshe2016-03-201-1/+2
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+1
|\|
| * Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-18/+14
|\|
| * FS#104 - Fix Message.equals()lookshe2016-03-201-18/+14
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-207-4/+15
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 11:56:08 +0000