Commit Graph

929 Commits

Author SHA1 Message Date
Glavin Wiechert 4136fa9f78 Merge branch 'DanielJoyce-patch-1' 2015-11-02 15:15:19 -04:00
Glavin Wiechert e5068923cd Merge branch 'patch-1' of https://github.com/DanielJoyce/atom-beautify into DanielJoyce-patch-1 2015-11-02 15:13:15 -04:00
Glavin Wiechert 9a203b8684 Merge branch 'hayatae-master' 2015-11-02 14:12:10 -04:00
Glavin Wiechert f36a1d15e2 Merge branch 'master' of https://github.com/hayatae/atom-beautify into hayatae-master 2015-11-02 14:11:58 -04:00
Glavin Wiechert 96f22b0fcf Merge branch 'master' of github.com:Glavin001/atom-beautify 2015-11-02 14:04:42 -04:00
Glavin Wiechert 46fbe121bc Merge branch 'prettydiff-master' 2015-11-02 14:04:10 -04:00
Glavin Wiechert 92e7fe9c8a Merge branch 'master' of https://github.com/prettydiff/atom-beautify into prettydiff-master 2015-11-02 14:04:01 -04:00
Glavin Wiechert 32acb6ca71 Merge pull request #636 from bobjflong/BL/cachestack
Travis: cache stack builds
2015-11-02 14:01:24 -04:00
Glavin Wiechert 9a3a23fc2a Update Pretty Diff to v1.15.7 and fix broken JSX and TSS tests 2015-11-02 14:00:15 -04:00
Glavin Wiechert 50bb7d737e Remove Atom package language-tss dependency for testing 2015-11-02 13:59:57 -04:00
Bob Long ab86e8ffa1 Travis: cache stack builds 2015-11-02 17:25:39 +00:00
Glavin Wiechert 266ad49ab4 Merge pull request #623 from danielbayley/master
Improve CSScomb support
2015-10-30 11:50:47 -03:00
Daniel Bayley 4a06a683c6 Improve CSScomb support
Add setting for custom config file path and support for CSON in addition to the standard JSON config.

Signed-off-by: Daniel Bayley <daniel.bayley@me.com>
2015-10-30 13:18:36 +00:00
Glavin Wiechert bb54632129 Merge pull request #631 from nikolay/yapf-fix
YAPF fix
2015-10-30 00:52:27 -03:00
Nikolay Kolev adb96e0807
Remove redundant comments 2015-10-29 20:25:22 -07:00
Nikolay Kolev 9f7d5e346b Update README.md 2015-10-29 19:44:58 -07:00
Glavin Wiechert 4c9e430feb Update options documentation 2015-10-29 23:36:40 -03:00
Glavin Wiechert 4b4ce860f3 Prepare 0.28.16 release 2015-10-29 19:08:12 -03:00
Glavin Wiechert 1e2041e5fb Merge pull request #629 from bobjflong/BL/stylishhaskell
Support stylish-haskell
2015-10-29 19:07:02 -03:00
Bob Long 5d575a7a5c haskell test case 2015-10-29 21:18:19 +00:00
Bob Long c4b795bb0b Support stylish-haskell 2015-10-29 18:56:51 +00:00
Glavin Wiechert ff7a0a4efb Prepare 0.28.15 release 2015-10-25 23:57:23 -03:00
Glavin Wiechert a8abbbb1a2 Fixes #428. Switch to event-kit, replacing emissary 2015-10-25 23:56:37 -03:00
Glavin Wiechert a5b19efd58 Merge pull request #600 from jadekler/master
Fix README link to Keymaps In-Depth docs
2015-10-11 22:00:56 -03:00
Jean de Klerk 7ffdbb20aa Fixed readme link 2015-10-10 16:01:30 -06:00
Jeff Wheeler dc641c48bc PR #594 Fixing test for issue #524 2015-10-08 19:36:05 -04:00
Jeff Wheeler 1f2b525f58 See #524. Added support for methodchain setting in prettydiff. 2015-10-07 19:57:56 -04:00
Austin Cheney b4451f7e07 JSP support via beautifying as XML in Pretty Diff 2015-10-03 17:09:58 -05:00
Glavin Wiechert 8fd7d946ba Merge pull request #546 from ProgramFan/master
Add two beautifiers: clang-format and yapf
2015-09-27 13:13:50 -03:00
Yang Zhang c89077819f Fix lint errors 2015-09-27 18:14:00 +08:00
Yang Zhang c56735f2fb Make explicit return of promises in clang-format beautifier 2015-09-26 22:25:28 +08:00
Yang Zhang 088cc39790 Enhance clang-format beautifier with better error check 2015-09-26 17:59:30 +08:00
Yang Zhang 56f3c9539f Merge branch 'master' of https://github.com/Glavin001/atom-beautify 2015-09-26 14:23:04 +08:00
Glavin Wiechert 7b3677f0db Remove --one argument from CI build scripts 2015-09-25 18:59:21 -03:00
Glavin Wiechert 8094016160 Fix all broken test examples 2015-09-25 18:35:48 -03:00
Glavin Wiechert 013ecd6fe6 Fix linting code problems 2015-09-25 18:24:39 -03:00
Daniel fa24f5db23 Support dynamically reloading custom file .csscomb.json file changes
Instead of using require which caches the result, check if file exists and then use it if it does, otherwise fall back to bundled config.
2015-09-24 13:06:34 -07:00
Glavin Wiechert 72db1efa83 Prepare 0.28.14 release 2015-09-22 21:26:44 -03:00
Glavin Wiechert bbbc88b189 Merge pull request #562 from filipesilva/patch-1
Default prettydiff comments to indent
2015-09-22 21:26:19 -03:00
Filipe Silva d1aa61840a Default prettydiff comments to indent
Close #561
2015-09-23 01:21:59 +01:00
Glavin Wiechert 8bd0be76b3 Prepare 0.28.13 release 2015-09-22 17:20:45 -03:00
Glavin Wiechert d51a093772 Merge pull request #560 from prettydiff/master
Closes #559. Add support for XSL and XSD grammars and file extensions
2015-09-22 17:18:50 -03:00
Austin Cheney 5321f8c085 changing per request 2015-09-22 14:11:11 -05:00
Austin Cheney 6f99dd6a51 resolved some minor changes 2015-09-22 13:47:06 -05:00
Austin Cheney 7b9001e478 Push request for issue #559 2015-09-22 13:15:18 -05:00
Yang Zhang 185edce22e Disable options in clang-format formatter 2015-09-23 00:18:35 +08:00
Yang Zhang 9985f0677b Add two beautifiers: clang-format and yapf 2015-09-12 17:04:56 +08:00
Glavin Wiechert 075be2cd40 Prepare 0.28.12 release 2015-09-10 16:10:00 -03:00
Glavin Wiechert 971a87fcd8 See #524, #534. Add end_with_comma option to JavaScript using Pretty Diff 2015-09-10 16:08:58 -03:00
Glavin Wiechert 8854104f75 Merge branch 'master' of github.com:Glavin001/atom-beautify 2015-09-10 16:07:03 -03:00