[PR #1814] [MERGED] xxx_active_code_live setting in printed in hours and minutes instead … #16062

Closed
opened 2025-11-02 12:01:26 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/1814
Author: @cez81
Created: 5/25/2017
Status: Merged
Merged: 5/29/2017
Merged by: @appleboy

Base: masterHead: active_code_lives


📝 Commits (2)

  • 513b2fb xxx_active_code_live setting in printed in hours and minutes instead of just hours
  • 45b8c47 Update app.ini description of xxx_code_lives settings

📊 Changes

14 files changed (+44 additions, -23 deletions)

View changed files

📝 conf/app.ini (+2 -2)
📝 models/mail.go (+3 -3)
📝 modules/base/tool.go (+7 -0)
📝 modules/base/tool_test.go (+14 -0)
📝 options/locale/locale_en-US.ini (+3 -3)
📝 routers/dev/template.go (+2 -2)
📝 routers/user/auth.go (+5 -5)
📝 routers/user/auth_openid.go (+1 -1)
📝 routers/user/setting.go (+1 -1)
📝 templates/mail/auth/activate.tmpl (+1 -1)
📝 templates/mail/auth/activate_email.tmpl (+1 -1)
📝 templates/mail/auth/reset_passwd.tmpl (+1 -1)
📝 templates/user/auth/activate.tmpl (+2 -2)
📝 templates/user/auth/forgot_passwd.tmpl (+1 -1)

📄 Description

If xxx_active_code_live was < 60 minutes, it was printed as 0 hours. This PR will instead print it as days, hours and minutes.

Fixes #1716


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/gitea/pull/1814 **Author:** [@cez81](https://github.com/cez81) **Created:** 5/25/2017 **Status:** ✅ Merged **Merged:** 5/29/2017 **Merged by:** [@appleboy](https://github.com/appleboy) **Base:** `master` ← **Head:** `active_code_lives` --- ### 📝 Commits (2) - [`513b2fb`](https://github.com/go-gitea/gitea/commit/513b2fbc0c6832863ef5928ad17e262ae8d903ab) xxx_active_code_live setting in printed in hours and minutes instead of just hours - [`45b8c47`](https://github.com/go-gitea/gitea/commit/45b8c47e312a6e534eee52262b2ee53088aa8b88) Update app.ini description of xxx_code_lives settings ### 📊 Changes **14 files changed** (+44 additions, -23 deletions) <details> <summary>View changed files</summary> 📝 `conf/app.ini` (+2 -2) 📝 `models/mail.go` (+3 -3) 📝 `modules/base/tool.go` (+7 -0) 📝 `modules/base/tool_test.go` (+14 -0) 📝 `options/locale/locale_en-US.ini` (+3 -3) 📝 `routers/dev/template.go` (+2 -2) 📝 `routers/user/auth.go` (+5 -5) 📝 `routers/user/auth_openid.go` (+1 -1) 📝 `routers/user/setting.go` (+1 -1) 📝 `templates/mail/auth/activate.tmpl` (+1 -1) 📝 `templates/mail/auth/activate_email.tmpl` (+1 -1) 📝 `templates/mail/auth/reset_passwd.tmpl` (+1 -1) 📝 `templates/user/auth/activate.tmpl` (+2 -2) 📝 `templates/user/auth/forgot_passwd.tmpl` (+1 -1) </details> ### 📄 Description If xxx_active_code_live was < 60 minutes, it was printed as 0 hours. This PR will instead print it as days, hours and minutes. Fixes #1716 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-02 12:01:26 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#16062