Commit graph

106 commits

Author SHA1 Message Date
Audric Ackermann 4d991d3992
Merge branch 'clearnet' into react-refactor 2020-10-08 17:23:55 +11:00
Audric Ackermann f57c85dc0d
hide pubkey when not needed on conversationHeader and listItem 2020-10-06 15:45:27 +11:00
Audric Ackermann 66dcfdfe6e
show message when no blocked contact in settings 2020-09-02 15:28:24 +10:00
Audric Ackermann 0e75510e5b
remove ttl unused settings and all translated key 2020-09-01 11:14:59 +10:00
Audric Ackermann 094cd0ae47
Merge pull request #1306 from Bilb/make-cheap-translations 2020-08-26 11:58:40 +10:00
Audric Ackermann 0b6c915f8f
update translation to match android - part 2 2020-08-18 12:31:03 +10:00
Konstantin Ullrich 5b7c58c0d4 Refresh after unblocking a SessionID without model 2020-08-17 06:57:28 +02:00
Audric Ackermann 38c099cdf0
rename seed to recovery phrase 2020-08-17 11:21:57 +10:00
Konstantin Ullrich 2f35d9d2a6 lint fix 2020-08-15 13:58:24 +02:00
Konstantin Ullrich 86f8fe54ae Check for model in blocked settings 2020-08-15 13:21:35 +02:00
Audric Ackermann 4fbbbc26a4
make blockled list number updates on unblock 2020-08-14 10:56:44 +10:00
Audric Ackermann d108630f22
add a toastUtils file and replace all pushToast calls in ts files 2020-08-14 10:56:22 +10:00
Audric Ackermann 08433aa676
Merge pull request #1297 from konstantinullrich/feature/blocked-list-in-settings 2020-08-12 10:39:19 +10:00
Audric Ackermann c90e696da3
fix types for $ conflicting between jQuery and webdriverIO 2020-08-12 10:05:18 +10:00
Konstantin Ullrich 8bc7528e85
Merge branch 'clearnet' into feature/blocked-list-in-settings 2020-08-10 09:27:16 +02:00
Audric Ackermann 3945c6b208
Merge remote-tracking branch 'upstream/clearnet' into react-refactor 2020-08-10 10:51:33 +10:00
Audric Ackermann 58dd064e93
Merge remote-tracking branch 'upstream/clearnet' into fix-integration-tests 2020-08-07 10:00:37 +10:00
Konstantin Ullrich 380d533da8 fix lint 2020-08-06 10:30:22 +02:00
Konstantin Ullrich b430848c53 Get only blocked SessionIDs even if conv is gone 2020-08-06 09:08:18 +02:00
Konstantin Ullrich fde6723584 Fix Lint problem 2020-08-05 09:42:12 +02:00
Audric Ackermann 3e56eb6133
add beta german translation copy pasted from android 2020-08-05 16:58:36 +10:00
Mikunj b75b02c5a2 Hide multi device UI if flag is not set 2020-08-04 16:06:18 +10:00
Audric Ackermann 933eb73aa1
Merge remote-tracking branch 'upstream/clearnet' into fix-integration-tests 2020-08-03 11:48:00 +10:00
Konstantin Ullrich e800e5509b Placeholder for no DisplayName-Contacts in blocked 2020-07-31 09:23:56 +02:00
Konstantin Ullrich 7de0a0ae65 Add Subscreen for blocked Users 2020-07-30 16:49:11 +02:00
Audric Ackermann fec0ead1de
fix link device test and lint 2020-07-29 11:27:20 +10:00
Audric Ackermann 592c31dfc0
fix tslint issues with spectron includes 2020-07-28 10:57:59 +10:00
Audric Ackermann a853d27b28
disable multi device link and show warnings placeholder 2020-07-28 08:58:55 +10:00
Vincent 54b7d9a21b Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into refactor-ts-react 2020-07-16 11:57:42 +10:00
Vincent 055856d9ac note-for-reenabling-sessionsettings 2020-07-14 15:49:25 +10:00
Vincent 95c5a881e1 rebuild-ui 2020-07-14 13:16:04 +10:00
Vincent 9d6a24d802 rm-uipolishmergre 2020-07-14 11:57:43 +10:00
Vincent 1a150f96c4 merged w ts-constants 2020-07-14 11:26:32 +10:00
Vincent c020eddef6 constants-to-ts 2020-07-14 11:06:26 +10:00
Vincent f8cd997b13 constants-to-ts 2020-07-13 16:37:12 +10:00
Vincent fd746a475a ui polished and ttl constants 2020-07-13 14:08:18 +10:00
Vincent 83528f4b8d Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into refactor-ts-react 2020-07-08 16:42:30 +10:00
Mikunj 2ed8aeaf30 Lint 2020-06-16 10:18:53 +10:00
Mikunj ae44f0da0f Remove old multi device functions 2020-06-15 14:38:06 +10:00
Audric Ackermann fa853538d0
LINT after prettier upgrade 2020-05-29 16:25:15 +10:00
Audric Ackermann cd143d8758
remove useless code and make sha commit selectable 2020-04-17 12:03:31 +10:00
Vincent f2ce52a3d5 Timer notifications rework 2020-04-06 15:34:35 +10:00
Vincent 6cda163b27 upgrade typescript 2020-04-06 13:36:15 +10:00
Audric Ackermann e48c7c2f3d
fix lint 2020-03-30 15:42:52 +11:00
Audric Ackermann 8f01d1dbb7
enable by default spell-check 2020-03-30 12:38:26 +11:00
Audric Ackermann fa2a17c09b
adress review 2020-03-27 09:23:51 +11:00
Audric Ackermann c81fca5d90
disnle link option on secondary device 2020-03-26 15:46:54 +11:00
Vincent d8a12aab0f conv tinkering 2020-03-25 10:01:36 +11:00
Vincent 9a6aafe99c Pull from clearnet 2020-03-13 11:44:00 +11:00
Vincent 7235ccff88 Emoji quick styling 2020-03-13 11:10:27 +11:00