Merge branch 'master' into 'master' (3683f238) · Commits · eta / gajim · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

gajim
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

3683f238

Commit 3683f238 authored 7 years ago by Philipp Hörist

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Add MAM for MUCs

See merge request gajim/gajim!152

parents b6631153 7f1776ed

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

gajim/__init__.py 1 addition, 1 deletion

gajim/__init__.py
gajim/common/caps_cache.py 54 additions, 1 deletion

gajim/common/caps_cache.py
gajim/common/check_paths.py 8 additions, 0 deletions

gajim/common/check_paths.py
gajim/common/config.py 0 additions, 2 deletions

gajim/common/config.py
gajim/common/connection.py 21 additions, 8 deletions

gajim/common/connection.py
gajim/common/connection_handlers.py 34 additions, 8 deletions

gajim/common/connection_handlers.py
gajim/common/connection_handlers_events.py 112 additions, 64 deletions

gajim/common/connection_handlers_events.py
gajim/common/const.py 4 additions, 0 deletions

gajim/common/const.py
gajim/common/logger.py 73 additions, 10 deletions

gajim/common/logger.py
gajim/common/message_archiving.py 189 additions, 48 deletions

gajim/common/message_archiving.py
gajim/common/optparser.py 23 additions, 0 deletions

gajim/common/optparser.py
gajim/groupchat_control.py 19 additions, 0 deletions

gajim/groupchat_control.py
gajim/history_sync.py 77 additions, 92 deletions

gajim/history_sync.py
gajim/session.py 1 addition, 1 deletion

gajim/session.py

with 616 additions and 235 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment