summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2016-01-20Separate production and test requirements and parse the former in setup.pyChristopher Arndt
2016-01-20Merge pull request #65 from TailorDev/fix-flake8-E731-errorsJulien Maupetit
2016-01-20Fix flake8 E731 errorsYannick PEROUX
2016-01-20Fix requires.io urlJulien Maupetit
2016-01-20Merge branch 'master' into developJulien Maupetit
2016-01-20Add requires.io badgeJulien Maupetit
2015-12-16Merge pull request #61 from EmilMaric/feature/mergeJulien Maupetit
2015-12-03Updated documentation for merge commandkwou
2015-12-03Changed .join() input to use a generator rather than in-memory listEmil Maric
2015-12-01Added short form for '--force' option in mergekwou
2015-12-01Added examples to README under 'merge'kwou
2015-12-01Added 'merge' command to bash-completionkwou
2015-12-01Added documentation for merge command in READMEkwou
2015-12-01Format over-indentation issuekwou
2015-12-01Changed format of line to prevent exceeding limitkwou
2015-12-01Refactor for saving frames in merge featurekwou
2015-12-01Added prompt for user to continue merge if conflicts are foundkwou
2015-11-30Add missing dependency to tox.iniEmil Maric
2015-11-30Fixed syntactiacl errors with line too longEmil Maric
2015-11-30Added in help section for --no-dry-option and fixed up some PEP issues with o...Emil Maric
2015-11-30Added updated_at keyword for Frames.new_frame()kwou
2015-11-30Added unit test for merge reportkwou
2015-11-30added help message to for watson mergeHong Wei Tseng
2015-11-30Added comments to merge featurekwou
2015-11-30Fixed date/time formatting in conflict merge outputkwou
2015-11-30Fixed printing json dumps for diff outputskwou
2015-11-28Finished basic mergeEmil Maric
2015-11-27Took out PDBEmil Maric
2015-11-27Merge report finished. Now need to add merge functionalityEmil Maric
2015-11-16Merge pull request #56 from SpotlightKid/feature/testpy35Julien Maupetit
2015-11-16Merge pull request #49 from SpotlightKid/feature/restartJulien Maupetit
2015-11-16Merge pull request #55 from SpotlightKid/feature/versioninfoJulien Maupetit
2015-11-16Merge pull request #54 from SpotlightKid/feature/editcurrentJulien Maupetit
2015-11-14Add Python 3.5 to tox and travis config, run tox on travis via Python 3.5Christopher Arndt
2015-11-14Add option to display program version (fixes #51)Christopher Arndt
2015-11-13edit defaults to current frame (see #28)Christopher Arndt
2015-11-10Implementation of 'restart' command (fixes #3)Christopher Arndt
2015-11-08Merge pull request #47 from waynew/masterYannick PÉROUX
2015-11-07Documentation care of @SpotlightKid's pr #49Wayne Werner
2015-11-06Merge pull request #39 from bcho/features/keep-cjkJulien Maupetit
2015-11-05Merge pull request #50 from SpotlightKid/feature/toxflakeYannick PÉROUX
2015-11-04Add flake8 to test environments to always runChristopher Arndt
2015-11-02Changed to `watson.is_started` per @k4nar on #47Wayne Werner
2015-11-02We want the boolean version so False is falsyWayne Werner
2015-11-02stop_on_start is a bit better, h/t @jmaupetitWayne Werner
2015-11-02Check config for auto_stop. Depends on #43Wayne Werner
2015-11-02Stop existing project when starting a new oneWayne Werner
2015-11-02Merge pull request #43 from SpotlightKid/feature/configparserYannick PÉROUX
2015-10-30Add wrapper for `RawConfigParser` to make option access more convenientChristopher Arndt
2015-10-27Use develop branch for Travis badgeYannick PÉROUX
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 07:11:20 +0000