| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1 | lookshe | 2015-08-11 | 24 | -201/+227 |
| | | |||||
| * | Status color added to "create conversation" (refers to ticket #22 in flyspray) | steckbrief | 2015-06-19 | 1 | -2/+9 |
| | | |||||
| * | moved color picker to libs | lookshe | 2015-04-15 | 2 | -145/+0 |
| | | |||||
| * | changed last message in overview also to EmojiconTextView for displaying ↵ | lookshe | 2015-04-12 | 1 | -3/+6 |
| | | | | | smileys correctly | ||||
| * | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 3 | -7/+22 |
| | | |||||
| * | Color choose dialog | steckbrief | 2015-04-11 | 2 | -0/+145 |
| | | |||||
| * | Merge master-origin | steckbrief | 2015-02-20 | 10 | -136/+209 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.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 src/main/res/values-de/strings.xml | ||||
| | * | Use Material Design Icons on API 21+ | Sam Whited | 2015-01-29 | 3 | -4/+4 |
| | | | |||||
| | * | always allow access to contact details. provide add button in contact details | iNPUTmice | 2015-01-21 | 1 | -0/+7 |
| | | | |||||
| | * | Fixed action bar search for Android 5.0 | iNPUTmice | 2015-01-20 | 1 | -4/+4 |
| | | | |||||
| | * | explain read marker | iNPUTmice | 2015-01-18 | 1 | -0/+13 |
| | | | |||||
| | * | 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 | 6 | -15/+39 |
| | | | |||||
| | * | Use margin instead of padding in about screen | Sam Whited | 2015-01-12 | 1 | -4/+4 |
| | | | |||||
| | * | shortened some string | Daniel Gultsch | 2015-01-11 | 1 | -0/+1 |
| | | | |||||
| | * | fixed #860 | Daniel Gultsch | 2015-01-10 | 1 | -0/+1 |
| | | | |||||
| | * | allow for very basic muc configuration | Daniel Gultsch | 2015-01-08 | 1 | -115/+142 |
| | | | |||||
| * | | - 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") | ||||
| * | added missing layout file | Daniel Gultsch | 2015-01-03 | 1 | -0/+105 |
| | | |||||
| * | migrated change password into separate activity | Daniel Gultsch | 2015-01-03 | 1 | -9/+0 |
| | | |||||
| * | fixed layout file | Daniel Gultsch | 2015-01-02 | 1 | -1/+1 |
| | | |||||
| * | improved OTR verification part one | Daniel Gultsch | 2015-01-02 | 1 | -188/+146 |
| | | |||||
| * | code cleanup for change password stuff | Daniel Gultsch | 2014-12-25 | 1 | -1/+1 |
| | | |||||
| * | Add ability to change password on server | Sam Whited | 2014-12-25 | 1 | -2/+9 |
| | | | | | Fixes #260 | ||||
| * | Add more server compatibility info. | Sam Whited | 2014-12-23 | 1 | -4/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide server info behind a checkbox. Add XEP-0352 support to the server info list Add XEP-0237 to server info list Add XEP-0352 support to the server info list Add MaM and Blocking to the account XEPs list Also add a toggle button to hide some of the list Rebase on current codebase Make MAM string more descriptive Change show more button to checkbox menu item Shorten `MAM (History)' to `MAM' Order XEP list and hide all by default Supress warning (which is wrong anyways) Change `Show more' to `Show more info' | ||||
| * | Accessibility: Add missing image descriptions | Sam Whited | 2014-11-29 | 2 | -3/+6 |
| | | |||||
| * | show dynamic tags in contacts activity as well | iNPUTmice | 2014-11-18 | 1 | -12/+7 |
| | | |||||
| * | happy hanukkah | iNPUTmice | 2014-11-16 | 2 | -1/+20 |
| | | |||||
| * | made scan and show qr code more accessible in VerifyOtrActivity | iNPUTmice | 2014-11-16 | 1 | -5/+5 |
| | | |||||
| * | added snackbar to indicate smp. more error handling in verify activity | iNPUTmice | 2014-11-11 | 1 | -0/+12 |
| | | |||||
| * | initial smp support | iNPUTmice | 2014-11-11 | 2 | -60/+177 |
| | | |||||
| * | reformated license a bit | iNPUTmice | 2014-11-04 | 1 | -3/+3 |
| | | |||||
| * | Shorten license text and fix height of scrollview | Sam Whited | 2014-11-04 | 1 | -2/+2 |
| | | |||||
| * | Use normal text size and color | Sam Whited | 2014-11-04 | 1 | -1/+4 |
| | | |||||
| * | Make links clickable in about text | Sam Whited | 2014-11-04 | 1 | -1/+3 |
| | | |||||
| * | Convert about dialog to activity | Sam Whited | 2014-11-04 | 1 | -0/+16 |
| | | |||||
| * | show avatar in editaccount | iNPUTmice | 2014-11-04 | 1 | -4/+14 |
| | | |||||
| * | Wrap "last seen" time. | Sam Whited | 2014-11-03 | 1 | -2/+1 |
| | | | | | Fixes #611 | ||||
| * | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 2 | -4/+4 |
| | | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | ||||
| * | Make conversations the root project | Sam Whited | 2014-10-22 | 24 | -0/+1435 |
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |