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

1519 Commits

Author SHA1 Message Date
J. Patrick Avery, Jr b36aa1a50e
sync with develop 2016-10-24 13:43:31 -06:00
slackish eb05cf77fd error with writing puzzle 2016-10-21 16:11:09 -06:00
Neale Pickett dc899116f1 Merge branch 'master' into develop 2016-10-21 19:54:55 +00:00
Neale Pickett bfc07d3546 Merge branch 'slackish-dev' into develop 2016-10-21 19:37:44 +00:00
Neale Pickett eec9a52d1e Merge branch 'develop' into slackish-dev 2016-10-21 19:37:16 +00:00
Neale Pickett ef89bbf043 Merge pull request #10 from nealey/mine 
Shuffle files around: keep your campsite neat and tidy
 2016-10-21 10:07:03 -06:00
J. Patrick Avery, Jr e8ec19e496
puzzles: add in support for monolithic categories 
This also supports static or dynamic puzzles within a category following the
earlier design strategy.

Tested on a monolithic category, needs testing with a variety of category types.
 2016-10-20 17:10:57 -06:00
slackish 309bd318ec category_seed now getting read or generated 2016-10-20 13:27:34 -06:00
slackish c85db04460 Associated files now included in puzzle.json 2016-10-20 12:48:48 -06:00
Neale Pickett 666415c735 link to new style sheet 2016-10-20 11:49:43 -06:00
Neale Pickett 60fec77add Shuffle files around: keep your campsite neat and tidy 2016-10-20 11:32:21 -06:00
Neale Pickett 0a34dd3fa5 Merge pull request #8 from pflarr/master 
Devel server now serves puzzle files.
 2016-10-19 15:33:31 -06:00
Neale Pickett 1e15a2c19f Merge pull request #9 from pflarr/pflarr_edits 
New verbose logging and file service
 2016-10-19 15:33:18 -06:00
pflarr b788732a12 Merge pull request #3 from dirtbags/master 
Merge in recent additions.
 2016-10-19 15:16:08 -06:00
Paul Ferrell d8a665e408 Deconflicting for merge. 2016-10-19 15:14:37 -06:00
Paul Ferrell 108ec81906 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 3a2b349cfe Merge pull request #2 from pflarr/pflarr_edits 
Pflarr edits
 2016-10-18 20:12:50 -06:00
Paul Ferrell 10eaf13a4e The devel server now serves puzzle files. 2016-10-18 20:11:20 -06:00
slackish cf922f3217 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 b487f93661 Merge branch 'slackish-dev' of github.com:dirtbags/moth into slackish-dev 2016-10-18 16:12:34 -06:00
slackish 1bda94c44d checking in what i have 2016-10-18 16:06:11 -06:00
Neale Pickett 2a7853dba9 Make Category class match new Puzzle.__init__ 2016-10-18 16:01:10 -06:00
slackish 9b82417229 some changes to package puzzles, still gluing 2016-10-18 15:47:48 -06:00
slackish 0b335066a4 some updates to package-puzzles 2016-10-18 15:47:48 -06:00
slackish 6470cbd9d6 puzzle directories are writing 2016-10-18 15:47:48 -06:00
slackish d52ecab5ce starting zip capability 2016-10-18 15:47:48 -06:00
Neale Pickett 030969d190 Merge pull request #6 from pflarr/pflarr_edits 
Pflarr edits
 2016-10-18 14:03:17 -06:00
Paul Ferrell db78f43324 Added a bit more documentation. 
Changed 'answers' to 'answer', 'hashes' to 'hash' for consistency.
 2016-10-18 13:29:41 -06:00
Paul Ferrell f27c283e0e Merged in some changes. 2016-10-18 13:23:14 -06:00
pflarr a4e529a067 Merge pull request #1 from dirtbags/master 
pulling from master
 2016-10-18 13:14:03 -06:00
Paul Ferrell 1f9e63cfa6 Minor bug fix, documentation added. 2016-10-18 13:11:53 -06:00
Paul Ferrell 21306027b7 Minor bug fix, documentation added. 2016-10-18 11:24:46 -06:00
Neale Pickett 881e5a46e1 Get generated puzzles working 2016-10-18 09:51:33 -06:00
slackish 3c54f3f56a starting zip capability 2016-10-18 09:36:24 -06:00
Neale Pickett 0cd6dc97c5 Send tracebacks to browser 2016-10-18 09:34:06 -06:00
Neale Pickett 80b80e895c Make it work again 2016-10-18 05:20:48 +00:00
Neale Pickett ad77a99eba Merge branch 'objectify' 2016-10-18 05:04:22 +00:00
Neale Pickett c10ad383ad devel-server use new Puzzles obj. Needs cleanup. 2016-10-18 05:02:05 +00:00
Neale Pickett 2360e12274 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 323f904e79 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 0ac8d8e9ac flake8 2016-10-18 02:28:24 +00:00
Neale Pickett 19e0b7684a Merge branch 'pflarr' 2016-10-18 02:09:32 +00:00
Neale Pickett 4309d9e176 Merge branch 'pflarr_edits' of https://github.com/pflarr/moth into pflarr 2016-10-18 02:09:09 +00:00
Paul Ferrell 2e20af0747 Files now come with a file handle to the original file. 2016-10-17 19:58:51 -06:00
Shane 3c4a340652 Add Pat to credits 2016-10-17 17:26:53 -06:00
Shane dd43df9404 credit Neale 2016-10-17 17:25:45 -06:00
Shane a72c5f81a8 Created new credits file. 2016-10-17 17:23:03 -06:00
Shane 58253b7a0f Merge backport for Python 3.4 2016-10-17 16:21:55 -06:00
Neale Pickett 7469daa6d1 Fix character set issues on Windows 2016-10-17 16:10:41 -06:00
Shane ee409479ef Backward compatible with Python 3.4 2016-10-17 15:37:11 -06:00