Commit Graph
32 Commits
Author SHA1 Message Date
gregkare 081222b75c Merge branch 'feature/140-ldap_application_accounts' of kosmos/chef into master 2020-02-27 10:45:46 +00:00
gregkare f34513220e Merge branch 'feature/130-remove_antispam' of kosmos/chef into master 2020-02-20 13:34:15 +00:00
gregkare c01f5c1038 Merge branch 'feature/127-new_ldap_dir_structure' of kosmos/chef into master 2020-02-20 13:29:05 +00:00
gregkareandGitea 585041e36c Merge branch 'bugfix/128-set_acis_on_users' of kosmos/chef into master 2020-02-14 15:47:16 +00:00
gregkareandGitea 484f1306da Merge branch 'chore/default_license' of kosmos/chef into master 2019-12-27 15:32:10 +00:00
gregkareandGitea 7fd558215d Merge branch 'feature/107-ldap_server' of kosmos/chef into master 2019-12-23 17:50:19 +00:00
gregkareandGitea f3a711ccfe Merge branch 'feature/mediawiki_file_uploads' of kosmos/chef into master 2019-12-20 16:09:10 +00:00
gregkareandGitea aecdaabbcc Merge branch 'chore/enable_wiki_editor_toolbar' of kosmos/chef into master 2019-11-29 16:38:08 +00:00
gregkareandGitea 056a3eb0d6 Merge branch 'bugfix/letsencrypt_regenerate_template' of kosmos/chef into master 2019-11-22 16:19:52 +00:00
gregkareandGitea 86c43dfb29 Merge branch 'bugfix/110-mastodon_broken_certbot' of kosmos/chef into master 2019-10-30 11:29:55 +00:00
gregkareandGitea 1b2edb770e Merge branch 'bugfix/mastodon-web_service' of kosmos/chef into master 2019-10-16 10:34:29 +00:00
gregkareandGitea 736a49a961 Merge branch 'feature/mastodon_improvements' of kosmos/chef into master 2019-10-09 11:02:43 +00:00
gregkareandGitea 23df44bb61 Merge branch 'feature/kredits_github_signup' of kosmos/chef into master 2019-09-05 08:14:49 +00:00
gregkareandGitea fcd56c836b Merge branch 'feature/hubot-wormhole' of kosmos/chef into master 2019-07-30 11:46:42 +00:00
gregkareandGitea 60a6a9da73 Merge branch 'bugfix/80-xmpp_uploads_location' of kosmos/chef into master 2019-07-19 17:12:11 +00:00
gregkareandGitea 7803513318 Merge branch 'feature/ipfs_pinner' of kosmos/chef into master 2019-07-04 08:26:40 +00:00
gregkareandGitea 0a3a2b5c2e Merge branch 'feature/62-hal8000_xmpp' of kosmos/chef into master 2019-05-10 08:04:07 +00:00
gregkareandGitea c5506d2d12 Merge branch 'bugfix/35-kredits-github_nginx' of kosmos/chef into master 2019-05-07 11:48:19 +00:00
gregkareandGitea 0a62f2d5e0 Merge branch 'chore/48-ipfs-cluster_0.10.1' of kosmos/chef into master 2019-05-02 09:16:51 +00:00
gregkareandGitea ec067d4b80 Merge branch 'feature/35-kredits_github' of kosmos/chef into master 2019-04-25 14:03:15 +00:00
gregkareandGitea 3566184277 Merge branch 'feature/hubot-kredits_config' of kosmos/chef into master 2019-04-25 14:02:34 +00:00
gregkareandGitea d4514a1871 Merge branch 'feature/add_ipfs_id' of kosmos/chef into master 2019-04-25 13:21:33 +00:00
gregkareandGitea e9121f69b0 Merge branch 'chore/firewall_rules' of kosmos/chef into master 2019-04-23 09:18:57 +00:00
gregkareandGitea 45c764c83e Merge branch 'feature/hubot-schedule' of kosmos/chef into master 2019-04-17 09:15:57 +00:00
gregkareandGitea 1d8686e07f Merge branch 'chore/hubot_help_config' of kosmos/chef into master 2019-04-17 07:43:26 +00:00
gregkareandGitea e64b85d532 Merge branch 'chore/update_kredits_config' of kosmos/chef into master 2019-04-17 07:43:10 +00:00
gregkareandGitea 227288e28e Merge branch 'chef_14' of kosmos/chef into master 2019-04-12 11:31:37 +00:00
gregkareandGitea c63e382586 Merge branch 'feature/12-chef_14' of kosmos/chef into master 2019-04-02 10:33:25 +00:00
gregkareandGitea f5dc267030 Merge branch 'feature/1-lets_encrypt' of kosmos/chef into master 2019-03-18 16:24:00 +00:00
gregkareandGitea e20ad9e6f9 Merge branch 'chore/cleantalk_update' of kosmos/chef into master 2019-03-14 08:34:48 +00:00
gregkareandGitea f6119a045f Merge branch 'moar_ports' of kosmos/chef into master 2019-02-28 15:04:48 +00:00
gregkareandGitea 20c724252d Merge branch 'feature/ipfs_updates' of kosmos/chef into master 2019-02-25 17:11:52 +00:00