| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fixes FS#42 - Smilie replacement in url | lookshe | 2015-08-21 | 1 | -1/+25 |
| | | |||||
| * | fix wrong class type usage | lookshe | 2015-08-16 | 1 | -2/+1 |
| | | |||||
| * | fixes FS#13 - Change smiley replacement patterns to be case insensitive | lookshe | 2015-08-16 | 1 | -34/+18 |
| | | |||||
| * | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module | lookshe | 2015-08-16 | 20 | -0/+115 |
| | | |||||
| * | Merged https://github.com/ankushsachdeva/emojicon/pull/16 | lookshe | 2015-08-15 | 1 | -4/+24 |
| | | |||||
| * | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1 | lookshe | 2015-08-11 | 2 | -2/+2 |
| | | |||||
| * | moved color picker to libs | lookshe | 2015-04-15 | 34 | -0/+852 |
| | | |||||
| * | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 1018 | -0/+4064 |
| | | |||||
| * | Merge master-origin | steckbrief | 2015-02-20 | 23 | -2948/+0 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Switch to maven central minidns | Rene Treffer | 2015-01-14 | 23 | -2948/+0 |
| | | | |||||
| * | | changes to get it working under eclipse | lookshe | 2015-01-10 | 9 | -0/+30 |
| |/ | |||||
| * | update android gradle plugin to 0.14.4 | Michael | 2014-11-22 | 1 | -2/+5 |
| | | | | | | to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2. | ||||
| * | Subtree merged in openpgp api lib | Sam Whited | 2014-10-28 | 45 | -6/+1829 |
| | | |||||
| * | Subtree merged in minidns | Sam Whited | 2014-10-28 | 23 | -0/+2945 |
| | | |||||
| * | Remove minidns dir | Sam Whited | 2014-10-28 | 1 | -6/+0 |
| | | |||||
| * | Subtree merged in MemorizingTrustManager | Sam Whited | 2014-10-28 | 35 | -0/+1875 |
| | | |||||
| * | Move submodules back to libs/ | Sam Whited | 2014-10-26 | 3 | -0/+12 |
| | | |||||
| * | Pull otr4j form Maven repo | Sam Whited | 2014-10-26 | 1 | -0/+0 |
| | | |||||
| * | Suppress lint errors and remove bcprov | Sam Whited | 2014-10-22 | 1 | -0/+0 |
| | | |||||
| * | Add build deps and move build props to build file | Sam Whited | 2014-10-22 | 2 | -0/+0 |
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |