| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-17 | 5 | -7/+42 |
| |\ | |||||
| | * | Log error in case logcat command could not be executed; Show toast in case ↵ | steckbrief | 2015-12-17 | 5 | -7/+42 |
| | | | | | | | | | nothing is copied | ||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-16 | 51 | -2465/+423 |
| |\| | |||||
| | * | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵ | steckbrief | 2015-12-16 | 18 | -217/+385 |
| | | | | | | | | | distinguishes between image resizing and compressing/saving | ||||
| | * | Fixes FS#95: NPE when opening message details for failed file transfer | steckbrief | 2015-12-16 | 1 | -1/+2 |
| | | | |||||
| | * | Fixes FS#88, Code cleanup | steckbrief | 2015-12-14 | 1 | -4/+5 |
| | | | |||||
| | * | Fixes FS#88: Avoid smilie repacement in time messages | steckbrief | 2015-12-14 | 1 | -4/+9 |
| | | | |||||
| | * | Build cleanup: libraries added as local resources, removed unused proguard ↵ | steckbrief | 2015-12-14 | 31 | -2240/+23 |
| | | | | | | | | | configs, removed SwipyRefreshLayout as module and added as binary dependency, moved 3rd party binaries to separate folder | ||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-11 | 3 | -3271/+0 |
| |\| | |||||
| | * | Removed unnecessary files | steckbrief | 2015-12-11 | 3 | -3271/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-11 | 3 | -208/+151 |
| |\| | |||||
| | * | Removed stupid DNS query code | steckbrief | 2015-12-11 | 3 | -205/+147 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-10 | 47 | -415/+280 |
| |\| | |||||
| | * | Moved logcat to a module, increased error robustness for loading last messages | steckbrief | 2015-12-10 | 47 | -71/+237 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-06 | 3 | -2/+15 |
| |\| | |||||
| | * | Fix flagging no more messages on server for conversation | steckbrief | 2015-12-06 | 3 | -2/+15 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 16 | -22/+2168 |
| |\| | |||||
| | * | Implements FS#83: Reload from last received message | steckbrief | 2015-12-04 | 16 | -22/+2168 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 1 | -3/+6 |
| |\| | |||||
| | * | Implements FS#89 - Change about information | steckbrief | 2015-12-04 | 1 | -3/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 23 | -124/+124 |
| |\| | |||||
| | * | Fixes FS#75 - Change color names to reasonable names | steckbrief | 2015-12-04 | 23 | -124/+124 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 2 | -2/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 1 | -1/+1 |
| |\| | |||||
| | * | Fixed compile error in inner class | steckbrief | 2015-12-02 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 43 | -227/+690 |
| |\| | |||||
| | * | Partially implements FS#6: Conference ID changed to c+bugs@confere | steckbrief | 2015-11-20 | 3 | -1/+4 |
| | | | | | | | | | nce.thedevstack.de | ||||
| | * | Implements FS#67: Introduce central logging class to use log prefix, new ↵ | steckbrief | 2015-11-20 | 42 | -226/+686 |
| | | | | | | | | | activity to show logcat output and button to copy contents | ||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-11-06 | 22 | -579/+786 |
| |\| | |||||
| | * | FileBackend splitted into several util classes for separate concerns: ↵ | steckbrief | 2015-11-06 | 22 | -580/+771 |
| | | | | | | | | | AvatarUtil, StreamUtil, ImageUtil. Unused imports removed. | ||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-11-03 | 21 | -172/+603 |
| |\| | |||||
| | * | Implements FS#26: Introduction of dialog to choose whether to resize a ↵ | steckbrief | 2015-11-03 | 18 | -173/+551 |
| | | | | | | | | | picture or not | ||||
| | * | Implements FS#24: Introduce setting for picture resizing | steckbrief | 2015-10-30 | 7 | -1/+52 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-23 | 12 | -30/+43 |
| |\| | |||||
| | * | Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵ | steckbrief | 2015-10-23 | 12 | -30/+41 |
| | | | | | | | | | values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class | ||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-22 | 1 | -1/+2 |
| |\| | |||||
| | * | Implements FS#78: Allow installation on SD card | steckbrief | 2015-10-22 | 1 | -1/+2 |
| | | | |||||
| * | | Merge trz/rename into trz/rebase | steckbrief | 2015-10-22 | 25 | -351/+536 |
| |\| | |||||
| | * | Access to preferences moved to global utility class ↵ | steckbrief | 2015-10-21 | 24 | -350/+532 |
| | | | | | | | | | ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed. | ||||
| | * | added comment for clarification, why the timestamp of the first msg of msg ↵ | steckbrief | 2015-10-17 | 1 | -1/+1 |
| | | | | | | | | | list is needed to query older msgs with mam | ||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-16 | 3 | -1/+18 |
| |\| | |||||
| | * | C+ changelog updated | steckbrief | 2015-10-16 | 1 | -1/+2 |
| | | | |||||
| | * | Fixes FS#82: Background color of conversation list item set to primary ↵ | steckbrief | 2015-10-16 | 2 | -1/+4 |
| | | | | | | | | | background color | ||||
| | * | Conversations Plus ChangeLog added | steckbrief | 2015-10-16 | 1 | -0/+13 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-15 | 3 | -36/+64 |
| |\| | |||||
| | * | Removed unused imports | steckbrief | 2015-10-15 | 1 | -4/+0 |
| | | | |||||
| | * | Fixes FS#81 - avoid jumps after loading messages | steckbrief | 2015-10-15 | 2 | -32/+64 |
| | | | |||||
| * | | fix imports and namespaces | steckbrief | 2015-10-05 | 2 | -1/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-05 | 7 | -36/+76 |
| |\| | | | | | | | | | | | | | | | Manually merged conflicting files: src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/ui/AboutPreference.java | ||||
| | * | Merge branch 'master' of ssh://git.fucktheforce.de/conversations-plus | steckbrief | 2015-10-05 | 1 | -2/+2 |
| | |\ | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |