You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2022/06/02 08:18:44 UTC
[openmeetings] branch master updated (9af4d8998 -> 9d60cfd53)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
from 9af4d8998 [OPENMEETINGS-2732] mockito
new b6465dcb3 [OPENMEETINGS-2721] minor issue in layout
new 9d60cfd53 [OPENMEETINGS-2626] salutation and birthday are not defaulted
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java | 3 ---
.../src/main/java/org/apache/openmeetings/web/common/Captcha.html | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
[openmeetings] 02/02: [OPENMEETINGS-2626] salutation and birthday are not defaulted
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 9d60cfd53d03ef59ac79b1cc90312ca6e54f1db1
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jun 2 15:18:34 2022 +0700
[OPENMEETINGS-2626] salutation and birthday are not defaulted
---
.../src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index ec765c3c9..f86ac445f 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -59,7 +59,6 @@ import org.apache.openmeetings.db.entity.user.AsteriskSipUser;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
-import org.apache.openmeetings.db.entity.user.User.Salutation;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.db.util.DaoHelper;
@@ -110,11 +109,9 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
*/
public static User getNewUserInstance(User currentUser) {
User user = new User();
- user.setSalutation(Salutation.MR);
user.setRights(getDefaultRights());
user.setLanguageId(getDefaultLang());
user.setTimeZoneId(getTimeZone(currentUser).getID());
- user.setAge(LocalDate.now());
user.setLastlogin(new Date());
Address address = new Address();
address.setCountry(Locale.getDefault().getCountry());
[openmeetings] 01/02: [OPENMEETINGS-2721] minor issue in layout
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit b6465dcb3fc87756f70fa818e2df35f2f22e61bb
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jun 2 15:17:53 2022 +0700
[OPENMEETINGS-2721] minor issue in layout
---
.../src/main/java/org/apache/openmeetings/web/common/Captcha.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
index 8fca63bec..dfe747aae 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
<wicket:panel>
- <div class="col-5 d-inline-block">
+ <div class="col-6 d-inline-block">
<input type="text" wicket:id="captchaText" wicket:message="title:captcha.text" class="captcha-text form-control"/>
</div>
<img wicket:id="captcha" class="captcha-img"/>