Omar Shammas committed revision
1c72d3e6e9
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
dab4663680
Can go to game page from map. Thank you djangodash
Mahdi Yusuf committed revision
acd3c2d857
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
4351d830f4
adding more shit
Serena Ngai committed revision
871d19d454
Merge branch 'master' of github.com:myusuf3/courtside
Serena Ngai committed revision
5abd8a80f0
Add beta text. Updates to Create Game, Profile Edit, and Resgister forms.
Mahdi Yusuf committed revision
5f4b271d41
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
5667a8b787
removing style.css
Omar Shammas committed revision
0fd88a512d
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
d6a4925dec
Fixing the search so a pop no longer appears, but the user is notified by adding some text under the search field
Mahdi Yusuf committed revision
d4a2806f31
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
1a75425a10
Adding forms
Omar Shammas committed revision
d087273555
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
cb713459c1
Adding date and time picker, removed end_date_and_time.
Serena Ngai committed revision
5868d0a1d9
Register form styling
Serena Ngai committed revision
e09dda364c
Merge branch 'master' of github.com:myusuf3/courtside
Serena Ngai committed revision
fb7c6dc5bd
New Register styling. Fix sport tag on Profile page,
Omar Shammas committed revision
5a74246ffc
Search capability,works similar to the index.
Omar Shammas committed revision
89d479e3e6
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
7a4e519e66
Adding the search capability
Omar Shammas committed revision
be466639cd
The markers now have animation.
Mahdi Yusuf committed revision
65270f7028
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
73c24a0e8f
adding game sign email
Serena Ngai committed revision
d4854df48c
Fix positioning on login screen
Serena Ngai committed revision
d849f0906b
Merge branch 'master' of github.com:myusuf3/courtside
Serena Ngai committed revision
82efc9fcef
Fix styling on map tag buttons
Mahdi Yusuf committed revision
b4e479ac62
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
eb7cf30d73
changing search page removing prints, and print in form
Serena Ngai committed revision
82132194ae
Merge branch 'master' of github.com:myusuf3/courtside
Serena Ngai committed revision
862308f7c4
Add footer to all the pages
Mahdi Yusuf committed revision
f508746f8d
adding proper fb url and check for username
Omar Shammas committed revision
f887615045
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
02047145c1
Enabling the markers on the map on index.
Mahdi Yusuf committed revision
c88e5a84ff
fixing bugs with from validation
Mahdi Yusuf committed revision
c073fb98dd
adding changes to form login
Mahdi Yusuf committed revision
17a574114c
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
fda7c8830e
finished logic for proper login
Serena Ngai committed revision
65478c0642
Update to login page
Serena Ngai committed revision
632e2591ea
Merge branch 'master' of github.com:myusuf3/courtside
Serena Ngai committed revision
564ef3cbe5
Updates to 404 and 500 page
Mahdi Yusuf committed revision
36f79bf4d6
adding period task
Serena Ngai committed revision
ec19c24d92
Merge branch 'master' of github.com:myusuf3/courtside
Serena Ngai committed revision
b9b690f944
Add 404 and 500 pages
Omar Shammas committed revision
413c2f6657
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
ae49af8d28
Fixing the navigation bar so it is consitent among all the views and include the 3 main links about, search games, and create game
Mahdi Yusuf committed revision
c505bcaec3
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
08214c9c4b
added sign up email for facebook and twitter registration
Omar Shammas committed revision
04b91b9160
Can search games by clicking enter, without reloading the page.
Omar Shammas committed revision
c5b31f7c4e
Fixed the profile page, so it only displays the gender once.
Mahdi Yusuf committed revision
533c318a13
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
d5be488b92
adding email task for celery
Serena Ngai committed revision
5538202cf0
Fix join game button
Serena Ngai committed revision
bfe283a785
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
ef20198716
updating requirements.txt
Mahdi Yusuf committed revision
a777760082
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
7e94d80a7b
adding pages I thought were there derp.
Serena Ngai committed revision
d95beb14b6
Another fix for Profile page.
Serena Ngai committed revision
0b723f7510
Add Hockey icon.
Serena Ngai committed revision
a938ee84ca
Fix for Profile page
Omar Shammas committed revision
77a0386768
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
a77edc48db
A user's profile page is now dynamic, except for the list of upcoming games that has not been written yet.
Serena Ngai committed revision
573e066d39
merge conflict with About page
Serena Ngai committed revision
016d31f294
Update to About page.
Omar Shammas committed revision
a74d586797
Fixing merge conflict
Omar Shammas committed revision
cd64d101f3
Clarified the gender field on a user's profile
Serena Ngai committed revision
b9be2694f1
merging conflicts
Serena Ngai committed revision
83d0bb3645
Add Search and About pages.
Omar Shammas committed revision
78939332c4
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
b1e9a72568
Adding the about page
Mahdi Yusuf committed revision
e166b97a30
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
5c3df6039e
added login page, updated some forms
Mahdi Yusuf committed revision
6b3da6df96
adding login page
Omar Shammas committed revision
0518f63af8
Updating the create game form, and updating game.html so the owner can delete the game.
Omar Shammas committed revision
6e131a9b21
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
684337fe5b
Adding an owner to a game.
Mahdi Yusuf committed revision
de5691307a
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
7263bad0df
adding email check to form
Mahdi Yusuf committed revision
97a04d6c07
fixed when user rejects authentication
Omar Shammas committed revision
8bf7dc1cc5
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
57e577d7ad
Modified game.html, enabled players to join and leave a game.
Serena Ngai committed revision
11fa9db075
Added default blank states for Profile page.
Serena Ngai committed revision
fabe645017
Profile page complete
Omar Shammas committed revision
27515e28d8
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
284a6bd2e5
Updated the game model, and fixed the create
Serena Ngai committed revision
57e50e5658
Merge branch 'master' of github.com:myusuf3/courtside
Serena Ngai committed revision
c93348be59
Single game page
Mahdi Yusuf committed revision
892195628d
get for main page; unique email addresses
Mahdi Yusuf committed revision
8d6a3830cc
fixing the gravatar image for regular sign up
Mahdi Yusuf committed revision
15ea6a5457
adding fixtures
Mahdi Yusuf committed revision
046fd54b01
fixing confusion between forms
Omar Shammas committed revision
b7c25d7b6e
Added google maps the home page
Omar Shammas committed revision
bdb3b7680c
Adding the create html page
Omar Shammas committed revision
bb7b5922ad
Adding the game model, and the form to create a game
Mahdi Yusuf committed revision
30df4056de
adding new view
Mahdi Yusuf committed revision
f7fec7711c
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
1cd9b1b08e
adding user registration straight up
Serena Ngai committed revision
c2b3956703
Finished styling for home page. Add all icons to static directory.
Mahdi Yusuf committed revision
59f5b8586d
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
3bd77a0ed5
adding fully completed twitter and facebook logins
Mahdi Yusuf committed revision
55b5cef255
fixed fb account completion
Mahdi Yusuf committed revision
931326640e
added twiter form completion
Omar Shammas committed revision
21f047ba05
Removing debug statement
Omar Shammas committed revision
73a9e74336
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
33d6445316
Any search is biased towards your current location.
Mahdi Yusuf committed revision
13dccf45b0
fixing merger issue
Mahdi Yusuf committed revision
902e448d31
adding forms optional and not required fields
Omar Shammas committed revision
280fc57d04
Removing duplicate script from index.html
Omar Shammas committed revision
54e70cc202
Added google maps to the home page, geolocation, and search
Omar Shammas committed revision
17543bf540
Updated settings with the new app
Omar Shammas committed revision
1547bc2700
Adding a game app, and moved the static files to this app
Omar Shammas committed revision
0901c21b10
Updating the urls
Omar Shammas committed revision
f4922a8112
Now django can serve static files
Omar Shammas committed revision
edaa4b1fb6
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
e60ade0194
Can get a user's gravatar based on their email address
Serena Ngai committed revision
e4c6c20c4f
Created and added logo. Start laying out the grid.
Mahdi Yusuf committed revision
ec6bdab030
adding static and files
Mahdi Yusuf committed revision
d7c608a7be
removing merge conflict line
Mahdi Yusuf committed revision
e8c55c55a8
fixing merge conflict
Mahdi Yusuf committed revision
4db29e0004
finished twitter sign up; to be done get other user data
Serena Ngai committed revision
47b0157e98
Use 960 grid and HTML5 Boilerplate
Serena Ngai committed revision
9d85c5e57e
Use 960.gs and HTML5 Boilerplate
Omar Shammas committed revision
0403b2cbfb
Merge branch 'master' of github.com:myusuf3/courtside
Omar Shammas committed revision
d373cb8bfc
Added facebook authentication.
Mahdi Yusuf committed revision
03b4e27860
removing the last files
Mahdi Yusuf committed revision
d1234348e5
removing *.pyc
Mahdi Yusuf committed revision
15190f0656
commit pyc files
Mahdi Yusuf committed revision
92b50f07a2
another thing
Mahdi Yusuf committed revision
a34a53d1a1
adding admin again
Mahdi Yusuf committed revision
3b7fa555de
index.html go go
Mahdi Yusuf committed revision
f70618ddde
removing all of them for sure
Mahdi Yusuf committed revision
68df13be7f
Merge branch 'master' of github.com:myusuf3/courtside
Mahdi Yusuf committed revision
9d7f1e5dab
removing all *.pyc
Omar Shammas committed revision
491178cc16
Added the models to the register app
Mahdi Yusuf committed revision
5faa794fa8
adding admin
Mahdi Yusuf committed revision
38de86fa65
updating settings with local db
Mahdi Yusuf committed revision
b53a0f0127
adding register app
Mahdi Yusuf committed revision
c2b5d05170
creating dirs and updating settings.py
Mahdi Yusuf committed revision
2f4c5804d4
renaming app to register
Mahdi Yusuf committed revision
4ec377ba9b
wrong location of .gitignore durr
Mahdi Yusuf committed revision
0aaa93fc24
adding .gitignore and stuff
Mahdi Yusuf committed revision
af6104a15a
adding requirements
Mahdi Yusuf committed revision
0d41e0d461
adding readme programmers love readmes
Mahdi Yusuf committed revision
468493d95a
first commit of courtside
Serena Ngai serenangai
Mahdi Yusuf myusuf3
Omar Shammas omarshammas