Commit Graph

73 Commits

Author SHA1 Message Date
meaz dd632d29f5 Merge branch 'master' into cryptpad4.6.0 2021-06-17 04:29:13 +00:00
meaz 56a5277198
update to 4.7.0 2021-06-17 06:28:56 +02:00
muppeth 361ec7afe3 conversejs template - changed index variable (#14)
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: #14
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Co-committed-by: muppeth <muppeth@no-reply@disroot.org>
2021-06-08 21:28:31 +00:00
meaz bf33fdc640
add new config section in cryptpad 2021-06-01 17:54:32 +02:00
muppeth 47df845011 small fix for hubzilla template (#12)
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: #12
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Co-committed-by: muppeth <muppeth@no-reply@disroot.org>
2021-05-20 09:07:28 +00:00
muppeth 1dd23b29d0 cryptpad - commented out by default datastore location (#10)
Merge branch 'cryptpad' of git.disroot.org:Disroot-Ansible/nginx into cryptpad

fixed

Merge branch 'master' into cryptpad

Merge branch 'master' into cryptpad

cryptpad - commented out by default datastore location

Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #10
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-Authored-By: muppeth <muppeth@no-reply@disroot.org>
Co-Committed-By: muppeth <muppeth@no-reply@disroot.org>
2021-04-27 19:17:17 +00:00
meaz b314f0ce02 Merge pull request '[Mumble] Fix issue and match with vars from role' (#1) from mumble_web into master
Reviewed-on: #1
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-26 09:27:30 +00:00
meaz 2291f9488b Merge branch 'master' into mumble_web 2021-04-25 07:06:07 +00:00
meaz 33ce89f065 Merge pull request 'Delete 'README.md'' (#8) from meaz-patch-1 into master
Reviewed-on: #8
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-04-25 07:05:30 +00:00
meaz ca3368fcec Merge branch 'master' into meaz-patch-1 2021-04-25 07:05:18 +00:00
meaz 5ac71a99a1 Merge pull request 'update cryptpad 4.4.0' (#9) from cryptpad4.4.0 into master
Reviewed-on: #9
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-24 04:21:07 +00:00
meaz 90236a4823 Merge branch 'master' into mumble_web 2021-04-20 22:59:18 +00:00
meaz 296f970756 Delete 'README.md'
doublon with README.MD
2021-04-20 22:39:14 +00:00
meaz 26315a88f4
update cryptpad 2021-04-20 23:33:05 +02:00
meaz ac73da2014 Merge pull request 'add Permissions-Policy' (#7) from Permissions_policy into master
Reviewed-on: #7
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-17 05:38:18 +00:00
meaz ee1b806873
block per default 2021-04-16 10:13:11 +02:00
meaz 08ec367e61
add Permissions-Policy 2021-04-16 09:15:54 +02:00
muppeth d225515917 Small adjustments to header section in core template (#4)
Merge branch 'master' into template_fix

small adjustment to header section in core template

fixed missing closing bracket on base template

Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: #4
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-Authored-By: muppeth <muppeth@no-reply@disroot.org>
Co-Committed-By: muppeth <muppeth@no-reply@disroot.org>
2021-04-14 15:18:46 +00:00
meaz 58dcfd7c96 Merge branch 'master' into mumble_web 2021-04-11 15:07:31 +00:00
muppeth a9ebf9f942 Selfsigned cert task - initial work (#5)
initial commit for selfsigned cert task

Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: #5
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-Authored-By: muppeth <muppeth@no-reply@disroot.org>
Co-Committed-By: muppeth <muppeth@no-reply@disroot.org>
2021-04-11 13:43:35 +00:00
meaz e7b0fd2b9c
Fix issue and match with vars from role 2021-04-06 17:44:02 +02:00
muppeth 2841af5dae
Migration commit; fresh start 2021-03-14 11:20:09 +01:00
muppeth d18af111e5 Initial commit 2021-03-14 10:15:19 +00:00