oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity
8127 commits 5 branches 83 tags 171 MiB
Commit graph

917 commits

Author SHA1 Message Date
Audric Ackermann
66de8d9648
remove plenty of the friend logic 2020-06-15 18:05:14 +10:00
Audric Ackermann
68b119fb69
remove FR logic from receiver and background.js 2020-06-15 11:44:14 +10:00
Mikunj
3ea0689d2f Linting 2020-06-05 13:07:11 +10:00
Mikunj
e6139a5463 Merge branch 'clearnet' into message-sending-refactor 2020-06-05 13:05:23 +10:00
Audric Ackermann
73e15250d7
Merge remote-tracking branch 'upstream/clearnet' into integration-test-logs-rebased 2020-06-03 15:56:48 +10:00
Maxim Shishmarev
2fdca61257 Lint 2020-05-29 18:00:02 +10:00
Maxim Shishmarev
ab2aa7669f Add sender key feature flag 2020-05-29 17:49:23 +10:00
Maxim Shishmarev
abde96bc1e Fix medium group updates 2020-05-29 17:48:57 +10:00
Maxim Shishmarev
fcadcd780e More integration tests for medium groups 2020-05-29 17:48:57 +10:00
Maxim Shishmarev
3561ac49c0 UI and some integrations tests for sender keys 2020-05-29 17:47:39 +10:00
Audric Ackermann
fa853538d0
LINT after prettier upgrade 2020-05-29 16:25:15 +10:00
Vince
53f26d588a
Merge pull request #1122 from vincentbavitz/contacts-sorting 
Reorganise Contacts Panel
 2020-05-28 17:43:41 +10:00
Vincent
fe7b22dbc3 Groups not friends 2020-05-28 16:26:54 +10:00
Vince
50d111f538
Merge branch 'clearnet' into linked-devs-fixes 2020-05-28 16:04:07 +10:00
Vincent
adb96fe4ce Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into fr-fixes 2020-05-28 14:18:43 +10:00
Audric Ackermann
f9f3117101
Merge remote-tracking branch 'vinc/fr-fixes' into integration-test-logs-rebased 2020-05-27 15:40:06 +10:00
Vincent
1cd716d053 Removed comments 2020-05-27 10:22:22 +10:00
Audric Ackermann
779be1213e
fix delete message test by making it independant 2020-05-26 17:36:28 +10:00
Audric Ackermann
8606280080
add key for SessioNotificationCount component 2020-05-26 17:36:28 +10:00
Mikunj
bf4557fbe8 Fix styling on registration page 2020-05-26 12:39:03 +10:00
Vincent
34ecc5a751 Finalisation; working FRs from secondary; 2020-05-21 16:08:10 +10:00
Vincent
60ddaa14be Prevent multiple FR conversations 2020-05-21 15:20:51 +10:00
Audric Ackermann
eb894a9b66
lint 2020-05-15 12:57:23 +10:00
Audric Ackermann
f46c885fdf
merge fix-closed-group to clearnet 2020-05-15 12:53:49 +10:00
Mikunj Varsani
e9fea782b9
Merge pull request #1129 from vincentbavitz/fr-fixes 
FR Duplication Fixes | Patch for #1118
 2020-05-14 16:36:55 +10:00
Vincent
ca910be1ef removed comments 2020-05-14 15:47:33 +10:00
Vincent
2b0ea5bcc5 simplificaiton 2020-05-14 15:13:06 +10:00
Vincent
3cb38de29c renderRow filter 2020-05-13 15:26:41 +10:00
Vincent
400e1ee0a8 rm forced leave 2020-05-13 14:21:16 +10:00
Audric Ackermann
13329c0b2a
Merge pull request #1118 from vincentbavitz/fr-fixes 2020-05-13 05:11:42 +01:00
Vincent
9778d8f793 remove-comments 2020-05-13 13:03:56 +10:00
Vincent
21a95ce587 Closable overlay finished 2020-05-13 12:59:23 +10:00
Vincent
5c02dc9371 sorting-tinkers 2020-05-13 12:03:49 +10:00
Vincent
235d4200bd rm archive 2020-05-13 08:29:24 +10:00
Vincent
af48865c92 remove getconvs 2020-05-12 15:01:12 +10:00
Vincent
843be3921e finalised 2020-05-12 15:00:17 +10:00
Vincent
2b7df8e40b Filtering groups fromstate 2020-05-12 09:29:10 +10:00
Vincent
8a80ccc044 Merge branch 'contacts-sorting' of https://github.com/vincentbavitz/session-desktop into contacts-sorting 2020-05-07 16:47:22 +10:00
Vincent
711112d076 Remove channels 2020-05-07 13:51:39 +10:00
Vincent
3ab2b550e4 Remove archive conversation 2020-05-06 08:57:10 +10:00
Vincent
a429771b92 Linted 2020-05-04 17:02:53 +10:00
Vincent
3c2320635a Filter secondaries 2020-05-04 15:47:40 +10:00
Vincent
a5b1101216 Slave unlinking & FR dup fix 2020-05-04 13:53:25 +10:00
Vince
f9c13e4018
Merge pull request #1112 from vincentbavitz/slave-unlink 
Slave Unlink
 2020-05-04 12:52:31 +10:00
Vincent
a0cec3f0fd notification count positioning 2020-04-30 18:40:41 +10:00
Vincent
1fa7ee25f7 leftpane settings 2020-04-30 17:39:58 +10:00
Audric Ackermann
5564bfa134
Merge pull request #1105 from Mikunj/fix-reset-registration 
Fix corner cases for registration reset
 2020-04-30 01:23:28 +01:00
Vince
cdc88f3cd1
Merge pull request #1077 from vincentbavitz/integration-test-vince 
Message & Settings Tests
 2020-04-29 15:44:22 +10:00
Audric Ackermann
5d9c334809
Merge pull request #1099 from Bilb/fix-enter-create-private-group 2020-04-27 07:36:22 +01:00
Mikunj
a2b60cdd2a Remove token data upon registration reset 2020-04-27 14:50:23 +10:00