Merge branch 'master' into live

Fix pages views when signed out
2025-06-12 16:10:06 +04:00 · 2025-06-12 16:09:42 +04:00 · 2025-06-12 15:39:15 +04:00 · 2025-05-30 20:22:04 +04:00 · 2025-05-30 16:53:05 +04:00 · 2025-05-30 11:14:50 +00:00
19 changed files with 94 additions and 43 deletions
--- a/app/assets/stylesheets/components/base.css
+++ b/app/assets/stylesheets/components/base.css
@@ -61,7 +61,7 @@
    @apply leading-6;
  }

-  main section a:not(nav > *):not(data-tabs-target=[tab] > *) {
+  main a:not(nav > *) {
    @apply text-blue-600;
    &:hover   { @apply underline; }
    &:visited { @apply text-indigo-600; }
--- a/app/components/main_compact_component.html.erb
+++ b/app/components/main_compact_component.html.erb
@@ -1,4 +1,4 @@
-<main class="w-full max-w-xl mx-auto pb-12 px-4 sm:px-6 lg:px-8">
+<main class="w-full max-w-xl mx-auto px-4 sm:px-6 lg:px-8">
  <div class="bg-white rounded-lg shadow px-6 sm:px-12 py-8 sm:py-12">
    <%= content %>
  </div>
--- a/app/components/main_simple_component.html.erb
+++ b/app/components/main_simple_component.html.erb
@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
  <div class="md:min-h-[50vh] bg-white rounded-lg shadow px-6 sm:px-12 py-8 sm:py-12">
    <%= content %>
  </div>
--- a/app/components/main_with_sidenav_component.html.erb
+++ b/app/components/main_with_sidenav_component.html.erb
@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
  <div class="bg-white rounded-lg shadow">
    <div class="md:min-h-[50vh] divide-y divide-gray-200 lg:grid lg:grid-cols-12 lg:divide-y-0 lg:divide-x">
      <aside class="py-6 sm:py-8 lg:col-span-3">
--- a/app/components/main_with_tabnav_component.html.erb
+++ b/app/components/main_with_tabnav_component.html.erb
@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
  <div class="md:min-h-[50vh] bg-white rounded-lg shadow">
    <div class="px-6 sm:px-12 pt-2 sm:pt-4">
      <%= render partial: @tabnav_partial %>
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -0,0 +1,9 @@
+class PagesController < ApplicationController
+  def privacy
+    @current_section = :privacy
+  end
+
+  def tos
+    @current_section = :tos
+  end
+end
--- a/app/services/ejabberd_manager/set_avatar.rb
+++ b/app/services/ejabberd_manager/set_avatar.rb
@@ -11,7 +11,7 @@ module EjabberdManager
    def call
      unless @overwrite
        current_avatar = EjabberdManager::GetAvatar.call(user: @user)
-        Rails.logger.info { "User #{user.cn} already has an avatar set" }
+        Rails.logger.info { "User #{@user.cn} already has an avatar set" }
        return if current_avatar.present?
      end

--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -47,7 +47,7 @@
            data: { action: "click->settings--toggle#toggleSwitch" } %>
      <p class="grow text-sm text-right">
        <%= link_to "Forgot your password?", new_password_path(resource_name),
-              class: "text-gray-500 underline" %><br />
+              class: "text-gray-500 visited:text-gray-500 underline" %><br />
      </p>
    <% end %>

--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -2,28 +2,28 @@
  <%- if controller_name != 'sessions' %>
    <p class="mb-2">
      <%= link_to "Log in", new_session_path(resource_name),
-            class: "text-gray-500 underline" %>
+            class: "text-gray-500 visited:text-gray-500 underline" %>
    </p>
  <% end %>

  <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
    <p class="mb-2">
      <%= link_to "Forgot your password?", new_password_path(resource_name),
-            class: "text-gray-500 underline" %>
+            class: "text-gray-500 visited:text-gray-500 underline" %>
    </p>
  <% end %>

  <%- if devise_mapping.confirmable? && !controller_name.match(/^(confirmations|sessions)$/) %>
    <p class="mb-2">
      <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name),
-            class: "text-gray-500 underline" %>
+            class: "text-gray-500 visited:text-gray-500 underline" %>
    </p>
  <% end %>

  <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
    <p class="mb-2">
      <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name),
-            class: "text-gray-500 underline" %>
+            class: "text-gray-500 visited:text-gray-500 underline" %>
    </p>
  <% end %>
 </div>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,7 +10,7 @@
    <%= javascript_importmap_tags %>
  </head>
  <body <%= @context.present? ? "id=#{@context}" : "" %> class="h-full <%= @context == :admin ? "bg-red-500" : "bg-sky-900" %>">
-    <div class="min-h-full">
+    <div class="min-h-full flex flex-col">
      <nav data-controller="topbar">
        <div class="max-w-6xl mx-auto sm:px-6 lg:px-8">
          <div class="border-b border-gray-200/10">
@@ -96,7 +96,18 @@
        </div>
      </div>

-      <%= yield %>
+      <div class="flex-grow">
+        <%= yield %>
+      </div>
+
+      <% if user_signed_in? && current_user.confirmed? %>
+      <nav id="footer" class="max-w-6xl mx-auto pt-4 sm:px-6 lg:px-8">
+        <div class="flex justify-end items-center space-x-4 h-16">
+          <%= link_to "Terms", tos_page_path, class: main_nav_class(@current_section, :tos) %>
+          <%= link_to "Privacy", privacy_page_path, class: main_nav_class(@current_section, :privacy) %>
+        </div>
+      </nav>
+      <% end %>
    </div>
  </body>
 </html>
--- a/app/views/pages/privacy.html.erb
+++ b/app/views/pages/privacy.html.erb
@@ -0,0 +1,17 @@
+<%= render HeaderComponent.new(title: "Privacy Policy") %>
+
+<%= render MainSimpleComponent.new do %>
+  <section>
+    <%= render EditableContentComponent.new(
+      context: "privacy", key: "body", rich_text: true,
+      default: "No content yet. Please add a privacy policy.") %>
+
+    <% if user_signed_in? && current_user.is_admin? %>
+    <div class="mt-8 pt-6 border-t border-gray-200 text-right">
+      <%= render EditContentButtonComponent.new(
+        context: "privacy", key: "body", rich_text: true,
+        redirect_to: request.path) do %>Edit content<% end %>
+    </div>
+    <% end %>
+  </section>
+<% end %>
--- a/app/views/pages/tos.html.erb
+++ b/app/views/pages/tos.html.erb
@@ -0,0 +1,17 @@
+<%= render HeaderComponent.new(title: "Terms of Service") %>
+
+<%= render MainSimpleComponent.new do %>
+  <section>
+    <%= render EditableContentComponent.new(
+      context: "tos", key: "body", rich_text: true,
+      default: "No content yet. Please add your terms of service.") %>
+
+    <% if user_signed_in? && current_user.is_admin? %>
+    <div class="mt-8 pt-6 border-t border-gray-200 text-right">
+      <%= render EditContentButtonComponent.new(
+        context: "tos", key: "body", rich_text: true,
+        redirect_to: request.path) do %>Edit content<% end %>
+    </div>
+    <% end %>
+  </section>
+<% end %>
--- a/app/views/services/chat/show.html.erb
+++ b/app/views/services/chat/show.html.erb
@@ -62,35 +62,30 @@
      </select>
      <ul class="hidden sm:flex list-reset mb-8 border-gray-200 border-b">
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Android
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            iOS
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Linux
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Windows
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            macOS
          </a>
        </li>
-        <!-- <li class="mr&#45;2" data&#45;tabs&#45;target="tab" data&#45;action="click&#45;>tabs#change"> -->
-        <!--   <a href="#" class="bg&#45;white inline&#45;block py&#45;2 px&#45;4 font&#45;semibold no&#45;underline"> -->
-        <!--     Web -->
-        <!--   </a> -->
-        <!-- </li> -->
      </ul>

      <div id="apps-android" class="hidden grid grid-cols-1 gap-6"
--- a/app/views/services/email/show.html.erb
+++ b/app/views/services/email/show.html.erb
@@ -56,22 +56,22 @@
      </select>
      <ul class="hidden sm:flex list-reset mb-8 border-gray-200 border-b">
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Android
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Linux
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Windows
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            macOS
          </a>
        </li>
--- a/app/views/services/mastodon/show.html.erb
+++ b/app/views/services/mastodon/show.html.erb
@@ -61,32 +61,32 @@
      </select>
      <ul class="hidden sm:flex list-reset mb-8 border-gray-200 border-b">
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Web
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-5 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Android
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            iOS
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Linux
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Windows
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            macOS
          </a>
        </li>
--- a/app/views/services/remotestorage/show.html.erb
+++ b/app/views/services/remotestorage/show.html.erb
@@ -37,10 +37,8 @@
    <h3>Compatible Apps</h3>
    <p>
      Your Storage account is based on a new open standard called
-      <a href="https://remotestorage.io" target="_blank">
-        <img src="/img/logos/icon_remotestorage.svg" class="h-4 w-4 inline">
-        <strong>remoteStorage</strong>
-      </a>, which is not yet widely supported.  Look
+      <img src="/img/logos/icon_remotestorage.svg" class="h-4 w-4 inline">
+      <strong>remoteStorage</strong>, which is not yet widely supported. Look
      for the remoteStorage icon, or check the Sync settings in apps.
    </p>
    <p>
@@ -67,27 +65,27 @@
      </select>
      <ul class="hidden sm:flex list-reset mb-8 border-gray-200 border-b">
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Productivity
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Bookmarks
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Reading
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            File sharing
          </a>
        </li>
        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
            Learning
          </a>
        </li>
--- a/app/views/settings/_profile.html.erb
+++ b/app/views/settings/_profile.html.erb
@@ -34,7 +34,7 @@
    <label class="block">
      <p class="font-bold mb-1">Avatar</p>
      <p class="text-gray-500">Default profile picture</p>
-      <div class="flex items-center gap-6">
+      <div class="flex flex-col sm:flex-row items-center gap-6">
        <% if @user.avatar.attached? %>
          <p class="flex-none">
            <%= image_tag image_url_for(@user.avatar), class: "h-24 w-24 rounded-lg" %>
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,6 +15,8 @@ Rails.application.routes.draw do
  match 'signup/:step', to: 'signup#steps', as: :signup_steps, via: [:get, :post]
  post 'signup_validate', to: 'signup#validate'

+  get 'privacy', to: 'pages#privacy', as: :privacy_page
+  get 'tos',     to: 'pages#tos',     as: :tos_page

  get "users/:username/avatars/:hash", to: "avatars#show", as: :user_avatar

--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -1,4 +1,6 @@
 :concurrency: 2
+production:
+  :concurrency: 10
 :queues:
  - default
  - mailers
Author	SHA1	Message	Date
Râu Cao	8728684c21	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-12 16:10:06 +04:00
Râu Cao	3bd07472b2	Fix pages views when signed out All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-12 16:09:42 +04:00
Râu Cao	dfb5b6b794	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-12 15:39:15 +04:00
Râu Cao	32b1c2748a	Fix wrong variable All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-30 20:22:04 +04:00
Râu Cao	fc6cac8368	Remove superfluous link All checks were successful continuous-integration/drone/push Build is passing Details Already linked in the same paragraph	2025-05-30 16:53:05 +04:00
Greg	eefdc88a47	Merge pull request 'Editable content' (#229 ) from feature/186-content_editing into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #229 Reviewed-by: Greg <greg@noreply.kosmos.org>	2025-05-30 11:14:50 +00:00
Râu Cao	f2e8ca790c	Add Privacy and ToS pages, footer menu All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details Release Drafter / Update release notes draft (pull_request) Successful in 3s Details	2025-05-30 13:27:15 +04:00
Râu Cao	32cd4d896d	Fix link color for Devise links All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2025-05-29 17:26:18 +04:00
Râu Cao	67c450860a	Fix tab links All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2025-05-29 16:24:33 +04:00
Râu Cao	f1d9cf1e3d	Remove special link class Some checks failed continuous-integration/drone/push Build is failing Details continuous-integration/drone/pr Build is failing Details This cleans up the code quite a bit, but also allows links in editable content to be rendered with the default style.	2025-05-29 16:10:34 +04:00
Râu Cao	8cf138b035	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-28 14:51:31 +04:00
Râu Cao	d48f1caa28	Merge branch 'master' into live Some checks failed continuous-integration/drone/push Build is failing Details	2025-05-28 14:29:09 +04:00
Râu Cao	6a2ad475be	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-28 13:26:51 +04:00
Râu Cao	942ae25f09	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-23 14:10:16 +04:00
Râu Cao	b6968f1742	Merge branch 'feature/mastodon_api' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-18 14:56:52 +04:00
Râu Cao	4f4e086518	Merge branch 'feature/mastodon_api' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-18 14:46:33 +04:00
Râu Cao	a04a1479f8	Merge branch 'feature/mastodon_api' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-18 14:38:00 +04:00
Râu Cao	613090d38a	Merge branch 'feature/mastodon_api' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-17 18:57:10 +04:00
Râu Cao	f1c540537a	Merge branch 'feature/mastodon_api' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-17 18:22:38 +04:00
Râu Cao	1dcdc2b032	Allow syncing a single Mastodon profile All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-17 18:22:11 +04:00
Râu Cao	4545c3ba19	Merge branch 'feature/mastodon_api' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-17 18:12:57 +04:00
Râu Cao	bfa1514181	Update doc All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-17 18:11:17 +04:00
Râu Cao	f0846308da	Only update other avatars in one place All checks were successful continuous-integration/drone/push Build is passing Details Prevent future mistakes	2025-05-17 18:02:13 +04:00
Râu Cao	b3b7fe6359	Don't queue job when service isn't enabled	2025-05-17 18:02:13 +04:00
Râu Cao	f0b541ee50	Add avatar to admin user page	2025-05-17 18:02:13 +04:00
Râu Cao	df9077e3c1	Sync Mastodon IDs/profiles to local accounts Add a new service to import some data from Mastodon accounts: * Find users by username, store Mastodon account ID in local db when found * Import display name (don't overwrite existing) * Import avatar (don't overwrite existing)	2025-05-17 18:02:07 +04:00
Râu Cao	74666130c0	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-16 17:30:30 +04:00
Râu Cao	7c43a4d919	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-16 16:01:31 +04:00
Râu Cao	520552ec70	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-16 15:38:20 +04:00
Râu Cao	307095bfd0	WTF All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-15 22:21:33 +04:00
Râu Cao	ae7291d4f1	Merge branch 'feature/ejabberd_pep' into live Some checks failed continuous-integration/drone/push Build is failing Details	2025-05-15 22:07:26 +04:00
Râu Cao	322ca98da9	Merge branch 'feature/ejabberd_pep' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-15 20:05:30 +04:00
Râu Cao	66f3950b83	Add job for setting avatar via XMPP	2025-05-15 20:04:55 +04:00
Râu Cao	4e115eb514	Merge branch 'feature/ejabberd_pep' into live Some checks failed continuous-integration/drone/push Build is failing Details	2025-05-15 19:50:30 +04:00
Râu Cao	fc9b471a10	Add job for setting avatar via XMPP	2025-05-15 19:50:05 +04:00
Râu Cao	b33e47e60f	Merge branch 'feature/ejabberd_pep' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-15 12:54:25 +04:00
Râu Cao	9878e4a3e8	Merge branch 'feature/ejabberd_pep' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-15 12:38:58 +04:00
Râu Cao	9c35323bcd	Return response for ejabberd API calls	2025-05-15 12:38:40 +04:00
Râu Cao	e2716d94c0	Merge branch 'feature/ejabberd_pep' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-15 12:22:29 +04:00
Râu Cao	9394f649a6	Merge branch 'feature/ejabberd_pep' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-15 12:02:05 +04:00
Râu Cao	41b9cb722b	Merge branch 'feature/ejabberd_pep' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-15 11:48:10 +04:00
Râu Cao	f1c13d7bd9	Add private_get to ejabberd service All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-15 11:47:23 +04:00
Râu Cao	c6cb9caa6d	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-14 18:58:38 +04:00
Râu Cao	208977177a	Merge branch 'feature/user_avatars' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-14 15:40:47 +04:00
Râu Cao	9a406b8381	Merge branch 'feature/user_avatars' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-14 14:44:14 +04:00
Râu Cao	4c972bfe7a	Merge branch 'feature/user_avatars' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-12 16:40:44 +04:00
Râu Cao	0191d248f8	Merge branch 'feature/user_avatars' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-12 15:11:39 +04:00
Râu Cao	710afb6c78	Merge branch 'chore/215-configs' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-06 20:14:42 +04:00
Râu Cao	69e9662133	Merge branch 'chore/215-configs' into live Some checks failed continuous-integration/drone/push Build is failing Details	2025-05-06 20:01:15 +04:00
Râu Cao	a73d0f29bd	Merge branch 'chore/215-configs' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-06 19:53:52 +04:00
Râu Cao	7836805570	Merge branch 'chore/215-configs' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-06 19:04:03 +04:00
Râu Cao	1fc434cb3a	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-05 17:39:06 +04:00
Râu Cao	dad7d5195e	Merge branch 'chore/db_configs' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-05 15:28:16 +04:00
Râu Cao	596cad34da	Merge branch 'chore/upgrade_rails' into live	2025-04-29 17:25:25 +04:00
Râu Cao	aaee5cb4ed	Merge branch 'chore/upgrade_rails' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-04-28 17:56:57 +04:00
Râu Cao	ebaca5ba65	Merge branch 'chore/upgrade_rails' into live	2025-04-28 15:58:17 +04:00
Râu Cao	b6bcfa2ee3	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2025-04-18 14:54:01 +04:00
Râu Cao	9082ee45d8	Merge branch 'master' into live	2025-01-02 08:32:15 -05:00
Râu Cao	29264aad98	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-16 13:33:35 +02:00
Râu Cao	259b51a95e	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-24 21:40:25 +02:00
Râu Cao	fb369530e3	Merge branch 'master' into live Some checks failed continuous-integration/drone/push Build is failing Details	2024-09-14 17:18:09 +02:00
Râu Cao	5dc10a4d33	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-14 16:46:27 +02:00
Râu Cao	2297c68046	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-14 16:41:01 +02:00
Râu Cao	b82ab45c99	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-14 14:57:35 +02:00
Râu Cao	d12c63db26	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-10 16:07:24 +02:00
Râu Cao	e6a9ef84ce	Merge branch 'master' into live Some checks failed continuous-integration/drone/push Build is failing Details	2024-08-19 15:13:46 +02:00
Râu Cao	b7e91344a0	Merge branch 'master' into live Some checks failed continuous-integration/drone/push Build is failing Details	2024-08-19 14:48:35 +02:00
Râu Cao	0f07e32781	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-17 14:49:29 +02:00
Râu Cao	1311b5ed6a	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-17 14:46:00 +02:00
Râu Cao	12f82061e8	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-17 14:42:32 +02:00
Râu Cao	a07b4369ab	Hide njump link for users without pubkey All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-23 17:33:34 +02:00
Râu Cao	2605c06807	Merge branch 'feature/admin_pages' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-23 17:30:22 +02:00
Râu Cao	1db768fb15	Merge branch 'feature/admin_pages' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-23 17:27:03 +02:00
Râu Cao	8a7403df32	Merge branch 'feature/own_relay' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-20 15:52:03 +02:00
Râu Cao	f0295fef7a	Merge branch 'feature/own_relay' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-20 15:28:55 +02:00
Râu Cao	090affd304	Merge branch 'feature/own_relay' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-20 14:51:20 +02:00
Râu Cao	bafddd436b	Merge branch 'feature/own_relay' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-20 13:59:59 +02:00
Râu Cao	560f193c4b	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-20 13:56:11 +02:00
Râu Cao	8aabbad5bb	Merge branch 'feature/strfry_zap_receipts' into live	2024-06-20 13:56:00 +02:00
Râu Cao	ba8d21eb7a	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-09 13:29:57 +02:00
Râu Cao	53df455d53	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-09 13:17:51 +02:00
Râu Cao	9f1af3a9aa	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-07 14:13:53 +02:00
Râu Cao	1d09008ce2	Merge branch 'master' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-04 17:45:13 +02:00
Râu Cao	57c5317c38	Merge branch 'feature/170-nostr_zaps' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-21 18:29:13 +02:00
Râu Cao	41bd920060	Merge branch 'feature/170-nostr_zaps' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-21 18:09:09 +02:00
Râu Cao	0815fa6040	Merge branch 'feature/170-nostr_zaps' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-19 17:07:58 +02:00
Râu Cao	af0e99aa50	Merge branch 'feature/170-nostr_zaps' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-19 16:55:10 +02:00
Râu Cao	f05eec5255	Merge branch 'feature/170-nostr_zaps' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-19 16:48:28 +02:00
Râu Cao	66ca2dc6b0	Merge branch 'feature/173-nostr_ldap' into live All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-19 13:44:24 +02:00
Râu Cao	800183e9da	Increase sidekiq concurrency in prod All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-19 13:44:01 +02:00