Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge pull request #885 from SamWhited/display-enter-key | Daniel Gultsch | 2015-01-14 | 2 | -0/+7 | |
| |\ | | | | | | | Add option to swap enter/emoticon key | |||||
| | * | Add option to swap enter/emoticon key | Sam Whited | 2015-01-14 | 2 | -0/+7 | |
| | | | ||||||
| * | | Harden the TLS connection cipher suites | Sam Whited | 2015-01-14 | 1 | -1/+1 | |
| |/ | ||||||
| * | Fix bottom padding on about page | Sam Whited | 2015-01-13 | 1 | -1/+1 | |
| | | ||||||
| * | make use of different dimensions for different screen sizes | Daniel Gultsch | 2015-01-13 | 15 | -114/+56 | |
| | | ||||||
| * | Merge pull request #872 from Elinvention/development | Daniel Gultsch | 2015-01-13 | 1 | -25/+104 | |
| |\ | | | | | | | Updated Italian translations | |||||
| | * | Updated Italian translations | Elia | 2015-01-13 | 1 | -25/+104 | |
| | | | ||||||
| * | | Merge pull request #873 from SamWhited/about-margin-fix | Daniel Gultsch | 2015-01-13 | 1 | -4/+4 | |
| |\ \ | | |/ | |/| | Use margin instead of padding on about screen | |||||
| | * | Use margin instead of padding in about screen | Sam Whited | 2015-01-12 | 1 | -4/+4 | |
| | | | ||||||
| * | | Czech translation | Jaroslav Lichtblau | 2015-01-12 | 1 | -9/+37 | |
| |/ | | | | | | | updated | |||||
| * | context menu for files and offered files. fixed #848 fixed #849 | Daniel Gultsch | 2015-01-12 | 2 | -4/+3 | |
| | | ||||||
| * | reworked message preview / message meta information (ie file offered, ↵ | Daniel Gultsch | 2015-01-12 | 1 | -5/+8 | |
| | | | | | | | | | | | | received * file) fixed #837 | |||||
| * | shortened some string | Daniel Gultsch | 2015-01-11 | 2 | -2/+3 | |
| | | ||||||
| * | fixed #860 | Daniel Gultsch | 2015-01-10 | 1 | -0/+1 | |
| | | ||||||
| * | Introduced expert options to control enter-is-send | Daniel Gultsch | 2015-01-09 | 2 | -0/+10 | |
| | | | | | | | | (default == off) | |||||
| * | 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 | 3 | -118/+160 | |
| | | ||||||
| * | kick after ban | Daniel Gultsch | 2015-01-08 | 1 | -0/+1 | |
| | | ||||||
| * | fixed german translation | Daniel Gultsch | 2015-01-08 | 1 | -2/+2 | |
| | | ||||||
| * | some clean ups for affiliation change context menu | Daniel Gultsch | 2015-01-08 | 2 | -4/+8 | |
| | | ||||||
| * | 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 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | * 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 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... | |||||
| * | | 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 | 2 | -1/+28 | |
| | |/ | |/| | ||||||
| * | | 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 | |
| | | | ||||||
| * | | 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 | |||||
| * | | corrected German spellings | Christian Schneppe | 2015-01-05 | 1 | -16/+16 | |
| | | | | | | | | | and shorten some strings | |||||
| * | | Show affiliation instead of role in MucDetails and offer 'advanced mode' to ↵ | Daniel Gultsch | 2015-01-05 | 2 | -0/+12 | |
| | | | | | | | | | | | | display role | |||||
| * | | Updated languages for higher auto accept file sizes and changed labeling to ↵ | Christian Schneppe | 2015-01-05 | 14 | -416/+437 | |
| | | | | | | | | | | | | MiB and KiB | |||||
| * | | added higher auto accept file sizes | Daniel Gultsch | 2015-01-04 | 1 | -33/+37 | |
| | | | | | | | | | | | | also changed labeling to MiB and KiB | |||||
| * | | Czech translation update | Jaroslav Lichtblau | 2015-01-04 | 1 | -1/+39 | |
| | | | ||||||
| * | | Merge pull request #829 from kriztan/patch-1 | Daniel Gultsch | 2015-01-04 | 1 | -1/+1 | |
| |\ \ | | |/ | |/| | corrected German 'private_message_to' | |||||
| | * | corrected German 'private_message_to' | kriztan | 2015-01-04 | 1 | -1/+1 | |
| | | | ||||||
| * | | Update spanish translations | sergio | 2015-01-04 | 1 | -1/+15 | |
| |/ | ||||||
* | | - Avoiding accessing shared preferences to know if emoticons should be ↵ | steckbrief | 2015-01-20 | 1 | -1/+11 | |
| | | | | | | | | | | | | parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status") | |||||
* | | Setting added for parsing emoticons or not | Tristan Zur | 2015-01-11 | 3 | -0/+9 | |
| | | ||||||
* | | Merge branch 'master' of ssh://git.fucktheforce.de/conversations | lookshe | 2015-01-03 | 27 | -397/+901 | |
|\| | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/Config.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 | |||||
| * | Added and modified German translations | kriztan | 2015-01-03 | 1 | -5/+11 | |
| | |