Commit Graph

4266 Commits (b7d709c3c86af4f58cc8a8f7bbd089f319a0718b)

Author SHA1 Message Date
Arron Atchison 02075a2ef6 Merge pull request #171 from MycroftAI/issue/flitevox-voice-path
Issue/flitevox voice path
2016-06-17 16:15:44 -05:00
aatchison 47db142980 Merge branch 'master' into issue/flitevox-voice-path 2016-06-17 16:13:39 -05:00
aatchison 3ebc67bf56 Merge branch 'master' into feature/deb-packaging 2016-06-17 16:12:44 -05:00
Arron Atchison a14ff48f2e Merge pull request #155 from MycroftAI/issues/154
Fix test runner so it only runs once.
2016-06-17 16:11:51 -05:00
Arron Atchison d07096c826 Merge pull request #170 from ethanaward/bugfix/issues-160
Issues 160 - Fix IP formatting
2016-06-17 15:58:26 -05:00
Ethan Ward 8215deaa89 Issues 160 - fix IP formatting 2016-06-17 15:47:55 -05:00
aatchison e5b5986a10 removed trusted host stuff 2016-06-17 15:30:18 -05:00
aatchison ef3d3e75a5 badly hardcoded flitevox file location in publish, to be places in /etc/mycroft.ini 2016-06-17 15:23:34 -05:00
Arron Atchison 0eda59dd9e ok, this works, but not for packaging
I have another approach to try.
2016-06-17 15:06:31 -05:00
aatchison baf5ae9631 Merge branch 'master' into feature/deb-packaging 2016-06-17 14:56:01 -05:00
aatchison 8ad51a758b removed '.' from mimic voice path 2016-06-17 14:48:04 -05:00
aatchison 06f75b3fa5 adapt version bump 2016-06-17 14:45:23 -05:00
aatchison 1b95710c7c Merge branch 'master' into feature/deb-packaging 2016-06-17 14:24:57 -05:00
aatchison 2224c95cef Merge pull request #167 from MycroftAI/feature/include-new-voice
Alan Pope voice runs by default, no idea what will happen when I pack…
2016-06-17 14:21:46 -05:00
aatchison 4b8ab903ea Merge branch 'master' into feature/deb-packaging 2016-06-17 14:18:35 -05:00
aatchison 545b2c29ee Merge pull request #169 from MycroftAI/issue/fix-default-config-manifest
changes to default config location to be included in the manifest
2016-06-17 14:18:09 -05:00
aatchison 7c84dd42d1 changes to default config location to be included in the manifest 2016-06-17 14:16:21 -05:00
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