Commit Graph

1437 Commits

Author SHA1 Message Date
Denio
58468727e8 Merge pull request #30 from strider-paff-shell/chat
Chat
2020-05-10 19:51:24 +02:00
Strider
7e491b3a25 update// addec chat.cpp 2020-05-10 19:15:04 +02:00
Strider
c65609083f Merge pull request #21 from DenioD/chat
set dangerous bool to false
2020-05-10 19:13:54 +02:00
Strider
11e3bc5ede update// moved render function to chat.cpp 2020-05-10 16:16:54 +02:00
DenioD
3fef6d3825 set dangerous bool to false 2020-05-10 16:10:50 +02:00
Strider
a672d0a461 Merge pull request #20 from DenioD/chat
Chat
2020-05-10 11:23:25 +02:00
DenioD
d48a7c64be rename hm json 2020-05-10 01:13:56 +02:00
DenioD
cd9b850a35 parse hm as json 2020-05-10 00:59:40 +02:00
DenioD
3383d9ff78 Merge branch 'chat' of https://github.com/DenioD/SilentDragonLite-1 into chat 2020-05-10 00:13:34 +02:00
DenioD
7987a1fd86 fix mac png problem 2020-05-10 00:13:02 +02:00
Denio
03a15b20fd Merge pull request #27 from strider-paff-shell/chat
Chat
2020-05-09 23:21:02 +02:00
Strider
6c4ee63b72 update// added idgenerator and resolved mergeconflicts 2020-05-09 22:03:55 +02:00
Strider
e34742b5dc Merge branch 'chat' into chat 2020-05-09 21:57:03 +02:00
DenioD
48c592e9e9 update lib 2020-05-09 21:46:05 +02:00
Strider
abdad2b09d update// updated contactmodel and added new generatorclass 2020-05-09 21:19:59 +02:00
Strider
7dfb9a1929 update// moved generator to separated helper class 2020-05-09 18:14:04 +02:00
Strider
0f57412258 update// added new model derived from chatmodel and contactmodel, moved listchatdelegate to a seperated class file 2020-05-09 17:55:12 +02:00
DenioD
17bffcdfea render contact in all themes 2020-05-09 16:57:46 +02:00
Strider
3a155101de Merge pull request #17 from DenioD/chat
Chat
2020-05-09 14:05:29 +02:00
DenioD
3998e83a1b add new checkpoint 2020-05-09 13:27:32 +02:00
DenioD
b99a0b1210 add position of txs 2020-05-09 13:03:46 +02:00
DenioD
26f0229379 update lib 2020-05-09 11:40:22 +02:00
Strider
1a86246338 Merge pull request #16 from DenioD/chat
Chat
2020-05-08 22:37:51 +02:00
DenioD
a34901ad9c Merge branch 'chat' of https://github.com/DenioD/SilentDragonLite-1 into chat 2020-05-08 22:36:57 +02:00
DenioD
eb263e5e0b switch to datastore 2020-05-08 22:36:24 +02:00
Strider
b09f8e0325 Merge pull request #15 from DenioD/chat
Chat
2020-05-08 21:35:49 +02:00
DenioD
5006a8c7d7 add incoming contact Request windows 2020-05-08 21:25:43 +02:00
Denio
bd11bc1055 Merge pull request #26 from strider-paff-shell/chat
update// reformated datastore and changed storage chatmodel to store …
2020-05-08 21:20:19 +02:00
DenioD
8fe06f39e9 Merge branch 'chat' of https://github.com/strider-paff-shell/SilentDragonLite-1 into chat 2020-05-08 21:18:22 +02:00
Strider
30ddc479ba update// reformated datastore and changed storage chatmodel to store with datastore 2020-05-08 21:16:40 +02:00
Denio
c99f101405 Merge pull request #25 from strider-paff-shell/chat
c
2020-05-08 20:22:21 +02:00
Strider
d0562d2c65 update// added ChatDataStore and SietchDataStore with factory-pattern 2020-05-08 20:01:57 +02:00
maxisman
2e8b46c863 update// changed datastore to factory pattern to get only the desired datastores 2020-05-08 19:39:16 +02:00
Denio
5cdd520526 Merge pull request #24 from strider-paff-shell/chat
Chat
2020-05-08 19:38:09 +02:00
maxisman
d599bf9190 update// moved datastore to DataStore/DataStore.h 2020-05-08 19:10:59 +02:00
Strider
18ade6cac2 Merge pull request #14 from DenioD/chat
fix Addressbook
2020-05-08 18:55:00 +02:00
DenioD
203588a59b fix Addressbook 2020-05-08 18:51:16 +02:00
Strider
111cd81999 Merge pull request #13 from DenioD/chat
Chat
2020-05-08 18:26:01 +02:00
DenioD
b3d41bbb43 some ui tweaks 2020-05-07 22:38:19 +02:00
DenioD
4011c39509 fix 2020-05-07 22:17:20 +02:00
DenioD
4305980b27 add information box for contact request 2020-05-07 22:03:25 +02:00
DenioD
8183b245c6 add a first Button for a new HushChat Address on chattab 2020-05-07 21:57:47 +02:00
DenioD
9600242e70 fix icon and background problem on mac/win 2020-05-07 21:24:51 +02:00
Strider
50f740d3da Merge pull request #11 from DenioD/chat
Chat
2020-05-07 14:44:45 +02:00
DenioD
310504285b add a new button to send contact request, some ui tweaks 2020-05-06 22:55:23 +02:00
DenioD
494198995d add notification and different themes to buttons 2020-05-06 20:49:48 +02:00
Strider
b5f88f1921 Merge pull request #10 from DenioD/chat
Chat
2020-05-06 19:21:12 +02:00
DenioD
6991743b5f new Button Design, only for darkmode atm 2020-05-06 16:54:15 +02:00
DenioD
5ff2d1ba47 first implementation of automated contact request detection - work in progress 2020-05-06 15:41:40 +02:00
DenioD
6a3b644a0a first implementation of automated contact request detection - work in progress 2020-05-06 15:40:55 +02:00