 knotteye
|
4c1298cc5c
|
Merge pull request 'develop -> master' (#19) from develop into master
Reviewed-on: #19
|
3 years ago |
|
knotteye
|
1abb35f9ac
|
Update version for release
|
3 years ago |
|
knotteye
|
2ef1c80813
|
Merge pull request 'merge frontend-improvments' (#18) from frontend-improvments into develop
Reviewed-on: #18
|
3 years ago |
|
knotteye
|
8cb78a7dd6
|
Add code for re-checking if a user has gone live since loading the page
Also exempt static files from link rewriting in the SPA
There may be more in here.. It's been a long break halfway through this commit.
|
3 years ago |
|
knotteye
|
f703d5af7f
|
Stop accidentally capturing static file links
|
3 years ago |
|
knotteye
|
2a121d27ee
|
Merge pull request 'config-bugfix -> develop' (#13) from config-bugfix into develop
Reviewed-on: https://pond.waldn.net/git/knotteye/satyr/pulls/13
|
4 years ago |
|
knotteye
|
cc8c4915f9
|
Distinguish between errors when loading the config file.
|
4 years ago |
|
knotteye
|
d0e3507cc0
|
Merge pull request 'better-migration -> develop' (#12) from better-migration into develop
Reviewed-on: https://pond.waldn.net/git/knotteye/satyr/pulls/12
|
4 years ago |
|
knotteye
|
33accfb8b7
|
Select scripts to run based on comparing version strings and script names.
This means scripts need to insert a version value the same as their name to db_meta. This is nothing new, it just works better now.
|
4 years ago |
|
knotteye
|
3e073e7f66
|
Skip compiling templates when running migrations alone
|
4 years ago |
|
knotteye
|
47e036cde6
|
Merge pull request 'web-player -> develop' (#8) from web-player into develop
Reviewed-on: https://pond.waldn.net/git/knotteye/satyr/pulls/8
|
4 years ago |
|
knotteye
|
a75a625cd3
|
Merge branch 'develop' into web-player
|
4 years ago |
|
knotteye
|
7b5a498241
|
Fix manifest uri in user.njk
|
4 years ago |
|
knotteye
|
2a5e8d6ec2
|
Add play button functionality for web player
|
4 years ago |
|
knotteye
|
12e868456a
|
Add play button for shaka player. Needs functionality.
|
4 years ago |
|
knotteye
|
281d9c7922
|
Merge pull request 'master <- develop' (#7) from develop into master
Reviewed-on: https://pond.waldn.net/git/knotteye/satyr/pulls/7
|
4 years ago |
|
knotteye
|
fe3ec1bd75
|
Fix CORS issues in reccomended nginx config
|
4 years ago |
|
knotteye
|
07cba66096
|
Fix a typo in the generated config file
|
4 years ago |
|
knotteye
|
2de486da46
|
Switch to shaka-player and initialize it on pageload.
Maybe todo: more testing and re-check if the stream has started after the page has already loaded
|
4 years ago |
|
knotteye
|
2c073a7cdb
|
Update URLs with new repository
|
4 years ago |
|
knotteye
|
8a71680971
|
Merge pull request 'Fix a bug with migrate.ts calling a function incorrectly' (#4) from migrate-bugfix into develop
|
4 years ago |
|
knotteye
|
0900496d70
|
Fix a bug with migrate.ts calling a function incorrectly
|
4 years ago |
|
knotteye
|
34d6fa91df
|
Fix some typos in documentation
|
4 years ago |
|
knotteye
|
97b6f50b7c
|
Merge pull request 'master -> develop' (#2) from develop into master
Reviewed-on: http://localhost:3000/git/knotteye/satyr/pulls/2
|
4 years ago |
|
knotteye
|
94f240d4d6
|
Merge branch 'master' into develop
|
4 years ago |
|
knotteye
|
d8b327752e
|
Bump minor version
|
4 years ago |
|
knotteye
|
7107cb4c8f
|
Update documentation for new repository host
|
4 years ago |
|
knotteye
|
90cce68581
|
Fix bug
|
4 years ago |
|
knotteye
|
1fa6bf7e81
|
Update documentation
|
4 years ago |
|
knotteye
|
ab9a9b4585
|
Expose whether cluster mode is enabled over /api/instance/config
|
4 years ago |
|
knotteye
|
01744df3cd
|
Fix a bug where XMPP bridge would repeatedly ignore channels
|
4 years ago |
|
knotteye
|
ab082e5f95
|
Fix logging in cluster.ts
Fix a bug calling the cluster process in index.ts
Set a default value for rtmp.cluster in config.ts
Update documentation
|
4 years ago |
|
knotteye
|
de17128cd2
|
Merge branch 'xmpp-mirror' into 'develop'
Xmpp mirror
See merge request knotteye/satyr!30
|
4 years ago |
|
knotteye
|
cfa7c5ab13
|
Implement XMPP mirror
|
4 years ago |
|
knotteye
|
81afb7493b
|
Update config options for xmpp bridge
|
4 years ago |
|
knotteye
|
9a6e5c8798
|
Add documentation for configuring XMPP bridge
|
4 years ago |
|
knotteye
|
06dc05eb8b
|
Add a dependency for xmpp mirroring and add configurability
|
4 years ago |
|
knotteye
|
dfd0bc4881
|
Commit a local.css file to get rid of some error messages
|
4 years ago |
|
knotteye
|
30a62e6378
|
Handle back button when the user navigates to one of our own history events
|
4 years ago |
|
knotteye
|
cc3876ff4a
|
Update URL when navigating to new pages and push state to history in client-side SPA
|
4 years ago |
|
knotteye
|
56c4b94a80
|
Fix the start video function to avoid redudant calls
|
4 years ago |
|
knotteye
|
a5c1adfffc
|
Return live flag as well when getting user info
|
4 years ago |
|
knotteye
|
4d36c2c429
|
Merge branch 'develop' into 'master'
Develop -> Master
See merge request knotteye/satyr!29
|
4 years ago |
|
knotteye
|
18d521a35b
|
Merge branch 'cluster' into 'develop'
Cluster
See merge request knotteye/satyr!28
|
4 years ago |
|
knotteye
|
5126bccbc7
|
Add configurability to cluster option
|
4 years ago |
|
knotteye
|
80cf01ef30
|
Add unique ports per worker so that ffmpeg can reliably record.
|
4 years ago |
|
knotteye
|
1ae7128b9d
|
Update server code
|
4 years ago |
|
knotteye
|
7806b34cfa
|
Remove unused code
|
4 years ago |
|
knotteye
|
bdfac44e21
|
Add the beginnings of the ability to cluster RTMP servers. It looks like there won't be a way to reliably play RTMP streams like this without digging into node-media-server code.
For now that means clustering will have the drawback of being able to do DASH only.
Still need to add a config option and reliable recording.
|
4 years ago |
|
knotteye
|
9e5b3f360c
|
Merge branch 'client-templates' into 'develop'
Client templates -> develop
See merge request knotteye/satyr!27
|
4 years ago |
