Commit Graph

4951 Commits (92876525cdadf3aa3fb148e0f7757d502dcdbddb)
 

Author SHA1 Message Date
sachaaaaa 92876525cd
Merge pull request #105 from sachaaaaa/gitlab_builds
gitlab builds for osx and win
6 years ago
sachaaaaa 9ca8a43438 restore test on windows release binaries 6 years ago
sachaaaaa c0a5f085ea fix space in gruntfile.js 6 years ago
sachaaaaa dd5c11768a win & osx builds on gitlab 6 years ago
sachaaaaa d52e2f5210
Merge pull request #106 from loki-project/remove-pull-request-template
Delete PULL_REQUEST_TEMPLATE.md
6 years ago
sachaaaaa 76cdf61ef9
Merge pull request #104 from BeaudanBrown/pow-refactor
Refactor PoW calculation to use webworkers
Fixes #100
6 years ago
Mikunj Varsani 716fa502b2
Delete PULL_REQUEST_TEMPLATE.md 6 years ago
sachaaaaa 42d3e481f0
Merge pull request #103 from Mikunj/travis
Added travis support for osx and windows
6 years ago
Beaudan bb3ca610ff Cleaned up utilWorker spawning 6 years ago
Mikunj 47081d4586 Added windows support. 6 years ago
Beaudan 6113f13d3a Rip the worker logic out of message_receiver and add the functionality for it to work with pow. Fix pow tests to work with those changes 6 years ago
sachaaaaa 37abdc6a4e
Merge pull request #102 from Mikunj/friend-request-retry
Fixes #86
6 years ago
Mikunj f86c96b068 Added support for osx. 6 years ago
Mikunj f98fe910d5 Fix friend request retry not working. 6 years ago
sachaaaaa e62c528ed2
Merge pull request #101 from Mikunj/linux-fixes
Linux fixes
6 years ago
Mikunj 35c8f32461 Fixed app quitting after unlock on linux. 6 years ago
Mikunj a1275ab911 Fix css on linux. 6 years ago
sachaaaaa b5589d4969
Merge pull request #99 from Mikunj/travis-testing
Run tests on travis on pull requests.
6 years ago
Mikunj 6cee2522a9 Fix apt-get command. 6 years ago
Mikunj 5aaf4818ad Run tests on travis on pull requests. 6 years ago
Beaudan Campbell-Brown 33e538dc80
Merge pull request #97 from Mikunj/seed-viewing
Allow viewing seed
6 years ago
sachaaaaa 67c7c7980a
Merge pull request #96 from loki-project/contributing-update
Update CONTRIBUTING.md to reflect loki-messenger
6 years ago
Mikunj f92cc6cbd4 Added menu option to view seed. 6 years ago
Mikunj 0491ceacf1 Added seed dialog.
Fixed issue where incorrect language was used to generate seed.
6 years ago
Beaudan Campbell-Brown 18d6683f57
Merge pull request #91 from Mikunj/minor-fixes
Minor fixes for production builds.
6 years ago
Mikunj 7e21deacc3 Undo css change as i'll fix that in another PR.
Point production to a test server.
6 years ago
Mikunj 3719a99554 Merge branch 'development' into minor-fixes 6 years ago
Beaudan Campbell-Brown ebf9d28fba
Update CONTRIBUTING.md to reflect loki-messenger
Should probably have done this a while ago lol
6 years ago
sachaaaaa e9ad614055
Merge pull request #94 from sachaaaaa/remove_secretsessioncipher_test
remove secretsessioncipher test
6 years ago
sachaaaaa bce44c4ec2 remove secretsessioncipher test 6 years ago
sachaaaaa 17349943dc
Merge pull request #88 from neuroscr/patch-1
Build instructions
6 years ago
Mikunj ba178b04b8 Minor fixes for production builds. 6 years ago
Ryan Tharp 176b7c9c72
Build instructions
Reference them to the proper place
6 years ago
sachaaaaa f1dbafc7ef
Merge pull request #85 from BeaudanBrown/development
Allow spaces in password
6 years ago
Beaudan 415d0858e8 Allow spaces in password 6 years ago
sachaaaaa a1255dd31e
Merge pull request #77 from Mikunj/password-protection
Password protection
6 years ago
sachaaaaa cd54661378
Merge pull request #84 from sachaaaaa/fix_loki_test
fix loki test
6 years ago
sachaaaaa 8b32583b79 fix loki test 6 years ago
sachaaaaa 18cbd99df8
Merge pull request #83 from Mikunj/signal/1.18.1
Merge signal 1.18.1 changes
6 years ago
Mikunj e1aba93aea Merge signal 1.18.1 changes. 6 years ago
sachaaaaa bcc81e41e4
Merge pull request #81 from Mikunj/ui/unread-icon
Added unread indicator in conversation section.
6 years ago
Beaudan Campbell-Brown 1303603db9
Apply suggestions from code review
Co-Authored-By: Mikunj <Mikunj@users.noreply.github.com>
6 years ago
sachaaaaa 4a2c618803
Update js/views/inbox_view.js
Co-Authored-By: Mikunj <Mikunj@users.noreply.github.com>
6 years ago
sachaaaaa f77da7c218
Merge pull request #78 from BeaudanBrown/loki-tests
Loki tests
6 years ago
Beaudan f6ab6495ae Updated the nonce trials variables to be constants for production and development 6 years ago
Beaudan a0584a68c9 Review suggested test case 6 years ago
sachaaaaa 5084d8cfec Update libloki/test/libloki-protocol_test.js
Co-Authored-By: BeaudanBrown <beau@loki.network>
6 years ago
sachaaaaa 1bc1213705 Update libloki/test/libloki-protocol_test.js
Co-Authored-By: BeaudanBrown <beau@loki.network>
6 years ago
Beaudan 7782c58d14 Slight refactor of PoW file to make easier to test plus some tests for the PoW functionality 6 years ago
Beaudan 11883cb989 Cleaner separation of loki tests 6 years ago