Commit Graph

85 Commits

Author SHA1 Message Date
d4107d9c16 Merge branch 'master' of github.com:devict/ictgj-voting 2018-07-26 14:18:11 -05:00
71c437ce91 Additional READMES
Admin Usage README & GOTIME! README
2018-07-26 14:16:45 -05:00
1623fa279d
Merge pull request #34 from br0xen/master
Better mobile formatting
2018-06-18 09:19:34 -05:00
746c26f7f3 Merge branch 'master' of github.com:br0xen/ictgj-voting 2018-06-18 09:12:28 -05:00
88ce4097b6 Better mobile formatting 2018-06-18 08:49:15 -05:00
b048675c4a
Merge pull request #33 from br0xen/master
Add more instruction on voting page
2018-02-04 09:32:33 -06:00
dbeb59e76d Add more instruction on voting page 2018-02-04 09:29:02 -06:00
bdfb1d41f3
Merge pull request #32 from br0xen/master
Fix a little bit with how thumbnails were displayed.
2018-01-29 15:47:44 -06:00
4591d3c827 Fix a little bit with how thumbnails were displayed.
Also fix session bug (if session secret changes).
2018-01-29 15:45:58 -06:00
2e64d28ded
Merge pull request #31 from br0xen/master
Scrub newlines out of game descriptions
2018-01-26 12:33:32 -06:00
0e2dce822c Regen assets 2018-01-26 12:31:17 -06:00
9b03710ed0 Scrub newlines out of game descriptions 2018-01-26 12:31:06 -06:00
f6b72a4286
Merge pull request #30 from br0xen/master
Remove hardcoded session secret
2018-01-26 11:48:45 -06:00
8afac6a29b Remove hardcoded session secret 2018-01-26 11:47:13 -06:00
2c1957a482 Update the readme 2018-01-23 15:16:36 -06:00
82a842f7fa Merge branch 'master' of github.com:devict/ictgj-voting 2018-01-23 15:07:11 -06:00
fb7beaeedf Regenerated assets
(Not sure if it was needed, but...)
2018-01-23 15:01:34 -06:00
4957f9eccc Merge branch 'split-dbs' 2018-01-23 14:58:07 -06:00
84cba4d340 Running out of memory now
Save to DB happens on timed interval and on shutdown
2018-01-23 14:55:52 -06:00
343b0fbb55
Merge pull request #28 from hitjim/contrib-guide
clarify steps for setting up development environment, added comments
2017-11-27 09:48:39 -06:00
hitjim
a470de0647 clarify steps for setting up development environment, added comments 2017-10-31 22:56:17 -05:00
0850550be4 Getting things going 2017-10-21 17:47:01 -05:00
1905f2c009 Compiling... But still work to do. 2017-10-19 14:53:07 -05:00
d1496007fb Switching Dev Systems 2017-10-18 17:18:12 -05:00
3eea9e32af Merge pull request #27 from hitjim/generated-file-cleanup
cleanup, .gitignore generated assets.go file, reflect in REAMDE.md
2017-10-13 06:31:52 -05:00
cdd0ce6a44 Switching dev machines 2017-10-12 08:51:53 -05:00
9440565555 Pushing up, done for the day 2017-10-11 18:03:27 -05:00
hitjim
7f45a98f8a cleanup, .gitignore generated assets.go file, reflect in REAMDE.md 2017-10-10 22:31:01 -05:00
18eabf2f79 Merge branch 'split-dbs' of github.com:br0xen/ictgj-voting into split-dbs 2017-10-10 08:09:22 -05:00
ac1001654a Merge branch 'split-dbs' of github.com:br0xen/ictgj-voting 2017-10-10 08:01:26 -05:00
d9eb90c7eb Commiting to switch dev systems 2017-10-10 07:39:42 -05:00
7fc7d023ec Merge branch 'split-dbs' 2017-10-03 09:03:07 -05:00
465db26f7e Commit to merge latest code 2017-10-03 09:01:32 -05:00
cd67ed4ae6 Merge pull request #24 from br0xen/master
Cleaning up the models, making things a little nicer
2017-10-03 06:55:38 -05:00
7da713d9a2 Regenerated Assets...
Not sure if I needed to, but I didn't think of it before submitting.
2017-10-02 18:12:24 -05:00
a225e3b6ad Cleaning up the models, making things a little nicer
Resolves issue #23
2017-10-02 18:06:35 -05:00
f57d917297 Started working on archive gamejam dbs 2017-10-02 08:44:55 -05:00
d398959dd9 Merge pull request #16 from br0xen/master
Fixed an issue with voting ties
2017-07-28 14:50:22 -05:00
be9739776c Regenerate Assets 2017-07-28 14:48:11 -05:00
1cd03128b0 Updated, hopefully good for the jam! 2017-07-28 14:36:14 -05:00
7286855b52 Merge pull request #15 from br0xen/master
Fix Screenshot Upload Form
Fixes Issue #3
2017-07-25 11:18:01 -05:00
13e5816112 Fix Screenshot Upload Form 2017-07-25 11:16:46 -05:00
3ceab46c16 Merge pull request #14 from br0xen/master
Split team management into tabs
Resolves issue #4 
Resolves issue #3
2017-07-25 10:52:18 -05:00
487273231a Split team management into tabs
Check for field changes before changing tabs
or uploading screenshots
2017-07-25 10:49:26 -05:00
ce650132c0 Merge pull request #13 from br0xen/master
Filled out the Readme File
2017-07-24 09:19:46 -05:00
660917ca02 Readme Work 2017-07-24 09:02:10 -05:00
f757abcf5d Readme Work 2017-07-24 09:01:44 -05:00
89c6939f88 Readme Work 2017-07-24 08:58:31 -05:00
22ab9045d8 Readme Work 2017-07-24 08:57:07 -05:00
c6dc295100 Filled out readme file 2017-07-24 08:54:02 -05:00