Skip to content

Commit

Permalink
Merge branch 'luwrain:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@egusator
egusator committed May 15, 2024
2 parents 4a59fc0 + ecb00f5 commit d21abe4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app-mail
Submodule app-mail updated 12 files
+3 −6 src/main/java/org/luwrain/app/mail/App.java
+0 −2 src/main/java/org/luwrain/app/mail/Conv.java
+5 −6 src/main/java/org/luwrain/app/mail/Data.java
+0 −43 src/main/java/org/luwrain/app/mail/Hooks.java
+2 −5 src/main/java/org/luwrain/app/mail/MainLayout.java
+7 −7 src/main/java/org/luwrain/app/mail/StartingLayout.java
+1 −2 src/main/java/org/luwrain/app/mail/SummaryItem.java
+1 −1 src/main/java/org/luwrain/app/mail/Utils.java
+2 −9 src/main/java/org/luwrain/app/mail/layouts/FolderPropertiesLayout.java
+12 −23 src/main/java/org/luwrain/app/message/App.java
+5 −5 src/main/java/org/luwrain/app/message/Conv.java
+4 −4 src/main/java/org/luwrain/app/message/MainLayout.java
2 changes: 1 addition & 1 deletion pim
Submodule pim updated 51 files
+2 −4 src/main/java/org/luwrain/pim/Connections.java
+1 −1 src/main/java/org/luwrain/pim/Hooks.java
+4 −3 src/main/java/org/luwrain/pim/fetching/Base.java
+1 −1 src/main/java/org/luwrain/pim/fetching/Mail.java
+0 −64 src/main/java/org/luwrain/pim/mail/Factory.java
+1 −1 src/main/java/org/luwrain/pim/mail/FolderProperties.java
+0 −70 src/main/java/org/luwrain/pim/mail/MailAccount.java
+0 −32 src/main/java/org/luwrain/pim/mail/MailAccounts.java
+0 −33 src/main/java/org/luwrain/pim/mail/MailStoring.java
+2 −2 src/main/java/org/luwrain/pim/mail/Message.java
+1 −1 src/main/java/org/luwrain/pim/mail/MessageConsumer.java
+1 −1 src/main/java/org/luwrain/pim/mail/MessageContentItem.java
+2 −2 src/main/java/org/luwrain/pim/mail/MessageDecoder.java
+1 −1 src/main/java/org/luwrain/pim/mail/MessageProvider.java
+1 −1 src/main/java/org/luwrain/pim/mail/MimePartsExtractor.java
+1 −5 src/main/java/org/luwrain/pim/mail/Settings.java
+2 −2 src/main/java/org/luwrain/pim/mail/obsolete/AccountUniRefProc.java
+2 −3 src/main/java/org/luwrain/pim/mail/obsolete/AddressUtils.java
+1 −1 src/main/java/org/luwrain/pim/mail/obsolete/BinaryMessage.java
+1 −1 src/main/java/org/luwrain/pim/mail/obsolete/MailMessage.java
+2 −2 src/main/java/org/luwrain/pim/mail/obsolete/MailMessages.java
+14 −3 src/main/java/org/luwrain/pim/mail/persistence/MailPersistence.java
+4 −2 src/main/java/org/luwrain/pim/mail/persistence/dao/AccountDAO.java
+2 −2 src/main/java/org/luwrain/pim/mail/persistence/dao/FolderDAO.java
+2 −2 src/main/java/org/luwrain/pim/mail/persistence/dao/MessageDAO.java
+1 −1 src/main/java/org/luwrain/pim/mail/persistence/model/Account.java
+1 −1 src/main/java/org/luwrain/pim/mail/persistence/model/Folder.java
+1 −1 src/main/java/org/luwrain/pim/mail/persistence/model/MessageMetadata.java
+4 −4 src/main/java/org/luwrain/pim/mail/proto/Pop3.java
+2 −2 src/main/java/org/luwrain/pim/mail/protocols/Smtp.java
+6 −5 src/main/java/org/luwrain/pim/mail/script/AccountObj.java
+11 −5 src/main/java/org/luwrain/pim/mail/script/AccountsObj.java
+1 −1 src/main/java/org/luwrain/pim/mail/script/AddressObj.java
+2 −2 src/main/java/org/luwrain/pim/mail/script/FolderObj.java
+3 −3 src/main/java/org/luwrain/pim/mail/script/FoldersObj.java
+2 −2 src/main/java/org/luwrain/pim/mail/script/MailObj.java
+3 −3 src/main/java/org/luwrain/pim/mail/script/MessageObj.java
+5 −5 src/main/java/org/luwrain/pim/workers/Pop3.java
+6 −2 src/main/java/org/luwrain/settings/mail/Factory.java
+5 −1 src/main/java/org/luwrain/settings/mail/accounts/AccountSection.java
+22 −18 src/main/java/org/luwrain/settings/mail/accounts/Accounts.java
+23 −27 src/main/java/org/luwrain/settings/mail/accounts/Area.java
+4 −3 src/main/java/org/luwrain/settings/mail/accounts/Conv.java
+3 −3 src/main/resources/mail.conf
+0 −70 src/test/java/org/luwrain/pim/mail/StoringTest.java
+3 −2 src/test/java/org/luwrain/pim/mail/obsolete/AddressUtilsTest.java
+3 −2 src/test/java/org/luwrain/pim/mail/obsolete/BinaryMessageTest.java
+3 −3 src/test/java/org/luwrain/pim/mail/persistence/AccountsTest.java
+3 −3 src/test/java/org/luwrain/pim/mail/persistence/FoldersTest.java
+3 −3 src/test/java/org/luwrain/pim/mail/persistence/MessagesTest.java
+0 −0 src/test/resources/org/luwrain/pim/mail/obsolete/test.eml
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<gson.version>2.8.5</gson.version>
<javafx.version>17</javafx.version>
<vk.version>1.0.14</vk.version>
<log4j.version>2.17.2</log4j.version>
<log4j.version>2.17.1</log4j.version>
<languagetool.version>5.5</languagetool.version>
<pdfbox.version>2.0.20</pdfbox.version>
<graalvm.version>23.0.0</graalvm.version>
Expand Down

0 comments on commit d21abe4

Please sign in to comment.