Commit Graph

1709 Commits

Author SHA1 Message Date
Glavin Wiechert 9b9c1e5960
Merge pull request #1882 from derBroBro/terraform-support
Terraform support
2017-10-29 20:31:11 -03:00
Glavin Wiechert bcf4dc7db5
Merge pull request #1913 from szeck87/readme-update
Update readme template install steps and run npm run docs
2017-10-29 19:45:12 -03:00
Steven Zeck 133ed83243 Update readme template install steps and run npm run docs 2017-10-29 17:41:20 -05:00
Steven Zeck df4ee70af7
Merge branch 'master' into terraform-support 2017-10-29 17:32:21 -05:00
Steven Zeck 11f54a3e7c
Merge branch 'master' into terraform-support 2017-10-29 17:17:01 -05:00
Steven Zeck 3ec28ea375
Remove isPreInstalled attribute 2017-10-29 17:13:46 -05:00
Glavin Wiechert 218a8041e8
Merge pull request #1899 from szeck87/add-settings-menu
Add settings option to menu and use Ruby 2.1.10 in Travis
2017-10-29 19:03:40 -03:00
Steven Zeck c3aaf8907e
Remove rvm update and comment out rubocop install 2017-10-29 16:37:22 -05:00
Steven Zeck bd310367fe Use Ruby 2.1.10 in Travis for Rubocop install error 2017-10-19 18:39:55 -05:00
Steven Zeck 4522232642 Add Settings option to Atom Beautify menu to access package settings 2017-10-18 18:44:52 -05:00
Glavin Wiechert 30dece209a Merge pull request #1889 from szeck87/docker-version-fix
Allow 0 for minor and patch versions of docker
2017-10-14 14:56:26 -03:00
Steven Zeck 5444fc1f5b Add contributor to package.json 2017-10-13 23:04:14 -05:00
Steven Zeck 2ec771f203 Allow 0 for minor and patch versions of docker 2017-10-13 23:00:51 -05:00
Glavin Wiechert 07047c78fa Merge pull request #1887 from szeck87/travis-osx-ruby-version
Run brew update as suggested workaround for Ruby version issue
2017-10-13 19:45:14 -03:00
Malte Brodersen 0d266384f6 workarround for travis issue" 2017-10-11 23:11:41 +02:00
Malte Brodersen b318eea93d add travis and appveyor requirements 2017-10-11 20:39:29 +02:00
Steven Zeck 7936b94e8e Run brew update as suggested workaround for Ruby version issue 2017-10-11 11:47:21 -05:00
Brian Bugh 8eb5923a42 Merge branch 'master' into fix-rubocop-issues-1773-793 2017-10-10 16:35:28 -05:00
Malte Brodersen cf74a98212 remove space 2017-10-10 17:49:09 +02:00
Malte Brodersen 91f7adb824 update to run 2017-10-10 17:36:29 +02:00
Malte Brodersen fcb15dc552 add example 2017-10-10 16:57:18 +02:00
Malte Brodersen 11f3571538 rerun create docs 2017-10-10 16:51:13 +02:00
Malte Brodersen eeb65ea106 update changelog 2017-10-10 16:50:18 +02:00
Malte Brodersen 0b3a8ba140 update docs 2017-10-10 16:50:04 +02:00
Malte Brodersen 34b09fdd69 update options 2017-10-10 16:49:52 +02:00
Malte Brodersen 30d2264229 fix space 2017-10-09 22:20:02 +02:00
Malte Brodersen cc08dbd6c6 run docs 2017-10-09 22:09:06 +02:00
Malte Brodersen b95ad76d97 add changelog 2017-10-09 21:51:07 +02:00
Malte Brodersen e5a38e388a remove uneeded diffs 2017-10-09 21:48:05 +02:00
Malte Brodersen 70ae361b7a remove uneeded diffs 2017-10-09 21:45:21 +02:00
Malte Brodersen 608846408d add terraform 2017-10-09 21:39:54 +02:00
Brian Bugh d4db008923 Fixed deprecation warning: path.dirname requires string 2017-10-08 07:29:26 -05:00
Glavin Wiechert 96d71f8e01 Merge pull request #1878 from Glavin001/prettydiff-prettydiff2
Update to Prettydiff 2
2017-10-08 00:32:27 -03:00
Brian Bugh 6f8036ba7a Replaced unnecessary filename/temp file with hard coded value 2017-10-07 21:33:41 -05:00
Brian Bugh 5f36431b1d Moved main code into then() for actual promise resolution 2017-10-07 21:26:34 -05:00
Brian Bugh 2d595f2a20 Fixed fallback for rubocop executable 2017-10-07 21:08:35 -05:00
Glavin Wiechert 7602d24886 Close #881 Update Changelog with message about Prettydiff 2 2017-10-07 23:01:11 -03:00
Brian Bugh bd93afa64c Restored !configFile? 2017-10-07 20:01:47 -05:00
Glavin Wiechert f8509fc2ee Update prettydiff to 2.2.7, change UX Markup to xml 2017-10-07 22:00:45 -03:00
Brian Bugh 8188719685 Fixed beautify handling when context.filePath is not set 2017-10-07 16:13:49 -05:00
Brian Bugh c842af63bc Removed configFile variable definition 2017-10-07 15:51:19 -05:00
Brian Bugh 851a24f160 Removed getActiveTextEditor() 2017-10-07 15:28:39 -05:00
Glavin Wiechert 153a507290 Change fallback for UX Markup from xml back to html 2017-10-07 14:25:17 -03:00
Glavin Wiechert 0df338ed35 Switch from language-fuse to fuse Atom package 2017-10-07 14:22:29 -03:00
Glavin Wiechert 42d4d18404 Merge branch 'prettydiff2' of https://github.com/prettydiff/atom-beautify into prettydiff-prettydiff2 2017-10-07 14:14:31 -03:00
Glavin Wiechert ee0dc5e646 Update docs
Fix #1857 #1860
2017-10-07 12:45:13 -03:00
Glavin Wiechert 46550c623e Merge pull request #1877 from szeck87/master
Add language-puppet to Travis as Atom package install
2017-10-07 01:58:24 -03:00
Steven Zeck 410c3f241c Add language-puppet to Travis as Atom package install 2017-10-06 20:25:48 -05:00
Glavin Wiechert 8dc63b9237 Merge pull request #1798 from Kijan/patch-1
Add Tabletop Simulator Lua Scripting to Lua language
2017-10-05 23:09:27 -03:00
Glavin Wiechert ebfcb7ab29 Merge pull request #1875 from szeck87/travis-fix
Add --user for linux pip installs and init opam for MacOS
2017-10-05 23:06:29 -03:00