Commit Graph

399 Commits (b7965564e1811e6497629c55cdff1d8215dbc537)

Author SHA1 Message Date
Ryan Sipes 969791c1bd Merge pull request #152 from ethanaward/bugfix/issues-150
Issues 150 - Update Wolfram Alpha formatting
2016-06-17 13:47:04 -05:00
aatchison 1cd06d6820 Merge branch 'master' into feature/deb-packaging 2016-06-17 13:23:19 -05:00
aatchison 4068636005 Alan Pope voice runs by default, no idea what will happen when I package it 2016-06-17 13:20:11 -05:00
aatchison ca3278a1e8 Merge pull request #164 from MycroftAI/revert-163-feature/issue-161
Revert "custom skills #161"
2016-06-17 11:48:08 -05:00
aatchison f319fb37c4 Revert "custom skills #161" 2016-06-17 11:40:21 -05:00
aatchison eb100ac1a3 Merge branch 'master' into feature/deb-packaging 2016-06-17 11:28:28 -05:00
aatchison da04e5a70d Merge pull request #163 from the7erm/feature/issue-161
custom skills #161
2016-06-17 11:27:38 -05:00
Eugene R. Miller e1eedc0908 #161 fixed pep8 2016-06-17 09:50:14 -06:00
Ethan Ward c7f1c81e37 Issue 150 - Add unit tests 2016-06-17 09:44:51 -05:00
Eugene R. Miller 694377faf6 #161 oops fixed typo 2016-06-17 07:47:53 -06:00
Eugene R. Miller 80c8a451f2 #161 fixed pep8 issue and a few typos 2016-06-17 03:07:28 -06:00
Eugene R. Miller f70dc129aa #161 imported proper value 2016-06-17 03:06:51 -06:00
Eugene R. Miller 520c28bae2 #161 fixed pep8 issue 2016-06-17 03:05:22 -06:00
Eugene R. Miller 6efd787945 #161 added custom skills 2016-06-17 03:03:11 -06:00
root f63d0f1282 adapt version bump 2016-06-16 17:31:47 -05:00
aatchison f0c8248fb8 adapt-version bump 2016-06-16 17:18:17 -05:00
Sean Fitzgerald d857a3cc31 Fix test runner to it only runs once. 2016-06-16 10:33:02 -07:00
Jason Hines 1ce9109124 modified mycroft.sh so that logs will work. files ending in .screen are the config files for each screen. 2016-06-16 13:01:06 -04:00
Jason Hines 976a73fcfa Merge remote-tracking branch 'upstream/master' 2016-06-16 11:56:24 -04:00
Ethan Ward 740f35fa60 Issues 150 - Update for pep8 2016-06-15 17:16:22 -05:00
Ethan Ward 6d364c2e1a Issues 150 - Update WA skill output formatting 2016-06-15 17:11:07 -05:00
aatchison a5a5e5f6f4 Merge branch 'master' into feature/deb-packaging 2016-06-15 15:02:26 -05:00
Jason Hines 3a9d3557c3 Added optional stop to script per aatchison request 2016-06-15 14:52:59 -04:00
Jason Hines 16ace633bc Revert "added additional vocabulary"
This reverts commit fe662fbb3b.
2016-06-15 12:01:47 -04:00
Ethan Ward 78b917a71f Issues 63 - Ensuring pod.id usage in place of pod.title (#141) 2016-06-14 18:07:24 -04:00
Ethan Ward 80ceb68c95 Issues 143 - Update Contributing.md (#144)
Updated the doc to use the new repo and made minor fixes.
2016-06-14 16:07:05 -04:00
Jason Hines c70d375188 Merge branch 'master' of https://github.com/jasonehines/mycroft-core 2016-06-14 15:52:39 -04:00
Jason Hines 48bd0058bc Merge pull request #3 from MycroftAI/feature/jasenehines-mycroft.sh
Feature/jasenehines mycroft.sh
2016-06-14 15:50:00 -04:00
aatchison 7f03dc7dbe Merge pull request #148 from MycroftAI/enhancement/adapt-upgrade-0.2.3
update pypi version
2016-06-14 09:33:13 -05:00
aatchison 54a9ee4fa9 update pypi version 2016-06-14 09:12:21 -05:00
Jason Hines cc6ccec2f8 Merge pull request #3 from MycroftAI/feature/jasenehines-mycroft.sh
Feature/jasenehines mycroft.sh
2016-06-14 10:10:16 -04:00
aatchison d90b6fe910 added a logs directory 2016-06-13 20:00:51 -05:00
aatchison 9f738553e3 corrected a slight typo 2016-06-13 19:53:08 -05:00
Jason Hines 68bc1bca0a added mycroft startup script using detached screens 2016-06-13 18:31:38 -04:00
aatchison 492fb8cc00 Merge branch 'master' into feature/deb-packaging 2016-06-13 13:16:47 -05:00
aatchison 44fafe2b13 Merge pull request #139 from MycroftAI/feature/use-offical-pypi.python.org-for-adapt-arser
now pulling adapt-parser-0.2.2 from pypi.python.org
2016-06-13 13:13:51 -05:00
aatchison b5b3687b99 changes adapt-parser verson to 0.2.2 2016-06-13 12:17:25 -05:00
aatchison dff2573584 now pulling adapt-parser-0.2.2 from pypi.python.org 2016-06-13 12:14:33 -05:00
aatchison 20490dfe66 Merge branch 'master' into feature/deb-packaging 2016-06-13 11:18:44 -05:00
aatchison 14e613be68 Merge pull request #130 from MycroftAI/bugfix/force-python2.7
In one case, in dev_setup.sh, virtualenv was using python3.5, so now …
2016-06-13 11:08:56 -05:00
aatchison 18e52047b6 removed extra space 2016-06-13 11:00:37 -05:00
aatchison eda393a3af In one case, in dev_setup.sh, virtualenv was using python3.5, so now I'm forcing 2.7 2016-06-10 17:29:13 -05:00
Ethan Ward 30a00d72ca Issues 63 - Add more cases where Wolfram responds (#124)
* Issues 63 - Move result to own method

* Issues 63 - Add first test

* Issues 63 - Update syntax

* Issues 63 - Update syntax

* Issues 63 - Move test file

* Issues 63 - Make __find_value method more consistent

* Issues 63 - Add more extensive tests

* Issues 63 - Comply with pep8 formatting

* Issues 63 - Update test file for pep8

* Issues 63 - Refactor code to reduce size

* Issues 63 - Update for pep8
2016-06-10 17:16:26 -04:00
Ethan Ward 9aca0aec36 Issues 94 - Add remaining intent unit tests (#129)
* Issues 94 - Add Cerberus config intent tests

* Issues 94 - Add tests for pairing skill

* Issues 94 - Add intent tests for stop skill
2016-06-10 16:35:27 -04:00
Jonathan D'Orleans c0b1802f08 Issues 96 - Removing old defaults pack from sdk 2016-06-09 23:05:03 -04:00
Jason Hines cc7118e6aa Merge pull request #1 from jasonehines/jasonehines-patch-1
added additional vocabulary
2016-06-09 19:49:57 -04:00
Jason Hines fe662fbb3b added additional vocabulary 2016-06-09 19:43:28 -04:00
Jonathan D'Orleans 0e1c0f4589 Issues 96 - Fixing config file location 2016-06-09 18:50:24 -04:00
Jonathan D'Orleans 9b8db944a9 Issues 96 - Updating unit test configuration file 2016-06-09 18:29:37 -04:00
Jonathan D'Orleans fa5893cddb Issues 96 - Configuration
- Raising exception for invalid configuration
- Adding more unit tests
2016-06-09 18:27:04 -04:00