Brian Buller
d1496007fb
Switching Dev Systems
2017-10-18 17:18:12 -05:00
Brian Buller
cdd0ce6a44
Switching dev machines
2017-10-12 08:51:53 -05:00
Brian Buller
9440565555
Pushing up, done for the day
2017-10-11 18:03:27 -05:00
Brian Buller
18eabf2f79
Merge branch 'split-dbs' of github.com:br0xen/ictgj-voting into split-dbs
2017-10-10 08:09:22 -05:00
Brian Buller
d9eb90c7eb
Commiting to switch dev systems
2017-10-10 07:39:42 -05:00
Brian Buller
465db26f7e
Commit to merge latest code
2017-10-03 09:01:32 -05:00
Brian Buller
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
Brian Buller
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
Brian Buller
a225e3b6ad
Cleaning up the models, making things a little nicer
...
Resolves issue #23
2017-10-02 18:06:35 -05:00
Brian Buller
f57d917297
Started working on archive gamejam dbs
2017-10-02 08:44:55 -05:00
Brian Buller
d398959dd9
Merge pull request #16 from br0xen/master
...
Fixed an issue with voting ties
2017-07-28 14:50:22 -05:00
Brian Buller
be9739776c
Regenerate Assets
2017-07-28 14:48:11 -05:00
Brian Buller
1cd03128b0
Updated, hopefully good for the jam!
2017-07-28 14:36:14 -05:00
Brian Buller
7286855b52
Merge pull request #15 from br0xen/master
...
Fix Screenshot Upload Form
Fixes Issue #3
2017-07-25 11:18:01 -05:00
Brian Buller
13e5816112
Fix Screenshot Upload Form
2017-07-25 11:16:46 -05:00
Brian Buller
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
Brian Buller
487273231a
Split team management into tabs
...
Check for field changes before changing tabs
or uploading screenshots
2017-07-25 10:49:26 -05:00
Brian Buller
ce650132c0
Merge pull request #13 from br0xen/master
...
Filled out the Readme File
2017-07-24 09:19:46 -05:00
Brian Buller
660917ca02
Readme Work
2017-07-24 09:02:10 -05:00
Brian Buller
f757abcf5d
Readme Work
2017-07-24 09:01:44 -05:00
Brian Buller
89c6939f88
Readme Work
2017-07-24 08:58:31 -05:00
Brian Buller
22ab9045d8
Readme Work
2017-07-24 08:57:07 -05:00
Brian Buller
c6dc295100
Filled out readme file
2017-07-24 08:54:02 -05:00
Brian Buller
883bca0566
Merge pull request #12 from br0xen/master
...
Added a game-link page
2017-07-19 10:17:29 -05:00
Brian Buller
f2dde0c709
Added a game-link page
...
Also tweaked a few other things
Kinda worked more on the client authentication stuff
2017-07-19 10:16:18 -05:00
Brian Buller
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 Buller
c2959b3974
Several Changes
...
Added Team Self-Management pages (Site must not be 'voting' mode)
Process screenshots on upload, create thumbnail
Change inline screenshots to thumbnails (screenshots can get big)
2017-07-14 12:27:42 -05:00
Brian Buller
1c08032627
Add image request calls
2017-07-14 07:28:09 -05:00
Brian Buller
faf1ded0c3
Merge pull request #10 from br0xen/master
...
Vendored dependencies
2017-07-13 06:46:31 -05:00
Brian Buller
e138d56c5e
Vendored dependencies
2017-07-13 06:43:04 -05:00
Brian Buller
44242c2057
Merge pull request #9 from br0xen/master
...
Forgot to regen assets again
2017-07-09 20:24:40 -05:00
Brian Buller
7495805ab4
Forgot to regen assets again
2017-07-09 20:23:55 -05:00
Brian Buller
051d2542c4
Merge pull request #8 from br0xen/master
...
Fixed vote validation issue
2017-07-09 20:21:51 -05:00
Brian Buller
e27d244f9c
Remove debugging prints
2017-07-09 20:20:09 -05:00
Brian Buller
a10bfd175e
Fixed voting validation issue
2017-07-09 20:19:15 -05:00
Brian Buller
9bcfb5feaa
Merge pull request #7 from br0xen/master
...
Several Changes
2017-07-09 19:24:17 -05:00
Brian Buller
cd42e7ab91
Re-generate Assets
2017-07-09 19:21:06 -05:00
Brian Buller
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
Brian Buller
6ad85d68f7
Merge pull request #6 from br0xen/master
...
Almost ready for the jam
2017-07-09 17:40:13 -05:00
Brian Buller
262c855643
First RC
...
* Use embedded assets for templates
* All Critical functions are working
2017-07-08 21:51:43 -05:00
Brian Buller
02dbfc39ca
Working on Results Page
2017-07-06 12:09:49 -05:00
Brian Buller
7162c8c34d
Syncing
2017-07-05 08:10:08 -05:00
Brian Buller
96a53b6090
Voting is working
2017-06-30 13:35:36 -06:00
Brian Buller
153b869a98
Merge branch 'master' of ssh://git.bullercodeworks.com:2200/brian/gjvote
2017-06-22 10:38:04 -05:00
Brian Buller
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 Buller
f4c40a03bb
Game Screenshot Upload/Delete is working
2017-06-21 17:09:26 -05:00
Brian Buller
b283aacc6a
Screenshot uploads are saving
2017-06-21 15:07:17 -05:00
Brian Buller
b9c95826d9
Put all vendored files in the 'vendor' directory
2017-06-15 14:09:07 -05:00
Brian Buller
1faf4b9aa1
Working on editing team games
2017-06-15 12:35:53 -05:00
Brian Buller
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
Brian Buller