aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge master-originsteckbrief2015-02-20268-8680/+8256
|\ | | | | | | | | | | | | | | | | | | 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
| * version bumpiNPUTmice2015-02-021-2/+2
| |
| * don't disable any ciphersiNPUTmice2015-02-021-3/+4
| |
| * Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2015-02-025-0/+0
| |\ | | | | | | | | | development
| | * Merge pull request #956 from SamWhited/unused_resourcesDaniel Gultsch2015-02-025-0/+0
| | |\ | | | | | | | | Remove another unused resource
| | | * Remove another unused resourceSam Whited2015-02-015-0/+0
| | | |
| * | | added more ciphers for old openssl versionsiNPUTmice2015-02-021-1/+3
| |/ /
| * / bumped version code againiNPUTmice2015-02-011-1/+1
| |/
| * Merge pull request #955 from SamWhited/unused_resourcesDaniel Gultsch2015-02-0124-0/+0
| |\ | | | | | | Remove unused resources
| | * Remove unused resourcesSam Whited2015-02-0124-0/+0
| | |
| * | pulled spanish translations againiNPUTmice2015-02-011-2/+2
| |/
| * mentioned material theme in changelogiNPUTmice2015-02-011-0/+1
| |
| * pulled translations from transifexiNPUTmice2015-02-0116-0/+1513
| |
| * Merge pull request #953 from SamWhited/remove_unused_stringsDaniel Gultsch2015-02-014-7/+0
| |\ | | | | | | Removes some unused strings (the legacy SSL stuff)
| | * Removes some unused strings (the legacy SSL stuff)Sam Whited2015-02-014-7/+0
| |/
| * fixed text preview for imagesiNPUTmice2015-02-011-1/+1
| |
| * Merge pull request #949 from kruks23/title_activityDaniel Gultsch2015-02-0115-16/+2
| |\ | | | | | | Remove title_activity_conversations and use app_name instead
| | * Remove title_activity_conversations and use app_name insteadkruks232015-01-3015-16/+2
| |/
| * made version codes ready for release candidate in beta channeliNPUTmice2015-01-292-3/+3
| |
| * don't count when attempt failed completlyiNPUTmice2015-01-291-0/+1
| |
| * Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2015-01-29145-25/+105
| |\ | | | | | | | | | development
| | * Merge pull request #923 from SamWhited/material-design-iconsDaniel Gultsch2015-01-29145-25/+105
| | |\ | | | | | | | | Start experimenting with material design icons
| | | * Use Material Design Icons on API 21+Sam Whited2015-01-29145-25/+105
| | |/
| * | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2015-01-291-10/+10
| |\| | | | | | | | | | development
| | * Merge pull request #941 from SamWhited/snackbar_orderingDaniel Gultsch2015-01-281-10/+10
| | |\ | | | | | | | | Show errors before mute snackbar
| | | * Show errors before mute snackbarSam Whited2015-01-271-10/+10
| | | | | | | | | | | | | | | | See #939
| * | | properly clear notifications. fixed #921iNPUTmice2015-01-291-2/+8
| |/ /
| * / fixed broken capsiNPUTmice2015-01-282-14/+17
| |/
| * muc tics for consistencyiNPUTmice2015-01-261-1/+1
| |
| * changed version code and version name to 1.0-beta2iNPUTmice2015-01-262-3/+3
| |
| * adapt caps on whether or not message confirmation is oniNPUTmice2015-01-265-11/+31
| |
| * don't put ejabberds status code muc messages into an actual conversationiNPUTmice2015-01-261-0/+1
| |
| * made connect time out more failsaveiNPUTmice2015-01-251-5/+8
| |
| * Merge pull request #930 from betheg/otrDaniel Gultsch2015-01-252-0/+3
| |\ | | | | | | otr: switch to the otr-state the partner alternate.
| | * otr: switch to the otr-state the partner alternate.Michael2015-01-252-0/+3
| | | | | | | | | | | | should also fixed #877
| * | Merge pull request #933 from betheg/mergeableDaniel Gultsch2015-01-253-5/+9
| |\ \ | | | | | | | | fix mergable() for /me command.
| | * | fix mergable() for /me command.Michael2015-01-253-5/+9
| | |/
| * | updated translationsiNPUTmice2015-01-254-432/+476
| | |
| * | set jingle file transfer to offer after iq offer has returnediNPUTmice2015-01-251-6/+17
| | |
| * | Merge pull request #932 from svetlemodry/developmentDaniel Gultsch2015-01-251-0/+1
| |\ \ | | | | | | | | Czech translation
| | * | Czech translationJaroslav Lichtblau2015-01-251-0/+1
| |/ / | | | | | | | | | for "hide offline" added
| * | Merge pull request #931 from betheg/gradle_pluginDaniel Gultsch2015-01-251-1/+1
| |\ \ | | |/ | |/| update android gradle plugin to 1.0.1
| | * update android gradle plugin to 1.0.1Michael2015-01-251-1/+1
| |/
| * Merge pull request #927 from betheg/otr_query_messageDaniel Gultsch2015-01-251-1/+1
| |\ | | | | | | MessageParser: fix the regex for otr query messages.
| | * MessageParser: fix the regex for otr query messages.Michael2015-01-241-1/+1
| |/
| * Merge pull request #924 from andersruneson/changeonlinecolorDaniel Gultsch2015-01-242-1/+5
| |\ | | | | | | Changed online color to green instead of primary
| | * Changed online color to green instead of primaryAnders Sandblad2015-01-232-1/+5
| | |
| * | fixed mam to work with muciNPUTmice2015-01-244-11/+21
| | |
| * | mentioned hide offline feature in the changelogiNPUTmice2015-01-221-0/+1
| |/
| * show checkbox to hide offline contactsiNPUTmice2015-01-213-6/+28
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 17:10:08 +0000