aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de (follow)
Commit message (Expand)AuthorAgeFilesLines
* Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-0612-144/+134
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-0517-53/+196
|\
| * fixed installation error "W/PackageManager: Can't install because provider na...trz/beta-1lookshe2016-04-031-20/+0
| * fixed build errorlookshe2016-04-031-0/+2
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-0/+75
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-293-2/+161
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-281-3/+1
| |\ \ \
| * | | | wrong import in new classtrz/1.11.2.1lookshe2016-03-271-1/+1
| * | | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-0/+20
| |\ \ \ \
* | | | | | Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
* | | | | | Fixes FS#179: Avoid showing always empty list of ressources for mucssteckbrief2016-03-301-1/+3
* | | | | | Logging for FS#80 to identify calling methodlookshe2016-03-303-0/+6
* | | | | | Fixes FS#172: Conversations list not updated on status changessteckbrief2016-03-291-20/+9
* | | | | | Removed unnecessary importsteckbrief2016-03-291-1/+0
| |_|_|_|/ |/| | | |
* | | | | Avoid unnecessary text change on activate account buttonsteckbrief2016-03-291-2/+3
* | | | | Introduction of a TextViewUtil to easily set attributes for TextViewssteckbrief2016-03-296-69/+99
| |_|_|/ |/| | |
* | | | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-2916-101/+226
| |_|/ |/| |
* | | Merge branch 'master' of repos.thedevstack.de:conversations-plussteckbrief2016-03-283-3/+44
|\ \ \ | | |/ | |/|
| * | Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-273-3/+44
* | | Fixes FS#170: Message Details: Status display has different Text colorsteckbrief2016-03-282-4/+2
* | | Implements FS#176: error logging for httpupload improvedsteckbrief2016-03-281-1/+7
|/ /
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-2514-38/+83
|\|
| * FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+2
| * Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-59/+83
| |\
| * \ Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-201-0/+20
| |\ \
| | * \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-0/+20
| | |\ \
* | | | | Correct notifications to user if swiping with disabled or not connected accou...lookshe2016-03-221-25/+37
* | | | | Fixes FS#87 - Crash on load messages after delete accountlookshe2016-03-221-1/+5
* | | | | One more fix in Message.equals() (FS#104)lookshe2016-03-211-4/+19
* | | | | Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
* | | | | FS#104 - Fix Message.equals()lookshe2016-03-201-18/+14
| |_|_|/ |/| | |
* | | | Fixes FS#168 - Not possible to share more than one picture at oncelookshe2016-03-201-59/+83
* | | | fixed merge errorlookshe2016-03-201-1/+1
* | | | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-203-19/+27
|\| | |
| * | | fixed merge errorslookshe2016-03-201-1/+1
| |/ /
* | / Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-208-74/+115
|\| | | |/ |/|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-122-88/+3
| |\
* | | Fixes FS#167: Resized images are larger than original imagessteckbrief2016-03-181-2/+2
* | | Fixes FS#164lookshe2016-03-181-8/+0
* | | Fixes FS#156 and FS#135 (occured again)lookshe2016-03-171-4/+10
* | | completely implements FS#161lookshe2016-03-173-14/+41
* | | partially implements FS#161lookshe2016-03-162-17/+49
* | | once again: FS#34 - review all calls for String.trim()lookshe2016-03-142-4/+4
| |/ |/|
* | Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-125-97/+16
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-127-55/+93
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-112-2/+3
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-102-4/+7
| |\ \
* | | | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-113-77/+10
| |_|/ |/| |
* | | Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
| |/ |/|
* | Fixes FS#157: Trigger loading messages from MAM in MUC does not endsteckbrief2016-03-103-37/+45
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 23:28:34 +0000