brian/ictgj-voting
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
85 Commits 1 Branch 0 Tags
d4107d9c1642cf92ce45d1fa0f3351b1f911a82c
Commit Graph
42 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
brianandGitHub 1623fa279d Merge pull request #34 from br0xen/master 
Better mobile formatting
 2018-06-18 09:19:34 -05:00
brianandGitHub b048675c4a Merge pull request #33 from br0xen/master 
Add more instruction on voting page
 2018-02-04 09:32:33 -06:00
brian dbeb59e76d Add more instruction on voting page 2018-02-04 09:29:02 -06:00
brianandGitHub 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
brianandGitHub 2e64d28ded Merge pull request #31 from br0xen/master 
Scrub newlines out of game descriptions
 2018-01-26 12:33:32 -06:00
brianandGitHub f6b72a4286 Merge pull request #30 from br0xen/master 
Remove hardcoded session secret
 2018-01-26 11:48:45 -06:00
brianandGitHub 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
brian 1905f2c009 Compiling... But still work to do. 2017-10-19 14:53:07 -05:00
brianandGitHub 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
brian cdd0ce6a44 Switching dev machines 2017-10-12 08:51:53 -05:00
brian d9eb90c7eb Commiting to switch dev systems 2017-10-10 07:39:42 -05:00
brianandGitHub 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
brianandGitHub d398959dd9 Merge pull request #16 from br0xen/master 
Fixed an issue with voting ties
 2017-07-28 14:50:22 -05:00
brianandGitHub 7286855b52 Merge pull request #15 from br0xen/master 
Fix Screenshot Upload Form
Fixes Issue #3
 2017-07-25 11:18:01 -05:00
brianandGitHub 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
brianandGitHub ce650132c0 Merge pull request #13 from br0xen/master 
Filled out the Readme File
 2017-07-24 09:19:46 -05:00
brianandGitHub 883bca0566 Merge pull request #12 from br0xen/master 
Added a game-link page
 2017-07-19 10:17:29 -05:00
brianandGitHub 439f13754f Merge pull request #11 from br0xen/master 
Teams can now manage their own information (their team link can be found on the 'admin/teams' page)
    Process images on upload, build thumbnail in addition to original size
    Show thumbnail size images inline, load original sizes on embiggening
 2017-07-14 12:33:40 -05:00
brian 1c08032627 Add image request calls 2017-07-14 07:28:09 -05:00
brianandGitHub faf1ded0c3 Merge pull request #10 from br0xen/master 
Vendored dependencies
 2017-07-13 06:46:31 -05:00
brian e138d56c5e Vendored dependencies 2017-07-13 06:43:04 -05:00
brianandGitHub 44242c2057 Merge pull request #9 from br0xen/master 
Forgot to regen assets again
 2017-07-09 20:24:40 -05:00
brian 7495805ab4 Forgot to regen assets again 2017-07-09 20:23:55 -05:00
brianandGitHub 051d2542c4 Merge pull request #8 from br0xen/master 
Fixed vote validation issue
 2017-07-09 20:21:51 -05:00
brian e27d244f9c Remove debugging prints 2017-07-09 20:20:09 -05:00
brian a10bfd175e Fixed voting validation issue 2017-07-09 20:19:15 -05:00
brianandGitHub 9bcfb5feaa Merge pull request #7 from br0xen/master 
Several Changes
 2017-07-09 19:24:17 -05:00
brian cd42e7ab91 Re-generate Assets 2017-07-09 19:21:06 -05:00
brian 2fe197b99d Several good changes 
* Add vote validation before submitting
* Show 'Saved Vote' after vote saved, fade out message
* Increase flash message size
* Randomize order of games in voting list (Issue #5)
* Embiggen ScreenShots on Click
 2017-07-09 19:18:03 -05:00
brianandGitHub 6ad85d68f7 Merge pull request #6 from br0xen/master 
Almost ready for the jam
 2017-07-09 17:40:13 -05:00
brian 262c855643 First RC 
* Use embedded assets for templates
* All Critical functions are working
 2017-07-08 21:51:43 -05:00
brian 02dbfc39ca Working on Results Page 2017-07-06 12:09:49 -05:00
brian 7162c8c34d Syncing 2017-07-05 08:10:08 -05:00
brian 96a53b6090 Voting is working 2017-06-30 13:35:36 -06:00
brian 153b869a98 Merge branch 'master' of ssh://git.bullercodeworks.com:2200/brian/gjvote 2017-06-22 10:38:04 -05:00
brian ba35073d95 2017-06-22 Build 
* Use 'https://github.com/mjibson/esc' for embedded assets
* Pull database name out of siteData object
* Load site config from database, if available
* Allow customizing site config from command line arguments
* Clean up some templates
* Update Readme (it still needs a lot of updating)
* Started work on vote accumulation/management
 2017-06-22 10:34:57 -05:00
brian b283aacc6a Screenshot uploads are saving 2017-06-21 15:07:17 -05:00
brian 1faf4b9aa1 Working on editing team games 2017-06-15 12:35:53 -05:00
brianandGitHub c3bd940c1b Merge pull request #2 from br0xen/master 
Add/Remove Team Members

This commit also uses a new version of github.com/br0xen/boltease that fixed a bug
 2017-06-12 18:27:01 -05:00
brianandGitHub 49ced37446 Merge pull request #1 from br0xen/master 
Initial Commit to devICT Repo
 2017-06-08 15:53:08 -05:00
brian 9a77a25342 Making progress 2017-06-08 12:20:43 -05:00
brian eecce6de74 Initial commit 2017-06-08 06:38:27 -05:00