Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into develop

Browse Source 
Conflicts:
	CHANGES.rst
This commit is contained in:
Erik Johnston 2014-09-04 07:38:38 +01:00
commit 9f633bc125
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CHANGES.rst
View File

@ -1,18 +1,19 @@
Changes in synapse 0.2.1 (2014-09-03) Changes in synapse 0.2.1 (2014-09-03)
===================================== =====================================
Webclient:
* Implement 3PID login via email address
* Support for user management via IRC-style /kick, /ban/, /op
style slash commands
* Display user power levels in room member list as a red bar
Homeserver: Homeserver:
* Add synctl init.d style control script * Added support for signing up with a third party id.
* Implement identity server integration for 3PID signup * Add synctl scripts.
* Implement rate limiting * Added rate limiting.
* Implement content upload size limiting * Add option to change the external address the content repo uses.
* Bug fixes to power_levels * Presence bug fixes.
Webclient:
* Added support for signing up with a third party id.
* Added support for banning and kicking users.
* Added support for displaying and setting ops.
* Added support for room names.
* Fix bugs with room membership event display.
Changes in synapse 0.2.0 (2014-09-02) Changes in synapse 0.2.0 (2014-09-02)
===================================== =====================================

2
VERSION
View File

@ -1 +1 @@
0.2.0 0.2.1

2
synapse/__init__.py
View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a synapse home server. """ This is a reference implementation of a synapse home server.
""" """
__version__ = "0.2.0" __version__ = "0.2.1"

6
synctl
View File

@ -4,6 +4,7 @@ SYNAPSE="synapse/app/homeserver.py"
CONFIGFILE="homeserver.yaml" CONFIGFILE="homeserver.yaml"
PIDFILE="homeserver.pid" PIDFILE="homeserver.pid"
LOGFILE="homeserver.log"
GREEN=$'\e[1;32m' GREEN=$'\e[1;32m'
NORMAL=$'\e[m' NORMAL=$'\e[m'
@ -21,13 +22,12 @@ case "$1" in
fi fi
echo -n "Starting ..." echo -n "Starting ..."
$SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE" --log-file synapse.log $SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE" --log-file "$LOGFILE"
echo "${GREEN}started${NORMAL}" echo "${GREEN}started${NORMAL}"
;; ;;
stop) stop)
echo -n "Stopping ..." echo -n "Stopping ..."
test -f $PIDFILE && kill `cat $PIDFILE` test -f $PIDFILE && kill `cat $PIDFILE` && echo "${GREEN}stopped${NORMAL}"
echo "${GREEN}stopped${NORMAL}"
;; ;;
restart) restart)
$0 stop && $0 start $0 stop && $0 start