Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fixes FS#33 - Get back the comment | lookshe | 2015-08-12 | 1 | -0/+5 | |
| | | ||||||
| * | Fixes FS#20: Limitation of end conversation swipe to left side | steckbrief | 2015-08-11 | 1 | -58/+59 | |
| | | ||||||
* | | resolve of some compiler errors | lookshe | 2015-08-13 | 3 | -1/+3 | |
| | | ||||||
* | | adjust version code to match fdroid regex | lookshe | 2015-08-13 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2015-08-11 | 446 | -2761/+8554 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml | |||||
| * | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1 | lookshe | 2015-08-11 | 446 | -2763/+8541 | |
| | | ||||||
| * | Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference | steckbrief | 2015-06-19 | 1 | -2/+4 | |
| | | ||||||
| * | Status color added to "create conversation" (refers to ticket #22 in flyspray) | steckbrief | 2015-06-19 | 6 | -2/+42 | |
| | | ||||||
* | | App-Name changed to "Conversations+" in strings.xml | steckbrief | 2015-06-19 | 2 | -4/+4 | |
| | | ||||||
* | | Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference | steckbrief | 2015-06-19 | 1 | -2/+5 | |
| | | ||||||
* | | Status color added to "create conversation" (refers to ticket #22 in flyspray) | steckbrief | 2015-06-19 | 6 | -2/+43 | |
| | | ||||||
* | | renaming eu.siacs.conversations to de.thedevstack.conversationsplus | steckbrief | 2015-06-19 | 137 | -780/+743 | |
|/ | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed | |||||
* | moved color picker to libs | lookshe | 2015-04-15 | 37 | -31/+219 | |
| | ||||||
* | changed received and read confirmation setting to one list and put it to ↵ | lookshe | 2015-04-14 | 10 | -83/+110 | |
| | | | | settings class | |||||
* | adjusted todo | lookshe | 2015-04-14 | 1 | -0/+1 | |
| | ||||||
* | check with lowercase to also match JPEG, JPeg ... | lookshe | 2015-04-13 | 1 | -1/+1 | |
| | ||||||
* | adjusted todo | lookshe | 2015-04-13 | 1 | -0/+1 | |
| | ||||||
* | changed last message in overview also to EmojiconTextView for displaying ↵ | lookshe | 2015-04-12 | 2 | -4/+9 | |
| | | | | smileys correctly | |||||
* | adjusted todo | lookshe | 2015-04-12 | 1 | -2/+0 | |
| | ||||||
* | better and perhaps faster way for checking if a message is downloadable | lookshe | 2015-04-12 | 1 | -10/+18 | |
| | ||||||
* | new settings to initialisation of Settings | lookshe | 2015-04-12 | 1 | -1/+1 | |
| | ||||||
* | implementation for downloading only when enabled wlan | lookshe | 2015-04-12 | 4 | -3/+30 | |
| | ||||||
* | added settings for accepting and downloading files | lookshe | 2015-04-12 | 24 | -29/+77 | |
| | | | | fix in Settings, initialize with same values like in preferences.xml | |||||
* | add missing resource files | lookshe | 2015-04-12 | 8 | -0/+0 | |
| | ||||||
* | Merge remote-tracking branch 'origin/trz/master' into trz/master | lookshe | 2015-04-12 | 1 | -3/+1 | |
|\ | ||||||
| * | adjusted todo | lookshe | 2015-04-12 | 1 | -3/+1 | |
| | | ||||||
* | | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 1026 | -27/+4231 | |
| | | ||||||
* | | whatsapp-like smiley implemantation | lookshe | 2015-04-12 | 1 | -1/+2 | |
|/ | ||||||
* | Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵ | steckbrief | 2015-04-11 | 7 | -22/+38 | |
|\ | | | | | | | trz/master | |||||
| * | show online status under avatar in same way for muc as the send button does | lookshe | 2015-04-11 | 1 | -13/+18 | |
| | | ||||||
| * | differ between received and read message | lookshe | 2015-04-11 | 6 | -9/+20 | |
| | | ||||||
* | | Color choose dialog | steckbrief | 2015-04-11 | 26 | -15/+688 | |
|/ | ||||||
* | no trim of messages or password | lookshe | 2015-04-11 | 7 | -9/+15 | |
| | | | | check password with only spaces separately | |||||
* | correct parsing of led color | lookshe | 2015-04-11 | 1 | -1/+1 | |
| | ||||||
* | todo added | lookshe | 2015-04-11 | 1 | -0/+1 | |
| | ||||||
* | Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵ | lookshe | 2015-04-11 | 88 | -635/+3322 | |
|\ | | | | | | | trz/master | |||||
| * | timestamp parsing reverted | steckbrief | 2015-03-31 | 2 | -16/+31 | |
| | | ||||||
| * | Configurable LED color (Attention: Expert setting because currently only ↵ | steckbrief | 2015-03-31 | 4 | -3/+19 | |
| | | | | | | | | text input) | |||||
| * | Changes for emoticon parser reactivated | steckbrief | 2015-03-31 | 5 | -8/+290 | |
| | | ||||||
| * | Merge tag '1.2.0' into trz/master | steckbrief | 2015-03-30 | 86 | -617/+2991 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml | |||||
| | * | bump version code1.2.0 | iNPUTmice | 2015-03-22 | 1 | -2/+2 | |
| | | | ||||||
| | * | pulled translations | iNPUTmice | 2015-03-22 | 5 | -0/+21 | |
| | | | ||||||
| | * | properly set chat states when receiving otr status messages | iNPUTmice | 2015-03-21 | 1 | -1/+1 | |
| | | | ||||||
| | * | respond to unreadable OTR messages with error message. fixed #1021 | iNPUTmice | 2015-03-21 | 5 | -3/+42 | |
| | | | ||||||
| | * | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2015-03-20 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | Update CHANGELOG.md | Daniel Gultsch | 2015-03-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | fixed plugin link | |||||
| | * | | wait for session iq to return sucessfully before sending other stanzas. ↵ | iNPUTmice | 2015-03-20 | 1 | -26/+42 | |
| | |/ | | | | | | | | | | fixed #1017 | |||||
| | * | version bump to 1.2.0-beta1.2.0-beta | iNPUTmice | 2015-03-19 | 2 | -3/+5 | |
| | | | ||||||
| | * | don't update presence for muc messages | iNPUTmice | 2015-03-19 | 1 | -5/+2 | |
| | | | ||||||
| | * | pulled more translations | iNPUTmice | 2015-03-19 | 1 | -0/+5 | |
| | | |