Vincent
|
b7bea78d9d
|
Merge branch 'fonts-open' of https://github.com/vincentbavitz/session-desktop into fonts-open
|
6 years ago |
|
Vincent
|
49bf6a3d79
|
Merge branch 'fonts-open' of https://github.com/vincentbavitz/session-desktop into fonts-open
|
6 years ago |
|
Vincent
|
3709991b7c
|
Merge branch 'fonts-open' of https://github.com/vincentbavitz/session-desktop into fonts-open
|
6 years ago |
|
Vincent
|
755b1e8f35
|
Merge branch 'fonts-open' of https://github.com/vincentbavitz/session-desktop into fonts-open
|
6 years ago |
|
Vincent
|
445b60b7a6
|
Merge branch 'fonts-open' of https://github.com/vincentbavitz/session-desktop into fonts-open
|
6 years ago |
|
Vincent
|
607c785ec9
|
Fonts import ordering
|
6 years ago |
|
Vincent
|
1dc337fb76
|
Fonts import ordering
|
6 years ago |
|
Vincent
|
f1cf53db53
|
Remove conflicting tsx
|
6 years ago |
|
Vincent
|
e52b51dea1
|
Merge branch 'fonts-open' of https://github.com/vincentbavitz/session-desktop into fonts-open
|
6 years ago |
|
Vincent
|
1097d71895
|
Remove karla
|
6 years ago |
|
Vincent
|
4e86750e55
|
Remove karla
|
6 years ago |
|
Vincent
|
9ac0ada40b
|
remove unintended inclusions
|
6 years ago |
|
Vincent
|
bc5d8e9f6e
|
merge
|
6 years ago |
|
Vincent
|
b2d72508a9
|
pull
|
6 years ago |
|
Vincent
|
83bbeeb526
|
Public Sans and Mono ONLY
|
6 years ago |
|
Vincent
|
ac31543f76
|
Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into clearnet
|
6 years ago |
|
Vincent
|
dd04f650f8
|
changes
|
6 years ago |
Mikunj
|
30a6436b86
|
Add yarn lock
|
6 years ago |
|
Mikunj
|
663d2b0bc6
|
Merge branch 'clearnet' into revert-1051-revert-1033-package-cleanup
|
6 years ago |
Ryan Tharp
|
f9baac91a1
|
Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into patchopensnapps
|
6 years ago |
|
Ryan Tharp
|
f632a87b05
|
Merge pull request #1057 from loki-project/neuroscr-patch-2
open group api - put integration code under guard
|
6 years ago |
|
Ryan Tharp
|
033df05113
|
Merge pull request #1056 from loki-project/neuroscr-patch-1
Fix integration tests slipping into release
|
6 years ago |
|
Ryan Tharp
|
3553edcefc
|
lint
|
6 years ago |
|
Ryan Tharp
|
70c4b9b3c7
|
lint
|
6 years ago |
|
Ryan Tharp
|
b517ad5286
|
put integration code under guard
|
6 years ago |
|
Ryan Tharp
|
1ee2088343
|
Fix integration tests slipping into release
Per Mikunj
|
6 years ago |
|
Ryan Tharp
|
7b344e5bf8
|
Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into patchopensnapps
|
6 years ago |
|
Mikunj
|
0b63fbeae4
|
Merge branch 'master' into clearnet
|
6 years ago |
|
Vince
|
6438698442
|
Merge pull request #1052 from loki-project/revert-1050-clearnet
Revert "Clearnet --> Master for v1.0.6"
|
6 years ago |
|
Vince
|
fead4fffef
|
Revert "Clearnet --> Master for v1.0.6"
|
6 years ago |
Mikunj Varsani
|
24a3e05154
|
Revert "Revert "Clean up unused dependencies.""
|
6 years ago |
|
Vince
|
8216b7c079
|
Merge pull request #1051 from loki-project/revert-1033-package-cleanup
Revert "Clean up unused dependencies."
|
6 years ago |
|
Vince
|
cc89693bba
|
Merge pull request #1050 from loki-project/clearnet
Clearnet --> Master for v1.0.6
|
6 years ago |
|
Vince
|
973859647e
|
Merge pull request #1049 from vincentbavitz/clearnet
Upgrade to v1.0.6
|
6 years ago |
|
Vincent
|
82fdd6570d
|
update package.json to v1.0.6
|
6 years ago |
Audric Ackermann
|
476c53f96a
|
Merge pull request #1048 from Bilb/test-fix-line-ending
run lint ci task only on linux os
|
6 years ago |
|
Vince
|
5ff7476359
|
Revert "Clean up unused dependencies."
|
6 years ago |
|
Vince
|
6d591d956d
|
Merge pull request #1033 from Mikunj/package-cleanup
Clean up unused dependencies.
|
6 years ago |
|
Audric Ackermann
|
83ac64a0e7
|
run lint ci task only on linux and macos
|
6 years ago |
|
Audric Ackermann
|
c13b10ed64
|
Merge pull request #1047 from Bilb/test-fix-line-ending
ignore .md file prettier
|
6 years ago |
|
Audric Ackermann
|
edb85e3426
|
ignore .md file prettier
|
6 years ago |
|
Audric Ackermann
|
36712e6ffc
|
Merge pull request #1046 from Bilb/test-fix-line-ending
Test fix line ending
|
6 years ago |
|
Ryan Tharp
|
75511a7666
|
Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into patchopensnapps
|
6 years ago |
|
Ryan Tharp
|
996d7c9844
|
Merge pull request #1044 from neuroscr/fix-int-tests
Integration tests: Support slower computers/network
|
6 years ago |
|
Audric Ackermann
|
8dd94eb172
|
add back bug_report.md fixing lint
|
6 years ago |
|
Audric Ackermann
|
7081c20e85
|
Merge pull request #1039 from Bilb/disable-disappearing-message-set-before-friend
Disable disappearing message before friend request accepted
|
6 years ago |
|
Audric Ackermann
|
406f5deedd
|
remove bug_report.md to update line endings
|
6 years ago |
|
Audric Ackermann
|
796a37189a
|
Disable disappearing message before friend request accepted
Hide nickname option fron menu in ConversationHeader for now
|
6 years ago |
|
Audric Ackermann
|
9041c2ad06
|
Merge pull request #1036 from Bilb/fix-password-login-crash
Close the password window once mainwindow is focused
|
6 years ago |
|
Ryan Tharp
|
90d2bbb338
|
refactor refreshRandomPool into small functions, exception clean up
|
6 years ago |