aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * ensure that everyone is member before making a room privateDaniel Gultsch2015-01-093-6/+32
| * make project translatable via transifexDaniel Gultsch2015-01-0916-475/+12
| * added missing drawablesDaniel Gultsch2015-01-084-0/+0
| * allow for very basic muc configurationDaniel Gultsch2015-01-086-128/+239
| * code cleanupDaniel Gultsch2015-01-082-14/+15
| * kick after banDaniel Gultsch2015-01-084-1/+46
| * fixed german translationDaniel Gultsch2015-01-081-2/+2
| * some clean ups for affiliation change context menuDaniel Gultsch2015-01-083-6/+16
| * Merge pull request #851 from kriztan/patch-2Daniel Gultsch2015-01-071-9/+12
| |\
| | * Updated German translations for more muc optionsChristian S.2015-01-071-9/+12
| * | Merge pull request #852 from SamWhited/ellipsisDaniel Gultsch2015-01-071-2/+2
| |\ \
| | * | s/.../…/ in CS stringsSam Whited2015-01-071-2/+2
| | |/
| * | Merge pull request #850 from plsng/dutchDaniel Gultsch2015-01-071-0/+25
| |\ \ | | |/ | |/|
| | * Update Dutch translationsNathan Follens2015-01-071-0/+25
| * | more muc optionsDaniel Gultsch2015-01-076-25/+99
| * | Merge branch 'development' of https://github.com/siacs/Conversations into dev...Daniel Gultsch2015-01-071-4/+15
| |\ \
| | * \ Merge pull request #847 from kriztan/patch-1Daniel Gultsch2015-01-071-4/+15
| | |\ \ | | | |/ | | |/|
| | | * Updated German translations...Christian S2015-01-071-4/+15
| * | | fixed invitesDaniel Gultsch2015-01-071-37/+24
| |/ /
| * | Merge pull request #845 from SamWhited/materialDaniel Gultsch2015-01-072-0/+15
| |\ \
| | * | Add materials themeSam Whited2015-01-062-0/+15
| * | | basic affiliation changes in mucDaniel Gultsch2015-01-076-26/+160
| | |/ | |/|
| * | reset next encryption when archiving conversationsDaniel Gultsch2015-01-072-1/+3
| * | Merge branch 'development' of https://github.com/siacs/Conversations into dev...Daniel Gultsch2015-01-072-0/+10
| |\ \
| | * \ Merge pull request #846 from kruks23/translation4Daniel Gultsch2015-01-071-0/+5
| | |\ \ | | | |/ | | |/|
| | | * Update affiliation in MUC details and advance modekruks232015-01-071-0/+5
| | * | Czech translation for - show affiliation instead of role in MucDetailsJaroslav Lichtblau2015-01-061-0/+5
| * | | use copyonwritearraylist in for phone helperDaniel Gultsch2015-01-071-2/+2
| * | | refactored UiHelperDaniel Gultsch2015-01-071-2/+10
| |/ /
| * | fixed bug in new ping strategyDaniel Gultsch2015-01-061-3/+3
| * | mark sent images as sent_received instead of sentDaniel Gultsch2015-01-061-2/+1
| * | Merge pull request #841 from BenoitBouvarel/patch-2Daniel Gultsch2015-01-061-1/+86
| |\ \
| | * | Update strings.xmlBenoit Bouvarel2015-01-061-1/+1
| | * | Update strings.xmlBenoit Bouvarel2015-01-051-1/+86
| * | | run invalidateOptionsMenu on uiThreadDaniel Gultsch2015-01-061-1/+1
| * | | fixed potential NPEs in ShareWithActivityDaniel Gultsch2015-01-061-4/+5
| |/ /
| * | Merge branch 'development' of https://github.com/siacs/Conversations into dev...Daniel Gultsch2015-01-051-16/+16
| |\ \
| | * | corrected German spellingsChristian Schneppe2015-01-051-16/+16
| * | | added debug info + possible platform bug work arounds to message adapterDaniel Gultsch2015-01-051-0/+10
| * | | reworked ping scheduling strategy. very experimentalDaniel Gultsch2015-01-051-61/+32
| * | | avoid requesting blocklist after stream resumptionDaniel Gultsch2015-01-052-27/+24
| |/ /
| * | prevent QR code parser from crashing fixed #839Daniel Gultsch2015-01-051-6/+13
| * | Show affiliation instead of role in MucDetails and offer 'advanced mode' to d...Daniel Gultsch2015-01-054-78/+130
| * | Merge pull request #838 from shtrom/pebble-notifications-squashDaniel Gultsch2015-01-051-2/+28
| |\ \
| | * | Send notification to Pebble on new messageOlivier Mehani2015-01-051-2/+28
| * | | Updated languages for higher auto accept file sizes and changed labeling to M...Christian Schneppe2015-01-0514-416/+437
| |/ /
| * | made checks for valid image extensions case insensitiveDaniel Gultsch2015-01-043-3/+3
| * | do not run mam queries in findOrCreateConversation() when isn't availableDaniel Gultsch2015-01-041-5/+7
| * | added higher auto accept file sizesDaniel Gultsch2015-01-042-35/+39
| * | code cleanup + logging of spoofed iq packetsDaniel Gultsch2015-01-041-35/+33