| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-23 | 22 | -71/+560 |
| |\ | | | | | | | | | | | | | | | | | 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 | 70 | -312/+638 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml | ||||
| | * | | DatabaseBackend updated to serve Conversatiosn Database version and ↵ | steckbrief | 2016-04-17 | 17 | -38/+393 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | 10 | -80/+94 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Implements FS#137: build flavors | steckbrief | 2016-04-18 | 4 | -50/+89 |
| | | | | | | | | | | | | | 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 | ||||
| * | | | Merge commit 'remotes/origin/trz/rename~4' into trz/rebase | steckbrief | 2016-04-18 | 0 | -0/+0 |
| |\| | | |||||
| | * | | removed unused string | lookshe | 2016-04-17 | 1 | -1/+0 |
| | | | | |||||
| | * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-04-17 | 71 | -275/+573 |
| | |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | |||||
| * | | | Merge tag '1.11.7' into trz/merge_1.11.7 | lookshe | 2016-04-17 | 71 | -310/+573 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml | ||||
| | * | | | version bump to 1.11.7 + changelog1.11.7 | Daniel Gultsch | 2016-04-14 | 2 | -2/+7 |
| | | | | | |||||
| | * | | | always notify by default in conferences | Daniel Gultsch | 2016-04-14 | 2 | -3/+1 |
| | | | | | |||||
| | * | | | removed unnecessary call to stopSelf() after logging out | Daniel Gultsch | 2016-04-14 | 1 | -5/+11 |
| | | | | | |||||
| | * | | | add setting for quick sharing | Daniel Gultsch | 2016-04-14 | 3 | -17/+51 |
| | | | | | |||||
| | * | | | removed unused call to cancel events | Daniel Gultsch | 2016-04-14 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | create Config varibale to show the disable foreground service button | Daniel Gultsch | 2016-04-13 | 2 | -3/+6 |
| | | | | | |||||
| | * | | | hacky workaround to determine if uri points to private file on < lolipop | Daniel Gultsch | 2016-04-13 | 3 | -9/+25 |
| | | | | | |||||
| | * | | | return own jid as true counterpart on self messages in muc | Daniel Gultsch | 2016-04-13 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | added share uri button to conference details | Daniel Gultsch | 2016-04-12 | 15 | -14/+43 |
| | | | | | |||||
| | * | | | reverse order in contact chooser | Daniel Gultsch | 2016-04-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | minor code cleanup | Daniel Gultsch | 2016-04-12 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | republish avatar if server offers non-persistent pep :-( | Daniel Gultsch | 2016-04-11 | 4 | -37/+144 |
| | | | | | |||||
| | * | | | version bump to 1.11.6 + changelog1.11.6 | Daniel Gultsch | 2016-04-10 | 2 | -2/+6 |
| | | | | | |||||
| | * | | | pulled translations from transifex | Daniel Gultsch | 2016-04-10 | 29 | -86/+27 |
| | | | | | |||||
| | * | | | add entries to gitignore | Daniel Gultsch | 2016-04-10 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | don't throw IO exception at end of stream | Daniel Gultsch | 2016-04-10 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | fixed 'connecting…' button | Daniel Gultsch | 2016-04-10 | 1 | -3/+6 |
| | | | | | |||||
| | * | | | moved authentication into seperate method. force close socket before ↵ | Daniel Gultsch | 2016-04-10 | 1 | -38/+44 |
| | | | | | | | | | | | | | | | | | changing status | ||||
| | * | | | introduced setting to turn of notification led | Daniel Gultsch | 2016-04-09 | 3 | -5/+15 |
| | | | | | |||||
| | * | | | update gradle and gradle plugin | Daniel Gultsch | 2016-04-09 | 3 | -4/+4 |
| | | | | | |||||
| | * | | | use startdate as lower bound when querying archive with after=x | Daniel Gultsch | 2016-04-09 | 1 | -13/+3 |
| | | | | | |||||
| | * | | | don't show contact details when in conversations with self | Daniel Gultsch | 2016-04-09 | 3 | -1/+8 |
| | | | | | |||||
| | * | | | use last received message id when querying archive | Daniel Gultsch | 2016-04-09 | 1 | -7/+17 |
| | | | | | |||||
| | * | | | transform nimbuzz workaround into a more general 'waitForDisco' condition | Daniel Gultsch | 2016-04-09 | 1 | -6/+11 |
| | | | | | |||||
| | * | | | add required disco#items query to timeout list | Daniel Gultsch | 2016-04-08 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | increase version code to fix nasty bug in 1.11.5 beta1.11.5 | Daniel Gultsch | 2016-04-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | removed ernoexception in exchange for a regular exeption to prevent verify ↵ | Daniel Gultsch | 2016-04-08 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | error on <5.0 | ||||
| | * | | | version bump to 1.11.5 + changelog | Daniel Gultsch | 2016-04-08 | 2 | -2/+5 |
| | | | | | |||||
| | * | | | pulled translations from transifex | Daniel Gultsch | 2016-04-08 | 2 | -3/+23 |
| | | | | | |||||
| | * | | | check file owner when attaching files or using them as avatar | Daniel Gultsch | 2016-04-07 | 4 | -2/+55 |
| | | | | | |||||
| | * | | | prevent null pointer when checking http upload max size | Daniel Gultsch | 2016-04-07 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | tell people to build debug instead of release | Daniel Gultsch | 2016-04-06 | 1 | -1/+1 |
| | | | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |