23 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
greg	eefdc88a47	Merge pull request 'Editable content' (#229) from feature/186-content_editing into master ... Reviewed-on: #229 Reviewed-by: Greg <greg@noreply.kosmos.org>	2025-05-30 11:14:50 +00:00
greg	0778f29a8e	Merge pull request 'Refactor ejabberd API integration' (#226) from core/refactor_ejabberd_integration into master ... Reviewed-on: #226 Reviewed-by: Greg <greg@noreply.kosmos.org>	2025-05-28 09:22:39 +00:00
greg	3dbde86cdf	Merge pull request 'Introduce membership statuses' (#227) from feature/contributor_status into master ... Reviewed-on: #227 Reviewed-by: Greg <greg@noreply.kosmos.org>	2025-05-28 09:16:02 +00:00
greg	308cac5a39	Merge pull request 'Add Mastodon API client, service for syncing avatars and display names' (#225) from feature/mastodon_api into master ... Reviewed-on: #225 Reviewed-by: Greg <greg@noreply.kosmos.org>	2025-05-23 08:48:15 +00:00
greg	ae5d63c613	Merge pull request 'Move remaining credentials from Rails credentials store to ENV' (#221) from chore/215-configs into master ... Reviewed-on: #221 Reviewed-by: Greg <greg@noreply.kosmos.org>	2025-05-06 17:16:32 +00:00
greg	b61906059c	Merge pull request 'Upgrade Rails to 8.0' (#216) from chore/upgrade_rails into master ... Reviewed-on: #216 Reviewed-by: Greg <greg@noreply.kosmos.org>	2025-04-30 08:36:16 +00:00
greg	7489d4a32f	Merge pull request 'Add config for separate primary domain Nostr pubkey' (#204) from feature/nostr_pubkey_primary_domain into master ... Reviewed-on: #204 Reviewed-by: Greg <greg@noreply.kosmos.org>	2024-09-13 12:33:11 +00:00
greg	17c419403e	Merge pull request 'Finish MVP of remoteStorage service pages/UI' (#202) from feature/rs_service_page into master ... Reviewed-on: #202 Reviewed-by: Greg <greg@noreply.kosmos.org>	2024-08-17 12:33:48 +00:00
greg	87f09c94d0	Merge pull request 'Fix/improve local ActiveStorage backend usage and handling of WebApp icons' (#162) from bugfix/local_web_app_icons into chore/update_dependencies ... Reviewed-on: #162 Reviewed-by: greg <greg@noreply.kosmos.org>	2024-02-27 16:07:55 +00:00
greg	83e3e2ecd8	Merge pull request 'Allow editing and resetting of all admin setting strings' (#137) from feature/admin_settings into master ... Reviewed-on: #137 Reviewed-by: greg <greg@noreply.kosmos.org>	2023-06-24 14:57:08 +00:00
greg	d130f2f68b	Merge pull request 'Allow users to set/update their display name in LDAP' (#128) from feature/123-display_names into master ... Reviewed-on: #128 Reviewed-by: greg <greg@noreply.kosmos.org>	2023-05-31 09:13:50 +00:00
greg	48be35f1b1	Merge pull request 'Allow updating one's email address on the account settings page' (#127) from feature/103-update_email into master ... Reviewed-on: #127 Reviewed-by: greg <greg@noreply.kosmos.org>	2023-05-26 18:07:07 +00:00
greg	87720ef285	Merge pull request 'Add feature flags' (#125) from feature/124-feature_flags into master ... Reviewed-on: #125 Reviewed-by: greg <greg@noreply.kosmos.org>	2023-05-26 17:56:50 +00:00
greg	18f4deb30f	Merge pull request 'Add (optional) Sentry integration' (#108) from feature/sentry_integration into master ... Reviewed-on: #108 Reviewed-by: greg <greg@noreply.kosmos.org>	2023-03-28 12:53:00 +00:00
greg	0d9fc4aa74	Merge pull request 'Make email settings configurable, add custom mailer for one-off emails' (#107) from feature/custom_mailer into master ... Reviewed-on: #107 Reviewed-by: greg <greg@noreply.kosmos.org>	2023-03-23 15:52:43 +00:00
greg	82475161a9	Merge branch 'master' into feature/custom_mailer	2023-03-23 15:38:43 +00:00
greg	cca44d7542	Merge branch 'master' into feature/ln_address_keysend	2023-03-02 15:49:13 +00:00
greg	cdad7546fb	Merge pull request 'Improve design of service grid on dashboard' (#97) from feature/dashboard_layout into master ... Reviewed-on: #97 Reviewed-by: greg <greg@noreply.kosmos.org>	2023-03-02 15:48:27 +00:00
greg	feb7833533	Merge branch 'master' into feature/dashboard_layout	2023-03-02 15:41:51 +00:00
greg	c8b65de7f6	Merge pull request 'Add service attribute to LDAP user entry' (#91) from feature/ldap_services into master ... Reviewed-on: #91 Reviewed-by: greg <greg@noreply.kosmos.org>	2023-03-01 09:57:53 +00:00
greg	2861254adf	Merge branch 'master' into feature/ldap_services	2023-03-01 09:35:53 +00:00
greg	1d2910dadb	Merge pull request 'Add pagination features, paginate admin pages' (#95) from feature/89-pagination into master ... Reviewed-on: #95 Reviewed-by: greg <greg@noreply.kosmos.org>	2023-03-01 09:34:58 +00:00
greg	fd2ebc4ad3	Merge pull request 'Cache dependencies on CI' (#6) from chore/cache_bundle_on_ci into master ... Reviewed-on: #6	2020-11-26 15:44:19 +00:00