trading
/
PTMagic
mirror of https://github.com/PTMagicians/PTMagic.git
2
0
Fork 0
Code Issues Releases Wiki Activity
640 Commits 2 Branches 66 Tags 64 MiB
Commit Graph

640 Commits

Author SHA1 Message Date
Nathaniel Nation 21e15813c0 Update _Development/README.md 
Include the need for appsettings.json in the monitor folder
 2019-02-20 23:43:35 -05:00
Nathaniel Nation 05aaec9a02 Revert "Update _Development/README.md" 
This reverts commit 588f046d99.
 2019-02-20 23:30:38 -05:00
Nathaniel Nation 588f046d99 Update _Development/README.md 
Include the need for appsettings.json in the monitor folder
 2019-02-20 23:21:37 -05:00
HojouFotytu 207770d147
Merge pull request #67 from JackTerok/develop 
Added Clearer Log Message Take 2
 2019-02-20 22:04:12 +09:00
Your Name 63cd8ac633 Formatting 2019-02-20 13:38:32 +01:00
Your Name 8b465d0c42 Try to fix conflict 2019-02-20 13:35:58 +01:00
HojouFotytu 1a1a9b3d09
Merge pull request #65 from nnation/master 
Update _Development/README.md
 2019-02-19 09:33:45 +09:00
HojouFotytu 7c91cc84f0
Merge pull request #64 from JackTerok/develop 
Added Clearer Log Message
 2019-02-19 09:07:01 +09:00
Dave Baddeley c879b80e85
Merge pull request #63 from PTMagicians/Badders/develop/wip 
Badders/develop/wip
 2019-02-18 23:21:50 +00:00
Nathaniel Nation 439af14ce5 Update _Development/README.md 
Include the need for appsettings.json in the monitor folder
 2019-02-18 15:57:04 -05:00
djbadders 093e1e0fb0 Revert using sample API key for the currency converter 2019-02-18 20:29:13 +00:00
JackTerok ef02a897aa Added Clearer Log Message 2019-02-18 19:05:54 +01:00
HojouFotytu 8da3937623
Update CODE_OF_CONDUCT.md 2019-02-18 22:26:59 +09:00
djbadders cc69738a89 Restore preset files to original 2019-02-17 23:42:50 +00:00
djbadders ad15fd4709 Merge branch 'master' into Badders/develop/wip 2019-02-17 23:33:02 +00:00
djbadders cb4f0a01ed More fixes 
- Fixed checking file timestamps to use UTC
- Added better debug info on failed calls for market data
- Fixed failure to get currency exchange rates
 2019-02-17 23:08:11 +00:00
HojouFotytu 071a5a988a
Merge pull request #62 from PTMagicians/develop 
Update version number
 2019-02-18 00:48:20 +09:00
HojouFotytu a5669a39dc
Merge pull request #61 from HojouFotytu/develop 
update version number 2.1.2
 2019-02-18 00:47:21 +09:00
HojouFotytu 330707fbd8 update version number 2.1.2 2019-02-18 00:40:25 +09:00
HojouFotytu 66968e99d1
Merge pull request #60 from PTMagicians/develop 
CurrencyConverter & ASPNetCore Update
 2019-02-17 23:55:41 +09:00
HojouFotytu 02ffbf31eb
Merge pull request #59 from HojouFotytu/develop 
CurrencyConverterAPI & AspNetCore Updates
 2019-02-17 23:49:57 +09:00
HojouFotytu 031613c778 CurrencyConverterAPI & ASPNetCore Update 2019-02-17 23:45:00 +09:00
HojouFotytu 87d3f50726
Merge pull request #58 from PTMagicians/revert-57-develop 
Revert "Minor Fixes"
 2019-02-17 21:40:07 +09:00
HojouFotytu ec9ba3745d
Revert "Minor Fixes" 2019-02-17 21:39:22 +09:00
HojouFotytu 3b2aa4990e
Merge pull request #57 from HojouFotytu/develop 
Minor Fixes
 2019-02-17 15:33:53 +09:00
HojouFotytu b3c6dbe526 Force update from presets every run 2019-02-17 15:14:45 +09:00
HojouFotytu 867ab85c09 FreeCurrencyConverterApi Fix 2019-02-17 13:48:49 +09:00
HojouFotytu aff5a15403
Merge pull request #56 from notatestuser/patch-1 
Allow signal strategy
 2019-02-16 17:53:51 +09:00
Luke Plaster efadf45a33
Allow signal strategy 2019-02-16 04:26:37 +08:00
djbadders bfae59193f Fixes and reliability tweaks 
- Fixed issues with detecting the console and whether keypresses can be captured.
- Changed the start-up to keep trying to acquire configuration and/or Profit Trailer connectivity using a exponential backoff to stop thrashing.
- Changed the code to use UTC times to avoid issues when daylight svaing kicks in.
 2019-02-04 00:17:38 +00:00
HojouFotytu b1d77b9820
Merge pull request #49 from PTMagicians/develop 
Develop
 2019-01-25 00:26:51 +09:00
HojouFotytu d161c11a3a
Merge pull request #48 from HojouFotytu/develop 
force loading local default settings on first run
 2019-01-24 23:47:25 +09:00
HojouFotytu 86ca9023b4 force loading local default settings on first run 2019-01-24 23:05:10 +09:00
HojouFotytu 94d334ca45
Merge pull request #47 from HojouFotytu/develop 
New PT strategy icons
 2019-01-24 21:11:31 +09:00
HojouFotytu 50c91f4ce8 new PT strategy icons part 2 2019-01-24 21:09:45 +09:00
HojouFotytu 6abd6e32a5 new PT strategy icons 2019-01-24 21:03:19 +09:00
HojouFotytu 2e4c71f83c
Merge pull request #45 from PTMagicians/develop 
Release 2.1.0
 2019-01-20 21:10:42 +09:00
HojouFotytu 254de2eef2
Merge pull request #44 from HojouFotytu/develop 
Removed SMS Trigger Comments
 2019-01-20 18:08:18 +09:00
HojouFotytu e1a7c525a6 Removed SMS Trigger Comments 2019-01-20 15:03:48 +09:00
HojouFotytu f2a394cc2c
Merge pull request #43 from JackTerok/develop 
Fix DateTime Bug
 2019-01-17 23:02:27 +09:00
JackTerok d41896dcc5 DateTimeFix 2019-01-17 14:38:52 +01:00
HojouFotytu 99456669cf
Merge pull request #41 from HojouFotytu/develop 
global setting always visible
 2019-01-16 03:30:03 +09:00
HojouFotytu 9163f994ac global setting always visible 2019-01-16 03:17:14 +09:00
HojouFotytu d5a4aa3466
Merge pull request #40 from JackTerok/develop 
Data Structure Changes
 2019-01-15 22:30:16 +09:00
JackTerok 30841b6562 More formatting... 2019-01-15 14:01:32 +01:00
JackTerok 24e3bd163b Formatting 2019-01-15 13:59:19 +01:00
JackTerok cd1941081e Data Structure Changes 2019-01-15 13:43:07 +01:00
HojouFotytu bae6d2bd7a
Merge pull request #39 from HojouFotytu/develop 
Monitor Changes
 2019-01-15 10:52:41 +09:00
HojouFotytu 85bd8b625f removed min/max & timeout label changes 2019-01-14 13:41:09 +09:00
HojouFotytu 90ff847629 Dashboardbottom typo; updated settings.general 2019-01-14 12:56:15 +09:00