Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | make project translatable via transifex | Daniel Gultsch | 2015-01-09 | 16 | -475/+12 | |
| | ||||||
* | added missing drawables | Daniel Gultsch | 2015-01-08 | 4 | -0/+0 | |
| | ||||||
* | allow for very basic muc configuration | Daniel Gultsch | 2015-01-08 | 6 | -128/+239 | |
| | ||||||
* | code cleanup | Daniel Gultsch | 2015-01-08 | 2 | -14/+15 | |
| | ||||||
* | kick after ban | Daniel Gultsch | 2015-01-08 | 4 | -1/+46 | |
| | ||||||
* | fixed german translation | Daniel Gultsch | 2015-01-08 | 1 | -2/+2 | |
| | ||||||
* | some clean ups for affiliation change context menu | Daniel Gultsch | 2015-01-08 | 3 | -6/+16 | |
| | ||||||
* | Merge pull request #851 from kriztan/patch-2 | Daniel Gultsch | 2015-01-07 | 1 | -9/+12 | |
|\ | | | | | Updated German translations for more muc options | |||||
| * | Updated German translations for more muc options | Christian S. | 2015-01-07 | 1 | -9/+12 | |
| | | ||||||
* | | Merge pull request #852 from SamWhited/ellipsis | Daniel Gultsch | 2015-01-07 | 1 | -2/+2 | |
|\ \ | | | | | | | s/.../…/ in CS strings | |||||
| * | | s/.../…/ in CS strings | Sam Whited | 2015-01-07 | 1 | -2/+2 | |
| |/ | | | | | | | [ci skip] | |||||
* | | Merge pull request #850 from plsng/dutch | Daniel Gultsch | 2015-01-07 | 1 | -0/+25 | |
|\ \ | |/ |/| | Update Dutch translations | |||||
| * | Update Dutch translations | Nathan Follens | 2015-01-07 | 1 | -0/+25 | |
| | | ||||||
* | | more muc options | Daniel Gultsch | 2015-01-07 | 6 | -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 Gultsch | 2015-01-07 | 1 | -4/+15 | |
|\ \ | | | | | | | | | | development | |||||
| * \ | Merge pull request #847 from kriztan/patch-1 | Daniel Gultsch | 2015-01-07 | 1 | -4/+15 | |
| |\ \ | | |/ | |/| | Updated German translations... | |||||
| | * | Updated German translations... | Christian S | 2015-01-07 | 1 | -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 invites | Daniel Gultsch | 2015-01-07 | 1 | -37/+24 | |
|/ / | ||||||
* | | Merge pull request #845 from SamWhited/material | Daniel Gultsch | 2015-01-07 | 2 | -0/+15 | |
|\ \ | | | | | | | Add materials theme for v21 devices | |||||
| * | | Add materials theme | Sam Whited | 2015-01-06 | 2 | -0/+15 | |
| | | | ||||||
* | | | basic affiliation changes in muc | Daniel Gultsch | 2015-01-07 | 6 | -26/+160 | |
| |/ |/| | ||||||
* | | reset next encryption when archiving conversations | Daniel Gultsch | 2015-01-07 | 2 | -1/+3 | |
| | | ||||||
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | Daniel Gultsch | 2015-01-07 | 2 | -0/+10 | |
|\ \ | | | | | | | | | | development | |||||
| * \ | Merge pull request #846 from kruks23/translation4 | Daniel Gultsch | 2015-01-07 | 1 | -0/+5 | |
| |\ \ | | |/ | |/| | Update spanish translation | |||||
| | * | Update affiliation in MUC details and advance mode | kruks23 | 2015-01-07 | 1 | -0/+5 | |
| | | | ||||||
| * | | Czech translation for - show affiliation instead of role in MucDetails | Jaroslav Lichtblau | 2015-01-06 | 1 | -0/+5 | |
| | | | ||||||
* | | | use copyonwritearraylist in for phone helper | Daniel Gultsch | 2015-01-07 | 1 | -2/+2 | |
| | | | ||||||
* | | | refactored UiHelper | Daniel Gultsch | 2015-01-07 | 1 | -2/+10 | |
|/ / | ||||||
* | | fixed bug in new ping strategy | Daniel Gultsch | 2015-01-06 | 1 | -3/+3 | |
| | | ||||||
* | | mark sent images as sent_received instead of sent | Daniel Gultsch | 2015-01-06 | 1 | -2/+1 | |
| | | | | | | | | fixed #842 | |||||
* | | Merge pull request #841 from BenoitBouvarel/patch-2 | Daniel Gultsch | 2015-01-06 | 1 | -1/+86 | |
|\ \ | | | | | | | Update strings.xml | |||||
| * | | Update strings.xml | Benoit Bouvarel | 2015-01-06 | 1 | -1/+1 | |
| | | | | | | | | | char ">" was missing at line 285 | |||||
| * | | Update strings.xml | Benoit Bouvarel | 2015-01-05 | 1 | -1/+86 | |
| | | | | | | | | | French translation updated | |||||
* | | | run invalidateOptionsMenu on uiThread | Daniel Gultsch | 2015-01-06 | 1 | -1/+1 | |
| | | | ||||||
* | | | fixed potential NPEs in ShareWithActivity | Daniel Gultsch | 2015-01-06 | 1 | -4/+5 | |
|/ / | ||||||
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | Daniel Gultsch | 2015-01-05 | 1 | -16/+16 | |
|\ \ | | | | | | | | | | development | |||||
| * | | corrected German spellings | Christian Schneppe | 2015-01-05 | 1 | -16/+16 | |
| | | | | | | | | | and shorten some strings | |||||
* | | | added debug info + possible platform bug work arounds to message adapter | Daniel Gultsch | 2015-01-05 | 1 | -0/+10 | |
| | | | ||||||
* | | | reworked ping scheduling strategy. very experimental | Daniel Gultsch | 2015-01-05 | 1 | -61/+32 | |
| | | | ||||||
* | | | avoid requesting blocklist after stream resumption | Daniel Gultsch | 2015-01-05 | 2 | -27/+24 | |
|/ / | ||||||
* | | prevent QR code parser from crashing fixed #839 | Daniel Gultsch | 2015-01-05 | 1 | -6/+13 | |
| | | ||||||
* | | Show affiliation instead of role in MucDetails and offer 'advanced mode' to ↵ | Daniel Gultsch | 2015-01-05 | 4 | -78/+130 | |
| | | | | | | | | display role | |||||
* | | Merge pull request #838 from shtrom/pebble-notifications-squash | Daniel Gultsch | 2015-01-05 | 1 | -2/+28 | |
|\ \ | | | | | | | Send notification to Pebble on new message | |||||
| * | | Send notification to Pebble on new message | Olivier Mehani | 2015-01-05 | 1 | -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 Schneppe | 2015-01-05 | 14 | -416/+437 | |
|/ / | | | | | | | MiB and KiB | |||||
* | | made checks for valid image extensions case insensitive | Daniel Gultsch | 2015-01-04 | 3 | -3/+3 | |
| | | ||||||
* | | do not run mam queries in findOrCreateConversation() when isn't available | Daniel Gultsch | 2015-01-04 | 1 | -5/+7 | |
| | | ||||||
* | | added higher auto accept file sizes | Daniel Gultsch | 2015-01-04 | 2 | -35/+39 | |
| | | | | | | | | also changed labeling to MiB and KiB | |||||
* | | code cleanup + logging of spoofed iq packets | Daniel Gultsch | 2015-01-04 | 1 | -35/+33 | |
| | | ||||||
* | | Verify IQ responses | Sam Whited | 2015-01-04 | 4 | -18/+39 | |
| | | | | | | | | | | | | Fixes #20 Move fromServer/toServer to AbstractStanza |