Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

[RELEASE] Merge develop into master#560

Merged
rafaelks merged 144 commits intomasterfrom
develop
Nov 28, 2017
Merged

[RELEASE] Merge develop into master#560
rafaelks merged 144 commits intomasterfrom
develop

Conversation

@rafaelks
Copy link
Contributor

@RocketChat/android

rsitrifork and others added 30 commits October 12, 2017 08:36
Hide item form query both when marked for deletion and when deleting (+1 squashed commits)

Squashed commits:

[5e01dc48] Added new syncstates for messages to be deleted
Added observer for messages marked for deletion
Added error handling for messages that could not be deleted
Changed delete action to use same permission as edit
…ed server anymore; add bundled notifications
Fix link to our Coding Style guidelines new location
leonardoaramaki and others added 28 commits November 21, 2017 17:02
Fix servers logging out on app update
Fix forced schema update without migration crash
…e appropriately when there is a connection change
@rafaelks rafaelks merged commit 5bbd3f7 into master Nov 28, 2017
GOVINDDIXIT pushed a commit to GOVINDDIXIT/Rocket.Chat.Android that referenced this pull request Aug 5, 2019
…elay

clear composer and enable send button before sending messages
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants