Merge #8
Merged
Merge #8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Added basic model of customAside for informations.
omAside - restructured omAside - added default variables omAside - styling included in directive
Conflicts: src/app/main/apps/file-manager/side-menu.less src/app/main/apps/file-manager/variables.less
basic interface of chat-aside added
Chat now works with different structure. NOTE: Broken Commit
Added test messages
Added User delete function
html and angular bug fixes
Conflicts: bower.json src/app/index.module.js src/app/layouts/default.less src/app/main/apps/file-manager/file-manager.less
Search now works but only for chats (json problem with users)
In side menu added user preview in chats
Added default top menu for contacts
Added contact context menu Added contact delete with animation
Chat Merge
Chat accordion clickable areas increased
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge master to master