Commit Graph
203 Commits
Author SHA1 Message Date
Asal Lotfi fb43adff7a Message class updated. 2025-08-11 17:09:52 +03:30
Partow 50bcb34b16 Merge branch 'develop' into SendMessage
# Conflicts:
#	src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java
#	src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java
#	src/main/java/org/to/telegramfinalproject/Models/ContactEntry.java
#	src/main/java/org/to/telegramfinalproject/Models/Message.java
2025-08-11 17:06:57 +03:30
Partow 6a1d3857d0 Resolve errors 2025-08-11 16:32:31 +03:30
Partow b3941108b5 work on send file 2025-08-11 15:59:54 +03:30
Asal LotfiandGitHub 8f03027770 Merge pull request #13 from PartowRoshani/Sidebar-Menu
Sidebar-Menu
2025-08-11 13:17:12 +03:30
Asal Lotfi 8bee973e7f Merge remote-tracking branch 'origin/develop' into Sidebar-Menu
# Conflicts:
#	src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java
#	src/main/java/org/to/telegramfinalproject/Database/ContactDatabase.java
#	src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java
#	src/main/java/org/to/telegramfinalproject/Models/ContactEntry.java
#	src/main/java/org/to/telegramfinalproject/Models/Message.java
#	src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
#	src/main/resources/init.sql
2025-08-11 13:10:18 +03:30
Asal Lotfi 7c36dc808d Working on sidebar menu UI. 2025-08-11 12:20:30 +03:30
PartowandGitHub a9f74fe8d7 Merge pull request #11 from PartowRoshani/SendMessage
Send message
2025-08-11 12:17:32 +03:30
Asal Lotfi 53008e2bd8 added remove contact. 2025-08-10 20:28:33 +03:30
Asal Lotfi 19e04c903a added search in contact list. 2025-08-10 20:27:58 +03:30
Partow 17366f5ea6 work on send file 2025-08-10 12:46:05 +03:30
PartowandGitHub cd9a9b9eb9 Update init.sql 2025-08-09 11:23:14 +03:30
Partow ec01dfe269 Work on block/ unblock 2025-08-08 22:28:23 +03:30
Asal Lotfi 9d65dde069 Saved messages chat updated(2). 2025-08-08 14:07:54 +03:30
Asal Lotfi b5340160bf Saved messages chat updated. 2025-08-08 13:33:03 +03:30
Partow a900c66eac work on real time for message actions 2025-08-08 12:04:28 +03:30
Partow e2e4bab029 Reaction and forwarded 2025-08-07 21:20:49 +03:30
Partow 608aae4d4e Reply messages 2025-08-07 14:52:39 +03:30
Partow 33a6c5e55d Edit text messages 2025-08-07 13:57:29 +03:30
Partow ad37f3f26c Delete messages in chats edited 2025-08-07 13:26:29 +03:30
Partow 2c19db1d42 Delete messages in chats 2025-08-07 13:03:01 +03:30
Asal Lotfi 8c9e0becd6 Message and Message Database updated based on new init.sql(2). 2025-08-05 21:28:23 +03:30
Asal Lotfi b6230155a7 Message and Message Database updated based on new init.sql. 2025-08-05 21:08:29 +03:30
Asal Lotfi c5b1e6f9ee init.sql updated. 2025-08-05 20:49:04 +03:30
Partow f49dfacc33 fix search in messages 2025-08-05 13:59:01 +03:30
Partow 4647dafa1d update refreshChatList 2025-08-04 16:56:55 +03:30
Partow 96fa7264cf update contact list 2025-08-04 16:41:23 +03:30
Asal Lotfi 06ff5bed85 Merge branch 'develop' into Sidebar-Menu
# Conflicts:
#	src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java
#	src/main/java/org/to/telegramfinalproject/Database/PrivateChatDatabase.java
#	src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
2025-08-03 18:58:29 +03:30
Asal Lotfi 4fe385b021 Sidebar Menu updated. 2025-08-03 18:40:12 +03:30
Partow 83a29d5ea1 Work on message DB 2025-08-03 18:36:19 +03:30
PartowandGitHub 3a7f100600 Merge pull request #9 from PartowRoshani/SendMessage
Send message
2025-08-03 18:28:13 +03:30
Asal Lotfi fd399372a5 init.sql updated. 2025-08-03 11:41:41 +03:30
Partow 364e675bf7 Delete chat (one/both side) 2025-08-02 23:58:02 +03:30
Asal Lotfi 9887b2af42 Saved messages chat implemented. 2025-08-02 14:47:26 +03:30
Partow 3cdbb7e24b Work on delete chat 2025-08-01 20:59:59 +03:30
PartowandGitHub 6b320b6359 Update init.sql 2025-08-01 16:08:12 +03:30
Partow c6616863a1 block/unblock fixed 2025-08-01 15:58:35 +03:30
Partow a2816972d1 fix open private chats 2025-08-01 14:10:09 +03:30
Partow f604ca4f22 Send text message Real time updated 2025-07-30 21:10:33 +03:30
Partow c6eea66966 Send text message 2025-07-30 18:00:56 +03:30
Asal Lotfi 46f036cb31 Revert "init.sql updated."
This reverts commit 3186e6ee24.
2025-07-30 10:45:35 +03:30
Asal Lotfi 3186e6ee24 init.sql updated. 2025-07-30 00:05:35 +03:30
Asal Lotfi a9b5e8abdf editing user profile updated. 2025-07-29 23:34:12 +03:30
Asal Lotfi 648a128a0c added creating new group and channel on sidebar menu. 2025-07-29 23:07:55 +03:30
Asal Lotfi 2fb957d941 added editing user profile. 2025-07-29 13:35:00 +03:30
PartowandGitHub 5c6a63c6ae Update init.sql 2025-07-29 13:00:19 +03:30
PartowandGitHub 7608dd47e0 Merge pull request #8 from PartowRoshani/ArchivedChats
Archived chats
2025-07-29 12:30:55 +03:30
Asal Lotfi 5825373f2c add viewing user profile. 2025-07-27 22:47:11 +03:30
Partow 775350f8ce work on archived chats 2025-07-27 16:15:25 +03:30
Partow a43cd594f8 Merge branch 'develop' into ArchivedChats
# Conflicts:
#	src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java
#	src/main/java/org/to/telegramfinalproject/Client/Session.java
#	src/main/java/org/to/telegramfinalproject/Models/ChatEntry.java
#	src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
2025-07-25 12:41:03 +03:30