aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixes FS#82: Background color of conversation list item set to primary ↵steckbrief2015-10-161-0/+2
| | | | background color
* Publishing additional information in message details dialog such as message ↵steckbrief2015-10-041-0/+21
| | | | type and message status
* Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-041-0/+4
| | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-116-150/+190
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml
| * Merge tag '1.5.2' into trz/rebaselookshe2015-08-116-150/+190
| |
* | App-Name changed to "Conversations+" in strings.xmlsteckbrief2015-06-191-1/+1
|/
* changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-142-3/+16
| | | | settings class
* added settings for accepting and downloading fileslookshe2015-04-121-1/+7
| | | | fix in Settings, initialize with same values like in preferences.xml
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵steckbrief2015-04-111-1/+3
|\ | | | | | | trz/master
| * differ between received and read messagelookshe2015-04-111-1/+3
| |
* | Color choose dialogsteckbrief2015-04-112-1/+8
|/
* no trim of messages or passwordlookshe2015-04-111-0/+3
| | | | check password with only spaces separately
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-0/+14
|\ | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
| * Added multiple select to Choose Contact ActivityAndreas Straub2015-03-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing the Choose Contact Activity a boolean called "multiple" set to true, it now allows the user to select multiple contacts. Long pressing a contact enters multiple selection mode and the selection is confirmed using a button in the CAB. The Activity returns whether or not multiple contacts were selected using the same boolean. If multiple contacts were selected, an array of JID strings called "contacts" is returned. The Choose Contact Activity now also honors "filter_contacts", an array of strings containing JIDs that should not be displayed in the picker. The invite to conference dialog now uses this feature to enable inviting multiple contacts at once. Additionally, Invite Contact uses "filter_contacts" to only display contacts that are not yet participating in the conversation
| * show geo uris as 'location' in overviewiNPUTmice2015-03-101-0/+2
| |
| * display geo uris as location. show 'send loction' in share menu if request ↵iNPUTmice2015-03-071-0/+3
| | | | | | | | location intent can be resolved
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-0/+4
| |
| * added actions to error notificationiNPUTmice2015-02-101-0/+1
| |
* | Merge master-originsteckbrief2015-02-206-50/+136
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.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/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
| * Remove title_activity_conversations and use app_name insteadkruks232015-01-301-1/+0
| |
| * Use Material Design Icons on API 21+Sam Whited2015-01-293-0/+42
| |
| * show checkbox to hide offline contactsiNPUTmice2015-01-211-0/+1
| |
| * Remove legacy SSL supportSam Whited2015-01-191-2/+0
| |
| * proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-181-0/+2
| |
| * use same helper methods for images and filesiNPUTmice2015-01-181-7/+3
| |
| * Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-181-0/+2
| |\ | | | | | | Added new file type names for file transfers
| | * Added new file type names for file transfersChristian S2015-01-181-0/+2
| | | | | | | | | | | | | | | - apk - vcard
| * | Fix string substitutions with unknown filetypesSam Whited2015-01-171-0/+1
| |/
| * Correct the download file string on notificationsSam Whited2015-01-171-4/+4
| | | | | | | | Fixes #896
| * Add download button on notification if applicableSam Whited2015-01-161-0/+1
| |
| * show toast when avatar has been published - fixed #874iNPUTmice2015-01-151-0/+1
| |
| * added dedicated button to disable foreground service in perma notificationiNPUTmice2015-01-151-1/+2
| |
| * Merge pull request #885 from SamWhited/display-enter-keyDaniel Gultsch2015-01-141-0/+2
| |\ | | | | | | Add option to swap enter/emoticon key
| | * Add option to swap enter/emoticon keySam Whited2015-01-141-0/+2
| | |
| * | Harden the TLS connection cipher suitesSam Whited2015-01-141-1/+1
| |/
| * make use of different dimensions for different screen sizesDaniel Gultsch2015-01-131-2/+4
| |
| * context menu for files and offered files. fixed #848 fixed #849Daniel Gultsch2015-01-121-2/+1
| |
| * reworked message preview / message meta information (ie file offered, ↵Daniel Gultsch2015-01-121-5/+8
| | | | | | | | | | | | received * file) fixed #837
| * shortened some stringDaniel Gultsch2015-01-111-2/+2
| |
| * Introduced expert options to control enter-is-sendDaniel Gultsch2015-01-091-0/+3
| | | | | | | | (default == off)
| * make project translatable via transifexDaniel Gultsch2015-01-092-6/+12
| |
| * allow for very basic muc configurationDaniel Gultsch2015-01-081-2/+9
| |
| * kick after banDaniel Gultsch2015-01-081-0/+1
| |
| * some clean ups for affiliation change context menuDaniel Gultsch2015-01-081-4/+4
| |
| * more muc optionsDaniel Gultsch2015-01-071-0/+3
| | | | | | | | | | | | * show invite button only with admin privileges or on public conferences * Offer to ban user in public conferences. Thanks to @betheg for the awesome ground work for this
| * Merge pull request #845 from SamWhited/materialDaniel Gultsch2015-01-071-0/+1
| |\ | | | | | | Add materials theme for v21 devices
| | * Add materials themeSam Whited2015-01-061-0/+1
| | |
| * | basic affiliation changes in mucDaniel Gultsch2015-01-071-0/+6
| |/
| * Show affiliation instead of role in MucDetails and offer 'advanced mode' to ↵Daniel Gultsch2015-01-051-0/+5
| | | | | | | | display role
| * added higher auto accept file sizesDaniel Gultsch2015-01-041-33/+37
| | | | | | | | also changed labeling to MiB and KiB
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 11:20:30 +0000