Skip to content

Commit 1812923

Browse files
authored
Merge branch 'main' into lunny/upgrade_act
2 parents 3b253a8 + 6551847 commit 1812923

37 files changed

+598
-57
lines changed

custom/conf/app.example.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,6 +1507,8 @@ LEVEL = Info
15071507
;; - manage_gpg_keys: a user cannot configure gpg keys
15081508
;; - manage_mfa: a user cannot configure mfa devices
15091509
;; - manage_credentials: a user cannot configure emails, passwords, or openid
1510+
;; - change_username: a user cannot change their username
1511+
;; - change_full_name: a user cannot change their full name
15101512
;;EXTERNAL_USER_DISABLE_FEATURES =
15111513

15121514
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

modules/setting/admin.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,6 @@ const (
2929
UserFeatureManageGPGKeys = "manage_gpg_keys"
3030
UserFeatureManageMFA = "manage_mfa"
3131
UserFeatureManageCredentials = "manage_credentials"
32+
UserFeatureChangeUsername = "change_username"
33+
UserFeatureChangeFullName = "change_full_name"
3234
)

options/gitignore/KiCad

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ _autosave-*
1616
*-save.pro
1717
*-save.kicad_pcb
1818
fp-info-cache
19+
~*.lck
20+
\#auto_saved_files#
1921

2022
# Netlist files (exported from Eeschema)
2123
*.net
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
SENDMAIL OPEN SOURCE LICENSE
2+
3+
The following license terms and conditions apply to this open source
4+
software ("Software"), unless a different license is obtained directly
5+
from Sendmail, Inc. ("Sendmail") located at 6475 Christie Ave, Suite 350,
6+
Emeryville, CA 94608, USA.
7+
8+
Use, modification and redistribution (including distribution of any
9+
modified or derived work) of the Software in source and binary forms is
10+
permitted only if each of the following conditions of 1-6 are met:
11+
12+
1. Redistributions of the Software qualify as "freeware" or "open
13+
source software" under one of the following terms:
14+
15+
(a) Redistributions are made at no charge beyond the reasonable
16+
cost of materials and delivery; or
17+
18+
(b) Redistributions are accompanied by a copy of the modified
19+
Source Code (on an acceptable machine-readable medium) or by an
20+
irrevocable offer to provide a copy of the modified Source Code
21+
(on an acceptable machine-readable medium) for up to three years
22+
at the cost of materials and delivery. Such redistributions must
23+
allow further use, modification, and redistribution of the Source
24+
Code under substantially the same terms as this license. For
25+
the purposes of redistribution "Source Code" means the complete
26+
human-readable, compilable, linkable, and operational source
27+
code of the redistributed module(s) including all modifications.
28+
29+
2. Redistributions of the Software Source Code must retain the
30+
copyright notices as they appear in each Source Code file, these
31+
license terms and conditions, and the disclaimer/limitation of
32+
liability set forth in paragraph 6 below. Redistributions of the
33+
Software Source Code must also comply with the copyright notices
34+
and/or license terms and conditions imposed by contributors on
35+
embedded code. The contributors' license terms and conditions
36+
and/or copyright notices are contained in the Source Code
37+
distribution.
38+
39+
3. Redistributions of the Software in binary form must reproduce the
40+
Copyright Notice described below, these license terms and conditions,
41+
and the disclaimer/limitation of liability set forth in paragraph
42+
6 below, in the documentation and/or other materials provided with
43+
the binary distribution. For the purposes of binary distribution,
44+
"Copyright Notice" refers to the following language: "Copyright (c)
45+
1998-2009 Sendmail, Inc. All rights reserved."
46+
47+
4. Neither the name, trademark or logo of Sendmail, Inc. (including
48+
without limitation its subsidiaries or affiliates) or its contributors
49+
may be used to endorse or promote products, or software or services
50+
derived from this Software without specific prior written permission.
51+
The name "sendmail" is a registered trademark and service mark of
52+
Sendmail, Inc.
53+
54+
5. We reserve the right to cancel this license if you do not comply with
55+
the terms. This license is governed by California law and both of us
56+
agree that for any dispute arising out of or relating to this Software,
57+
that jurisdiction and venue is proper in San Francisco or Alameda
58+
counties. These license terms and conditions reflect the complete
59+
agreement for the license of the Software (which means this supercedes
60+
prior or contemporaneous agreements or representations). If any term
61+
or condition under this license is found to be invalid, the remaining
62+
terms and conditions still apply.
63+
64+
6. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY
65+
SENDMAIL AND ITS CONTRIBUTORS "AS IS" WITHOUT WARRANTY OF ANY KIND
66+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
67+
IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT AND FITNESS FOR A
68+
PARTICULAR PURPOSE ARE EXPRESSLY DISCLAIMED. IN NO EVENT SHALL SENDMAIL
69+
OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
70+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
71+
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
72+
OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
73+
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
74+
WITHOUT LIMITATION NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
75+
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

options/license/harbour-exception

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
As a special exception, the Harbour Project gives permission for
2+
additional uses of the text contained in its release of Harbour.
3+
4+
The exception is that, if you link the Harbour libraries with other
5+
files to produce an executable, this does not by itself cause the
6+
resulting executable to be covered by the GNU General Public License.
7+
Your use of that executable is in no way restricted on account of
8+
linking the Harbour library code into it.
9+
10+
This exception does not however invalidate any other reasons why
11+
the executable file might be covered by the GNU General Public License.
12+
13+
This exception applies only to the code released by the Harbour
14+
Project under the name Harbour. If you copy code from other
15+
Harbour Project or Free Software Foundation releases into a copy of
16+
Harbour, as the General Public License permits, the exception does
17+
not apply to the code that you add in this way. To avoid misleading
18+
anyone as to the status of such modified files, you must delete
19+
this exception notice from them.
20+
21+
If you write modifications of your own for Harbour, it is your choice
22+
whether to permit this exception to apply to your modifications.
23+
If you do not wish that, delete this exception notice.

options/locale/locale_cs-CZ.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,6 @@ public_profile=Veřejný profil
689689
biography_placeholder=Řekněte nám něco o sobě! (Můžete použít Markdown)
690690
location_placeholder=Sdílejte svou přibližnou polohu s ostatními
691691
profile_desc=Nastavte, jak bude váš profil zobrazen ostatním uživatelům. Vaše hlavní e-mailová adresa bude použita pro oznámení, obnovení hesla a operace Git.
692-
password_username_disabled=Externí uživatelé nemohou měnit svoje uživatelské jméno. Kontaktujte prosím svého administrátora pro více detailů.
693692
full_name=Celé jméno
694693
website=Web
695694
location=Místo

options/locale/locale_de-DE.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,6 @@ public_profile=Öffentliches Profil
683683
biography_placeholder=Erzähle uns ein wenig über Dich selbst! (Du kannst Markdown verwenden)
684684
location_placeholder=Teile Deinen ungefähren Standort mit anderen
685685
profile_desc=Lege fest, wie dein Profil anderen Benutzern angezeigt wird. Deine primäre E-Mail-Adresse wird für Benachrichtigungen, Passwort-Wiederherstellung und webbasierte Git-Operationen verwendet.
686-
password_username_disabled=Benutzer, die nicht von Gitea verwaltet werden können ihren Benutzernamen nicht ändern. Bitte kontaktiere deinen Administrator für mehr Details.
687686
full_name=Vollständiger Name
688687
website=Webseite
689688
location=Standort

options/locale/locale_el-GR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,6 @@ public_profile=Δημόσιο Προφίλ
620620
biography_placeholder=Πείτε μας λίγο για τον εαυτό σας! (Μπορείτε να γράψετε με Markdown)
621621
location_placeholder=Μοιραστείτε την κατά προσέγγιση τοποθεσία σας με άλλους
622622
profile_desc=Ελέγξτε πώς εμφανίζεται το προφίλ σας σε άλλους χρήστες. Η κύρια διεύθυνση email σας θα χρησιμοποιηθεί για ειδοποιήσεις, ανάκτηση κωδικού πρόσβασης και λειτουργίες Git που βασίζονται στο web.
623-
password_username_disabled=Οι μη τοπικοί χρήστες δεν επιτρέπεται να αλλάξουν το όνομα χρήστη τους. Επικοινωνήστε με το διαχειριστή σας για περισσότερες λεπτομέρειες.
624623
full_name=Πλήρες Όνομα
625624
website=Ιστοσελίδα
626625
location=Τοποθεσία

options/locale/locale_en-US.ini

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,8 @@ lang_select_error = Select a language from the list.
580580
581581
username_been_taken = The username is already taken.
582582
username_change_not_local_user = Non-local users are not allowed to change their username.
583+
change_username_disabled = Changing username is disabled.
584+
change_full_name_disabled = Changing full name is disabled.
583585
username_has_not_been_changed = Username has not been changed
584586
repo_name_been_taken = The repository name is already used.
585587
repository_force_private = Force Private is enabled: private repositories cannot be made public.
@@ -705,7 +707,8 @@ public_profile = Public Profile
705707
biography_placeholder = Tell us a little bit about yourself! (You can use Markdown)
706708
location_placeholder = Share your approximate location with others
707709
profile_desc = Control how your profile is show to other users. Your primary email address will be used for notifications, password recovery and web-based Git operations.
708-
password_username_disabled = Non-local users are not allowed to change their username. Please contact your site administrator for more details.
710+
password_username_disabled = You are not allowed to change their username. Please contact your site administrator for more details.
711+
password_full_name_disabled = You are not allowed to change their full name. Please contact your site administrator for more details.
709712
full_name = Full Name
710713
website = Website
711714
location = Location

options/locale/locale_es-ES.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,6 @@ public_profile=Perfil público
617617
biography_placeholder=¡Cuéntanos un poco sobre ti mismo! (Puedes usar Markdown)
618618
location_placeholder=Comparte tu ubicación aproximada con otros
619619
profile_desc=Controla cómo se muestra su perfil a otros usuarios. Tu dirección de correo electrónico principal se utilizará para notificaciones, recuperación de contraseña y operaciones de Git basadas en la web.
620-
password_username_disabled=Usuarios no locales no tienen permitido cambiar su nombre de usuario. Por favor, contacta con el administrador del sistema para más detalles.
621620
full_name=Nombre completo
622621
website=Página web
623622
location=Localización

0 commit comments

Comments
 (0)