488 commits

Author	SHA1	Message	Date
Audric Ackermann	4fbbbc26a4	make blockled list number updates on unblock	2020-08-14 10:56:44 +10:00
Konstantin Ullrich	8bc7528e85	Merge branch 'clearnet' into feature/blocked-list-in-settings	2020-08-10 09:27:16 +02:00
Audric Ackermann	ec2274d5e8	Merge pull request #1300 from Bilb/clean-en-translation	2020-08-07 09:59:23 +10:00
Konstantin Ullrich	7ec263f273	fixed transaltion key	2020-08-06 09:35:01 +02:00
Audric Ackermann	fc664a2580	show a toast on secondary device forced unlink	2020-08-06 14:23:38 +10:00
Audric Ackermann	3e56eb6133	add beta german translation copy pasted from android	2020-08-05 16:58:36 +10:00
Audric Ackermann	80946c0ea5	Merge remote-tracking branch 'upstream/clearnet' into clean-en-translation	2020-08-05 14:24:09 +10:00
Audric Ackermann	9315ed5238	add tool to find unused localized string and fix our current en locale	2020-08-05 11:40:48 +10:00
Mikunj	b75b02c5a2	Hide multi device UI if flag is not set	2020-08-04 16:06:18 +10:00
Mikunj	22c64395d9	Remove multi-device warnings	2020-08-04 12:45:12 +10:00
Audric Ackermann	2c45ff73b2	Merge pull request #1288 from Bilb/disable-link-warning-multi	2020-07-30 16:38:15 +10:00
Audric Ackermann	9464c03806	adress reviews	2020-07-30 15:53:44 +10:00
Audric Ackermann	abc9456d14	add popup for disabling multi device	2020-07-30 15:01:11 +10:00
Audric Ackermann	6063e0757d	remove 'friend' reference from messages.json	2020-07-29 15:33:02 +10:00
Audric Ackermann	a853d27b28	disable multi device link and show warnings placeholder	2020-07-28 08:58:55 +10:00
Vincent	95c5a881e1	rebuild-ui	2020-07-14 13:16:04 +10:00
Vincent	c020eddef6	constants-to-ts	2020-07-14 11:06:26 +10:00
Vincent	506b55bfe2	session-id-editable	2020-07-13 15:37:41 +10:00
Vincent	fd746a475a	ui polished and ttl constants	2020-07-13 14:08:18 +10:00
Vincent	6cb05c3677	review-fixes	2020-07-08 15:36:59 +10:00
Vincent	e72970fdc7	load-conv-public	2020-07-08 12:14:46 +10:00
Vincent	b05d2e6725	Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into https-open-group	2020-07-08 11:40:53 +10:00
Vincent	f6ae5386e9	getting opengroup conversation	2020-07-08 10:59:20 +10:00
Mikunj Varsani	f11e0f2cd0	Merge pull request #1222 from Mikunj/blocking ... Fix up Blocking	2020-07-07 15:51:59 +10:00
Vincent	e7569a569c	fix-unicode-windows-error	2020-07-07 12:37:18 +10:00
Mikunj	aa75205bbd	Move BlockedNumberController to ts	2020-07-07 10:24:24 +10:00
Vincent	0386259fce	cancelling linked	2020-07-06 16:06:24 +10:00
Vincent	6e1f3fdc75	linked-devices-limit	2020-07-06 14:19:13 +10:00
Audric Ackermann	cae608fd01	drop typing message for public groups and fix opengroup sending	2020-06-25 15:38:00 +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	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
Vincent	fe7b22dbc3	Groups not friends	2020-05-28 16:26:54 +10:00
Vincent	07e7afeb31	Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into lns-map	2020-05-28 15:40:55 +10:00
Audric Ackermann	12b396ce7e	add option to send a message to a single device, or to all device except one	2020-05-27 16:10:12 +10:00
Audric Ackermann	f46c885fdf	merge fix-closed-group to clearnet	2020-05-15 12:53:49 +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	1fa7ee25f7	leftpane settings	2020-04-30 17:39:58 +10:00
Vincent	2fde4d7e80	messages.json fixup	2020-04-22 17:19:29 +10:00
Vincent	99200bb725	Message unsendability	2020-04-07 16:43:53 +10:00
Audric Ackermann	0d0439cacc	Merge pull request #1020 from Bilb/spell-check-fixes ... fix spell checker using the electron one	2020-03-30 16:16:37 +11:00
Audric Ackermann	9afee14749	Merge pull request #1022 from vincentbavitz/notifications-icon-numeration ... Notifications icon numeration	2020-03-30 16:02:15 +11:00
Vincent	85c9576b45	fractional centering	2020-03-30 07:38:43 +11:00
Audric Ackermann	9ff16d7e60	move to electron spellchecker	2020-03-27 17:25:59 +11:00
Vincent	8d1fec36b7	final ref	2020-03-27 14:59:13 +11:00
Vincent	1a3ecf10df	Device pairing copy	2020-03-27 14:33:37 +11:00
Audric Ackermann	c81fca5d90	disnle link option on secondary device	2020-03-26 15:46:54 +11:00