Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | republish pgp signature when changing status | Daniel Gultsch | 2016-05-05 | 10 | -25/+97 | |
| | | ||||||
| * | refactor captcha response handling to avoid network on main thread exception | Daniel Gultsch | 2016-05-05 | 3 | -35/+25 | |
| | | ||||||
| * | clear password field before setting new one | Daniel Gultsch | 2016-05-04 | 1 | -0/+1 | |
| | | ||||||
| * | fixed npe when calling changepassword activity directly | Daniel Gultsch | 2016-05-04 | 1 | -2/+4 | |
| | | ||||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-05-04 | 4 | -2/+21 | |
| | | ||||||
| * | spelling fixes | klemens | 2016-05-04 | 4 | -5/+5 | |
| | | ||||||
| * | Renaming of variable | Sebastian | 2016-05-03 | 1 | -6/+6 | |
| | | | | | | Was probably just a copy/paste typo. | |||||
| * | fixed presence template dedup for 'online' status | Daniel Gultsch | 2016-05-03 | 1 | -1/+2 | |
| | | ||||||
| * | use app name in resource suggestions | Daniel Gultsch | 2016-05-03 | 1 | -1/+1 | |
| | | ||||||
| * | ping all accounts at the same time | Daniel Gultsch | 2016-05-02 | 1 | -5/+17 | |
| | | ||||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-05-02 | 15 | -41/+353 | |
| | | ||||||
| * | show only username when registering account with magic create | Daniel Gultsch | 2016-05-02 | 2 | -13/+22 | |
| | | ||||||
| * | removed unnecessary logging | Daniel Gultsch | 2016-04-30 | 1 | -1/+0 | |
| | | ||||||
| * | properly cancel avatar tasks | Daniel Gultsch | 2016-04-29 | 3 | -5/+8 | |
| | | ||||||
| * | catch ActivityNotFoundException when requesting battery op | Daniel Gultsch | 2016-04-29 | 3 | -2/+13 | |
| | | ||||||
| * | port all android drop down list items to our own | Daniel Gultsch | 2016-04-29 | 3 | -10/+9 | |
| | | ||||||
| * | catch rare NPE when determining max http size | Daniel Gultsch | 2016-04-29 | 1 | -3/+3 | |
| | | ||||||
| * | synchronize around thumbnail cache to avoid loading images twice | Daniel Gultsch | 2016-04-28 | 1 | -12/+21 | |
| | | ||||||
| * | cancel potential tasks when receiving image preview from cache | Daniel Gultsch | 2016-04-28 | 1 | -3/+7 | |
| | | ||||||
| * | cleaned up captcha dialog | Daniel Gultsch | 2016-04-28 | 3 | -53/+69 | |
| | | ||||||
| * | don't request disco from self | Daniel Gultsch | 2016-04-28 | 2 | -3/+1 | |
| | | ||||||
| * | removed unused config variables | Daniel Gultsch | 2016-04-27 | 10 | -64/+14 | |
| | | ||||||
| * | made it possible to go back to welcome screen from edit account | Daniel Gultsch | 2016-04-27 | 2 | -4/+7 | |
| | | ||||||
| * | renamed welcome header to untranslatable 'Start your Conversations' | Daniel Gultsch | 2016-04-27 | 1 | -1/+1 | |
| | | ||||||
| * | prevent user from accidentally changing password after using magic create | Daniel Gultsch | 2016-04-26 | 7 | -23/+84 | |
| | | ||||||
| * | fixed table creation | Daniel Gultsch | 2016-04-25 | 1 | -10/+14 | |
| | | ||||||
| * | don't create templates for empty status messages | Daniel Gultsch | 2016-04-23 | 1 | -2/+6 | |
| | | ||||||
| * | add change prescence to manage account context menu | Daniel Gultsch | 2016-04-23 | 3 | -3/+16 | |
| | | ||||||
| * | show status messages in contact details | Daniel Gultsch | 2016-04-23 | 3 | -17/+56 | |
| | | ||||||
| * | expert setting to manually change presence | Daniel Gultsch | 2016-04-22 | 40 | -79/+683 | |
| | | ||||||
| * | put welcome screen in scrollview | Daniel Gultsch | 2016-04-22 | 1 | -62/+67 | |
| | | ||||||
| * | added magic create welcome screen | Daniel Gultsch | 2016-04-19 | 15 | -7/+348 | |
| | | ||||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-05-09 | 13 | -111/+140 | |
|\ \ | ||||||
| * | | XmppConnectionService.markMessage moved to MessageUtil | steckbrief | 2016-05-09 | 13 | -108/+132 | |
| | | | | | | | | | | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil | |||||
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-23 | 21 | -70/+559 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | |||||
| * | | Fixes FS#204: Observe all used directories | steckbrief | 2016-04-23 | 8 | -48/+138 | |
| | | | | | | | | | | | | | | | | | | | | | - Implementing the FileObserver in a separate class, with mask to watch only deletions not everything - Add observation of all directories which could contain a sent/received file - Change observers if the folder names are changed via settings - markMessage method moved from XmppConnectionService to MessageUtil | |||||
| * | | Related to FS#134: check if oldversion is smaller then new version on ↵ | steckbrief | 2016-04-23 | 1 | -2/+1 | |
| | | | | | | | | | | | | upgrading c+ db | |||||
| * | | Removed download decision MUST if the message contains jabber:x:oob:oob/url | steckbrief | 2016-04-19 | 1 | -3/+0 | |
| | | | ||||||
| * | | Persist Message.treatAsDownloadable | steckbrief | 2016-04-19 | 2 | -2/+15 | |
| | | | ||||||
| * | | Related to FS#134: Set Message flags according to httpupload hint | steckbrief | 2016-04-19 | 3 | -0/+9 | |
| | | | ||||||
| * | | Merge branch 'master' into introduce_cplus_database_version | steckbrief | 2016-04-18 | 64 | -305/+554 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml | |||||
| * | | | DatabaseBackend updated to serve Conversatiosn Database version and ↵ | steckbrief | 2016-04-17 | 13 | -20/+390 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conversations+ Database version HttpUpload Flag introduced for message to identify if a link was sent after httpupload message hint for httpupload added (message parsing and message generating) | |||||
* | | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-18 | 8 | -80/+42 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Implements FS#137: build flavors | steckbrief | 2016-04-18 | 2 | -50/+37 | |
| | | | | | | | | | | | | | | | | moved Config.java parameters to a flavorable configuration file | |||||
| * | | | Related to FS#199: fixed merge hickups (message correction setting removed, ↵ | steckbrief | 2016-04-18 | 2 | -8/+1 | |
| | | | | | | | | | | | | | | | | key for other expert settings readded) | |||||
| * | | | Related to FS#199: Removed unnecessary build configuration variable to hide ↵ | steckbrief | 2016-04-18 | 2 | -6/+3 | |
| | | | | | | | | | | | | | | | | disable button on foreground service notification | |||||
| * | | | Related to FS#199: Removed unnecessary differentiation between a ↵ | steckbrief | 2016-04-18 | 3 | -16/+1 | |
| | | | | | | | | | | | | | | | | conversation with the own account | |||||
| * | | | removed unused string | lookshe | 2016-04-17 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-04-17 | 64 | -250/+538 | |
| |\ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml | |||||
* | | | @Overrides addedtrz/merge_1.11.7 | lookshe | 2016-04-17 | 1 | -0/+6 | |
| | | |