sachaaaaa
|
cd2c4b993a
|
lint
|
5 years ago |
|
sachaaaaa
|
9ab3626149
|
Fix italic tags showing up
|
5 years ago |
|
sachaaaaa
|
497f42165a
|
Allow unpairing device
|
5 years ago |
sachaaaaa
|
30b26807e8
|
Merge pull request #600 from sachaaaaa/paired_device_alias
[multi-device]Allow primary device to assign local aliases to paired devices
|
5 years ago |
|
sachaaaaa
|
13572c3524
|
Merge branch 'multi-device' into paired_device_alias
|
5 years ago |
|
sachaaaaa
|
ea267fb952
|
Merge pull request #597 from sachaaaaa/show_secondary_secret_words
[multi-device]Show secondary secret words
|
5 years ago |
|
sachaaaaa
|
46613de846
|
lint
|
6 years ago |
|
sachaaaaa
|
b324421534
|
Allow primary device to assign local aliases to paired devices
|
6 years ago |
|
sachaaaaa
|
d350e4adfb
|
Merge pull request #598 from sachaaaaa/secret_words_on_primary_device
[multi-device]show pairing words on paired device list
|
6 years ago |
|
sachaaaaa
|
9ddc237f6d
|
show pairing words instead of pubkeys on the primary device's paired devices list.
|
6 years ago |
Beaudan Campbell-Brown
|
09da4af2df
|
Merge pull request #591 from BeaudanBrown/type-fix
Fix pairing error
|
6 years ago |
|
sachaaaaa
|
65361d33f5
|
New menu item "show pairing words" for secondary devices
|
6 years ago |
|
Beaudan Brown
|
94b0faf2aa
|
Remove (hopefully) last place the type of a pairing request is being checked
|
6 years ago |
|
Beaudan Campbell-Brown
|
8235662518
|
Merge pull request #589 from Mikunj/pairing-fix
Fix cross platform device linking
|
6 years ago |
|
Beaudan Campbell-Brown
|
d52a08a9e2
|
Merge pull request #586 from BeaudanBrown/robust-sessions
[multi-device] Robust sessions
|
6 years ago |
Mikunj
|
589b3f3233
|
Infer pairing message type from the content.
This should fix device pairing cross platform.
|
6 years ago |
|
Beaudan Brown
|
cc8277f54d
|
Better variable name and use it in more places
|
6 years ago |
|
Beaudan Brown
|
883feb668d
|
The rest of my multidevice work, send messages to all the correct devices and automatic friend request if not friends with a device
|
6 years ago |
|
Beaudan Campbell-Brown
|
aa66b28ffe
|
Merge pull request #579 from BeaudanBrown/friends-with-any
Add isFriendsWithAnyDevice and use it in relevant places
|
6 years ago |
|
Beaudan Campbell-Brown
|
26a5b6c6fc
|
Merge pull request #580 from BeaudanBrown/is-secondary-device
isSecondary flag
|
6 years ago |
|
Beaudan Campbell-Brown
|
17e70bf81c
|
Merge branch 'multi-device' into is-secondary-device
|
6 years ago |
|
Beaudan Campbell-Brown
|
8adf6a474e
|
Merge pull request #578 from BeaudanBrown/multidevice-bugs
Unique constraint and prevent some undefined bugs
|
6 years ago |
|
Beaudan Brown
|
76b36845bb
|
Add isFriendsWithAnyDevice and use it in relevant places
|
6 years ago |
|
Beaudan Brown
|
08ad913105
|
Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc
|
6 years ago |
|
Beaudan Brown
|
de0a5c7b78
|
Unique constraint and prevent some undefined bugs
|
6 years ago |
|
Beaudan Brown
|
d97eced37b
|
Merge branch 'clearnet' into multi-device
|
6 years ago |
Mikunj Varsani
|
fcea190539
|
Merge pull request #573 from Mikunj/electron-builder-upgrade
Fix CI
|
6 years ago |
|
Mikunj
|
e5f17d9d21
|
Fix CI
|
6 years ago |
|
Mikunj Varsani
|
bc68e17903
|
Merge pull request #572 from Mikunj/electron-builder-upgrade
Upgraded electron-builder
|
6 years ago |
|
Mikunj
|
9a3aa2a5bc
|
upgraded electron-builder.
|
6 years ago |
|
Mikunj Varsani
|
83d1c94f77
|
Merge pull request #571 from Mikunj/gitlab-mac-fix
Added mac signing
|
6 years ago |
|
Mikunj
|
3ba71fad9e
|
Linting.
|
6 years ago |
|
Mikunj
|
1250d93252
|
Added electron-notarize
|
6 years ago |
|
Mikunj
|
103e5e0ab8
|
Added mac signing
|
6 years ago |
|
Beaudan Brown
|
5e1e70ac8c
|
Enable link previews by default
|
6 years ago |
|
Beaudan Campbell-Brown
|
0d9c22038c
|
Merge pull request #569 from BeaudanBrown/bump-version-beta6
Bump version to beta6
|
6 years ago |
|
Beaudan Brown
|
a296bf96bf
|
Bump version to beta6
|
6 years ago |
|
Beaudan Brown
|
f52bc4d5b5
|
Cheeky lint and name change
|
6 years ago |
|
Beaudan Campbell-Brown
|
b56dfbabaf
|
Merge pull request #566 from BeaudanBrown/group-attachments
Group attachments
|
6 years ago |
|
Beaudan Campbell-Brown
|
cdb2a16e2a
|
Merge pull request #568 from BeaudanBrown/hide-android-accepts
Hide android friend request accepts and lint
|
6 years ago |
|
Beaudan Brown
|
a3019e12bf
|
Hide android friend request accepts and lint
|
6 years ago |
|
Beaudan Brown
|
b66abca17d
|
Disable files for friend requests
|
6 years ago |
|
Beaudan Brown
|
221c6b53b1
|
Clean up a bit
|
6 years ago |
|
Beaudan Brown
|
8cf90ae85d
|
Use message timestamp for empty messages
|
6 years ago |
|
Beaudan Brown
|
638f1c0e6c
|
Bringing together all the stuff for attachments and link previews
|
6 years ago |
|
Beaudan Brown
|
9114a3bc03
|
Annotation conversations
|
6 years ago |
|
Beaudan Brown
|
f0c198c7b7
|
Split uploadData to public and private
|
6 years ago |
|
Beaudan Campbell-Brown
|
c9b11814a6
|
Merge pull request #567 from BeaudanBrown/name-restriction
Display name restrictions 2
|
6 years ago |
|
Beaudan Campbell-Brown
|
ac80ef0d4e
|
Merge pull request #557 from BeaudanBrown/add-server
Add server
|
6 years ago |
|
Beaudan Brown
|
602ec1ccaf
|
Also block displayname characters in the edit display name menu and change spaces to underscores
|
6 years ago |