aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* modified typing optionsChristian S.2015-07-211-1/+1
* Merge pull request #13 from kriztan/ActionBar_SubtitleChristian S.2015-07-206-122/+143
|\
| * move typing info to ActionBar subtitleChristian S2015-07-206-122/+143
|/
* Merge pull request #11 from kriztan/developmentChristian S.2015-07-18109-1145/+2281
|\
| * Merge pull request #10 from kriztan/siacs-developmentChristian S.2015-07-1811-15/+39
| |\
| | * Version 1.5.0Christian S2015-07-1811-15/+39
| |/|
| | * bump version to 1.5.0Daniel Gultsch2015-07-181-2/+2
| | * pulled translationsDaniel Gultsch2015-07-187-1/+15
| | * account for downloaded http files in dup checkerDaniel Gultsch2015-07-181-8/+18
| | * code cleanupDaniel Gultsch2015-07-171-1/+1
| | * fixed inactive http downloadDaniel Gultsch2015-07-171-1/+1
| * | show contact name also in locations shared in MUCsChristian S2015-07-171-1/+13
| * | Merge pull request #8 from siacs/developmentChristian S.2015-07-173-5/+3
| |\|
| | * show error message in account details when info has not been editedDaniel Gultsch2015-07-171-1/+1
| | * increased ibb block sizeDaniel Gultsch2015-07-172-4/+2
| * | Merge pull request #7 from kriztan/siacs-developmentChristian S.2015-07-1633-122/+364
| |\ \
| | * | copy commitsChristian S2015-07-1633-122/+364
| |/| | | | |/
| | * version bump to 1.5.0-beta.2Daniel Gultsch2015-07-162-3/+3
| | * even less jumpyDaniel Gultsch2015-07-161-1/+3
| | * fixed some ux glitches in editaccountDaniel Gultsch2015-07-163-9/+9
| | * removed empty translation fileDaniel Gultsch2015-07-161-2/+0
| | * Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-07-161-3/+2
| | |\
| | * | made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-1628-104/+334
| | * | fixed some npesDaniel Gultsch2015-07-161-4/+11
| * | | Merge pull request #5 from siacs/developmentChristian S.2015-07-162-6/+13
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #1285 from kriztan/patch-2Daniel Gultsch2015-07-161-1/+0
| | |\ \
| | | * | fixed another typoChristian S.2015-07-161-1/+0
| | |/ /
| | * | Merge pull request #1283 from Manouchehri/developmentDaniel Gultsch2015-07-161-1/+1
| | |\ \
| | | * | Fixed broken URL.David Manouchehri2015-07-151-1/+1
| | | |/
| | * | Merge pull request #1284 from kriztan/patch-1Daniel Gultsch2015-07-161-1/+1
| | |\ \ | | | |/ | | |/|
| | | * fixed typoChristian S.2015-07-161-1/+1
| | |/
| | * mention http upload component in readmeDaniel Gultsch2015-07-151-1/+5
| | * fixed crash on invalid muc bookmarksDaniel Gultsch2015-07-151-3/+7
| * | show bigger avatar in 'publish profile picture' viewChristian S.2015-07-161-3/+3
| * | show bigger avatar in 'edit account' viewChristian S.2015-07-161-2/+2
| * | version 1.5.0 beta1Christian S.2015-07-141-1/+1
| * | Merge pull request #4 from kriztan/swipe-modificationChristian S.2015-07-141-70/+71
| |\ \
| | * | modified swipe optionsChristian S.2015-07-141-71/+71
| | * | swipe only to left to close an active conversationChristian S.2015-07-141-0/+1
| |/ /
| * | changed 'checking_image' to 'checking_file'Christian S2015-07-1421-22/+22
| * | deleted old filesChristian S2015-07-143-266/+0
| * | Merge branch 'development' of https://github.com/siacs/Conversations into sia...Christian S2015-07-1462-555/+899
| |\|
| | * renamed colorsDaniel Gultsch2015-07-1336-165/+162
| | * catch exception on broken android phonesDaniel Gultsch2015-07-121-1/+7
| | * made lock button reflect encryption status of the next messages instead of th...Daniel Gultsch2015-07-121-16/+10
| | * only try to change affilations for known jidsDaniel Gultsch2015-07-111-1/+1
| | * try to catch weird npe in android sdkDaniel Gultsch2015-07-111-0/+2
| | * null check otr fingerprint before displayDaniel Gultsch2015-07-111-1/+3
| | * spellingDaniel Gultsch2015-07-111-1/+1
| | * added changelogDaniel Gultsch2015-07-101-0/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 23:03:59 +0000