aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* 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 options
| * 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 strings
| * | s/.../…/ in CS stringsSam Whited2015-01-071-2/+2
| |/ | | | | | | [ci skip]
* | Merge pull request #850 from plsng/dutchDaniel Gultsch2015-01-071-0/+25
|\ \ | |/ |/| Update Dutch translations
| * Update Dutch translationsNathan Follens2015-01-071-0/+25
| |
* | more muc optionsDaniel Gultsch2015-01-076-25/+99
| | | | | | | | | | | | * 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 branch 'development' of https://github.com/siacs/Conversations into ↵Daniel Gultsch2015-01-071-4/+15
|\ \ | | | | | | | | | development
| * \ Merge pull request #847 from kriztan/patch-1Daniel Gultsch2015-01-071-4/+15
| |\ \ | | |/ | |/| Updated German translations...
| | * Updated German translations...Christian S2015-01-071-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation? I've changed the translations. Updated German translations... Updated German translations...
* | | fixed invitesDaniel Gultsch2015-01-071-37/+24
|/ /
* | Merge pull request #845 from SamWhited/materialDaniel Gultsch2015-01-072-0/+15
|\ \ | | | | | | Add materials theme for v21 devices
| * | 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 ↵Daniel Gultsch2015-01-072-0/+10
|\ \ | | | | | | | | | development
| * \ Merge pull request #846 from kruks23/translation4Daniel Gultsch2015-01-071-0/+5
| |\ \ | | |/ | |/| Update spanish translation
| | * 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
| | | | | | | | fixed #842
* | Merge pull request #841 from BenoitBouvarel/patch-2Daniel Gultsch2015-01-061-1/+86
|\ \ | | | | | | Update strings.xml
| * | Update strings.xmlBenoit Bouvarel2015-01-061-1/+1
| | | | | | | | | char ">" was missing at line 285
| * | Update strings.xmlBenoit Bouvarel2015-01-051-1/+86
| | | | | | | | | French translation updated
* | | 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 ↵Daniel Gultsch2015-01-051-16/+16
|\ \ | | | | | | | | | development
| * | corrected German spellingsChristian Schneppe2015-01-051-16/+16
| | | | | | | | | and shorten some strings
* | | 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 ↵Daniel Gultsch2015-01-054-78/+130
| | | | | | | | display role
* | Merge pull request #838 from shtrom/pebble-notifications-squashDaniel Gultsch2015-01-051-2/+28
|\ \ | | | | | | Send notification to Pebble on new message
| * | Send notification to Pebble on new messageOlivier Mehani2015-01-051-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements basic notifications to the Pebble through the app (using an intent). This simply hooks into NotificationService.notify(). This is pretty basic, but it works (I haven't tested to see how the intent is received when the Pebble app is not around, though). More fancy stuff could probably be added to avoid getting flooded, but the Pebble app already does a good job a filtering notification (e.g., screen on or quiet times). Signed-off-by: Olivier Mehani <shtrom@ssji.net>
* | | Updated languages for higher auto accept file sizes and changed labeling to ↵Christian Schneppe2015-01-0514-416/+437
|/ / | | | | | | MiB and KiB
* | 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
| | | | | | | | also changed labeling to MiB and KiB
* | code cleanup + logging of spoofed iq packetsDaniel Gultsch2015-01-041-35/+33
| |
* | Verify IQ responsesSam Whited2015-01-044-18/+39
| | | | | | | | | | | | Fixes #20 Move fromServer/toServer to AbstractStanza
* | Make IqPacket type an enumSam Whited2015-01-049-99/+85
| |
* | Merge pull request #832 from svetlemodry/developmentDaniel Gultsch2015-01-041-1/+39
|\ \ | | | | | | Czech translation update
| * | Czech translation updateJaroslav Lichtblau2015-01-041-1/+39
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 19:28:37 +0000