neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,517 Commits 22 Branches 44 Tags 65 MiB
Commit Graph

1517 Commits

Author SHA1 Message Date
Neale Pickett b340b44f0f Github wants docs/, not doc/ 2016-10-21 20:38:19 +00:00
Neale Pickett 3065598dee Merge branch 'master' into develop 2016-10-21 19:54:55 +00:00
Neale Pickett 6a9b27860b Merge branch 'slackish-dev' into develop 2016-10-21 19:37:44 +00:00
Neale Pickett e67e676fbd Merge branch 'develop' into slackish-dev 2016-10-21 19:37:16 +00:00
Neale Pickett 481d7d819f Merge pull request #10 from nealey/mine 
Shuffle files around: keep your campsite neat and tidy
 2016-10-21 10:07:03 -06:00
slackish 962fa791f6 category_seed now getting read or generated 2016-10-20 13:27:34 -06:00
slackish 2b29ffcf3d Associated files now included in puzzle.json 2016-10-20 12:48:48 -06:00
Neale Pickett 92feb3ab55 link to new style sheet 2016-10-20 11:49:43 -06:00
Neale Pickett b0d44f5b85 Shuffle files around: keep your campsite neat and tidy 2016-10-20 11:32:21 -06:00
Neale Pickett 2849d7d628 Merge pull request #8 from pflarr/master 
Devel server now serves puzzle files.
 2016-10-19 15:33:31 -06:00
Neale Pickett e7198d6ac8 Merge pull request #9 from pflarr/pflarr_edits 
New verbose logging and file service
 2016-10-19 15:33:18 -06:00
pflarr a8d8ad8040 Merge pull request #3 from dirtbags/master 
Merge in recent additions.
 2016-10-19 15:16:08 -06:00
Paul Ferrell 64e8fb5a1c Deconflicting for merge. 2016-10-19 15:14:37 -06:00
Paul Ferrell b033791c91 Added logging support to puzzles, devel-server. Made the puzzle_dir a public member of puzzle. 2016-10-19 15:02:38 -06:00
pflarr a4f92e7856 Merge pull request #2 from pflarr/pflarr_edits 
Pflarr edits
 2016-10-18 20:12:50 -06:00
Paul Ferrell 13bef1d167 The devel server now serves puzzle files. 2016-10-18 20:11:20 -06:00
slackish c388d271a2 added a debug message to puzzles.py, got some resemblence of files working on package-puzzles 2016-10-18 17:03:42 -06:00
slackish d1e7ad91e5 Merge branch 'slackish-dev' of github.com:dirtbags/moth into slackish-dev 2016-10-18 16:12:34 -06:00
slackish ff2c0bc999 checking in what i have 2016-10-18 16:06:11 -06:00
Neale Pickett 3262998996 Make Category class match new Puzzle.__init__ 2016-10-18 16:01:10 -06:00
slackish 4ba361e276 some changes to package puzzles, still gluing 2016-10-18 15:47:48 -06:00
slackish 36c93973cc some updates to package-puzzles 2016-10-18 15:47:48 -06:00
slackish 1ba99db98f puzzle directories are writing 2016-10-18 15:47:48 -06:00
slackish f865f3d0a3 starting zip capability 2016-10-18 15:47:48 -06:00
Neale Pickett 8971baca27 Merge pull request #6 from pflarr/pflarr_edits 
Pflarr edits
 2016-10-18 14:03:17 -06:00
Paul Ferrell 66bf05f213 Added a bit more documentation. 
Changed 'answers' to 'answer', 'hashes' to 'hash' for consistency.
 2016-10-18 13:29:41 -06:00
Paul Ferrell f2c12aa3ea Merged in some changes. 2016-10-18 13:23:14 -06:00
pflarr e6c6b129f4 Merge pull request #1 from dirtbags/master 
pulling from master
 2016-10-18 13:14:03 -06:00
Paul Ferrell cc9aa66be1 Minor bug fix, documentation added. 2016-10-18 13:11:53 -06:00
Paul Ferrell 2acd145d0a Minor bug fix, documentation added. 2016-10-18 11:24:46 -06:00
Neale Pickett 2a22f3a684 Get generated puzzles working 2016-10-18 09:51:33 -06:00
slackish 70db99ebf6 starting zip capability 2016-10-18 09:36:24 -06:00
Neale Pickett 12c64ad48a Send tracebacks to browser 2016-10-18 09:34:06 -06:00
Neale Pickett 8427052241 Make it work again 2016-10-18 05:20:48 +00:00
Neale Pickett 683317bae1 Merge branch 'objectify' 2016-10-18 05:04:22 +00:00
Neale Pickett caa8835f05 devel-server use new Puzzles obj. Needs cleanup. 2016-10-18 05:02:05 +00:00
Neale Pickett 43bceb6cd7 Merge pull request #5 from pflarr/pflarr_edits 
Added the ability to make a file just from a handle. Also, only accep…
 2016-10-17 22:26:09 -06:00
Paul Ferrell 47a429f5b9 Added the ability to make a file just from a handle. Also, only accept category/points as puzzle paths. 2016-10-17 21:26:56 -06:00
Neale Pickett 274eabfdc0 flake8 2016-10-18 02:28:24 +00:00
Neale Pickett 891b3f733f Merge branch 'pflarr' 2016-10-18 02:09:32 +00:00
Neale Pickett b167ccccdd Merge branch 'pflarr_edits' of https://github.com/pflarr/moth into pflarr 2016-10-18 02:09:09 +00:00
Paul Ferrell f22d7d95fb Files now come with a file handle to the original file. 2016-10-17 19:58:51 -06:00
Shane 8c16635671 Add Pat to credits 2016-10-17 17:26:53 -06:00
Shane 09820f10aa credit Neale 2016-10-17 17:25:45 -06:00
Shane 2dfa7a11bd Created new credits file. 2016-10-17 17:23:03 -06:00
Shane 00aa20e761 Merge backport for Python 3.4 2016-10-17 16:21:55 -06:00
Neale Pickett 0c0d7b1561 Fix character set issues on Windows 2016-10-17 16:10:41 -06:00
Shane 33697add32 Backward compatible with Python 3.4 2016-10-17 15:37:11 -06:00
Paul Ferrell 5072b23838 Reworked some basics of how the Puzzle class works. Shouldn't look to different from the outside. 2016-10-17 13:24:54 -06:00
Paul Ferrell 9840dd694e Made devel server compatible with python 3.4. 2016-10-17 12:36:40 -06:00