e-Legion 1 year, 10 months ago
Serge Travin committed revision
0deac3fc0f
[*] Enable settings for setwithme.ep.io
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
73795f751e
Merge branch 'master' of https://github.com/elegion/setwith.me
Conflicts:
setwithme/settings.py
setwithme/static/css/base.css
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
0654d7fb92
[+] new game layout
e-Legion 1 year, 10 months ago
Serge Travin committed revision
6c68142fa4
[*] Update daemon config
e-Legion 1 year, 10 months ago
Serge Travin committed revision
4acf2992d0
[*] Dumb readme updated
e-Legion 1 year, 10 months ago
Serge Travin committed revision
d8baf52583
[*] Database cache backend
e-Legion 1 year, 10 months ago
Serge Travin committed revision
a170e081ff
[*] Increase timeout
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
104a6fe05f
[-] Layout fixes for chat window
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
e17a641492
[-] new card cache fixed
e-Legion 1 year, 10 months ago
Serge Travin committed revision
0e9fc0f6d2
[*] Comments for Facebook settings
e-Legion 1 year, 10 months ago
Serge Travin committed revision
301fd09279
[+] Clean dead games command
e-Legion 1 year, 10 months ago
Serge Travin committed revision
4340e0b627
[*] pep8
unfinished
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
24e983d195
[+] game status cache
e-Legion 1 year, 10 months ago
Serge Travin committed revision
cedec38455
[+] Correct online users count
e-Legion 1 year, 10 months ago
Serge Travin committed revision
66c97d333e
[+] Clean zombie games management command
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
86138a2a8d
[-] Fixed re-rendering cards
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
bc47ee78cb
[*] SendPutSet sync call
e-Legion 1 year, 10 months ago
Serge Travin committed revision
d5dc715e7e
[*] Fix initial data
e-Legion 1 year, 10 months ago
Serge Travin committed revision
b1c2b2ecc9
[+] Facebook setting for setwithme.ep.io
Commented out at this moment.
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
4384a2b28f
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
f3830c42f6
[*] cool anonymous avatar
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
c05d8cc074
[*] Client penalty timeout added
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
f830009822
[+] Now user can leave the game
e-Legion 1 year, 10 months ago
Serge Travin committed revision
841ca20e0a
[+] Init desk in view and return sets count in status request.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
d063015a7d
[*] Increase check set timeout
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
f4b73e8895
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
bc898b8098
[-] default userpic path
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
9a2f2c51a7
[-] Fixed redirect after Facebook login
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
bed841105c
[-] Binding events to new cards
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
a05222d839
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
56a40c1a0b
[+] logout box markup
e-Legion 1 year, 10 months ago
Serge Travin committed revision
96370a8cdb
Merge branch 'master' of github.com:elegion/setwith.me
e-Legion 1 year, 10 months ago
Serge Travin committed revision
87f6e37ef9
[*] Fix js in safari.
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
5d19a41314
[-] Layout fixes for fx
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
b8664e1026
[+] Fading for additional cards
e-Legion 1 year, 10 months ago
Serge Travin committed revision
99cd7b3fea
Merge branch 'master' of github.com:elegion/setwith.me
e-Legion 1 year, 10 months ago
Serge Travin committed revision
f462379e1d
[*] Fix failures count
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
92f6db9992
[-] Fixed checking detecting time of last action in game
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
9417125dae
[+] Sharing on the winner screen
e-Legion 1 year, 10 months ago
Serge Travin committed revision
e338fc90b8
[+] User profile added.
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
e146b3bba3
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
0af71d2aee
[+] card fadein and out
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
8f28793c90
[*] Restored default values for constants
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
a43d9ec0d5
[+] Adding new cards if user can't find the set
e-Legion 1 year, 10 months ago
Serge Travin committed revision
a7dbe809cb
[*] Remove cards in place when some founds set
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
070dcad00a
[-] Added notification that another user choosing the set now
e-Legion 1 year, 10 months ago
Serge Travin committed revision
a7a77c4da7
[+] Display time left till game starts
e-Legion 1 year, 10 months ago
Serge Travin committed revision
8d677a7a26
[+] Login url in settings
e-Legion 1 year, 10 months ago
Serge Travin committed revision
4f1a7cf630
[*] Fix for join_timeout
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
a9dc28ebbd
[-] Fixed cards layout in fx
e-Legion 1 year, 10 months ago
Serge Travin committed revision
e17418cf5f
[*] Unblock other users on put_set_mark.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
eeaa679d65
[+] Multiplayer support
e-Legion 1 year, 10 months ago
Serge Travin committed revision
b7ed74a079
[+] Setting for set check disabling for debug
e-Legion 1 year, 10 months ago
Serge Travin committed revision
051edebe52
[-] Drop user profile at this moment. Add confirmed field to waiting user
e-Legion 1 year, 10 months ago
Serge Travin committed revision
c27b45fc91
[+] Render real users count and online games
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
b3a72a7db0
[-] Fixed switching game state to normal
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
02ac6e358d
[-] Don't ctop polling if some errors occured
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
aa108c6102
[-] Cosmetic and typo in base.css fixed
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
3ca9be5d49
[+] Players stats
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
d8680ea321
[-] Fixed bug in check_set view
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
0e27dc75e2
[-] Fixed updating UI after status becomes normal
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
2634b6aabb
[-] Cosmetic fixed
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
3de1ceaba1
Merge branch 'master' of https://github.com/elegion/setwith.me
Conflicts:
setwithme/templates/core/index.html
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
90dfe7a014
[+] 50% of normal game flow [+] game states in js
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
f80b7cb60b
[*] Current user disaplyed at the top of users list on game screen
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
ce972dc3a5
[-] Fixed url in winner screen
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
65171a7563
[*] Modified main page layout
e-Legion 1 year, 10 months ago
Serge Travin committed revision
1704e8e59e
[*] Return full user stats in status ('sets_found', 'failures', 'score')
e-Legion 1 year, 10 months ago
Serge Travin committed revision
8ab23e510d
[*] Fix chat message serialization format.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
71197ef219
[+] Chat for game screen.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
863d273d8e
[+] JQuery Form plugin added
e-Legion 1 year, 10 months ago
Serge Travin committed revision
e56261ce6e
[+] Login implementation via Facebook + Anon login
e-Legion 1 year, 10 months ago
Serge Travin committed revision
b49691810a
[+] Prod fb settings
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
5485ddc131
[-] Ugly hack to re-rendering dropped cards
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
bbf72dec1b
[-] small markup bug
e-Legion 1 year, 10 months ago
Serge Travin committed revision
bfd24be7fe
[*] Extract cards number on desk
e-Legion 1 year, 10 months ago
Serge Travin committed revision
da853040db
[*] Verbose results
e-Legion 1 year, 10 months ago
Serge Travin committed revision
c9499bd0c0
[*] Remove print
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
b834504ab1
[-] Some bugs with checking set fixed
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
e7e25baf93
[-] Fixed searching fro checked cards
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
219bc7e89e
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
5c6f090804
[+] finished game status
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
c0f4e25b22
[-] Fixed set checking
e-Legion 1 year, 10 months ago
Serge Travin committed revision
9fb5c736de
[+] Start login implementation
e-Legion 1 year, 10 months ago
Serge Travin committed revision
856611b286
[*] Reset pressed_set state on timeout
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
32dbc60778
[+] throbler on search opponents page
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
2650b3ef6e
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
fa23eccedc
[-] small ui fixes, non highligh unactive cards
e-Legion 1 year, 10 months ago
Serge Travin committed revision
e54bc21402
[+] Implement check set
e-Legion 1 year, 10 months ago
Serge Travin committed revision
25e4741326
[*] Fix remaining cards list
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
381cb84f6d
[-] Fixed sending set to the server
e-Legion 1 year, 10 months ago
Serge Travin committed revision
bae734df0f
[+] Debug request.user info
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
37dc7c3f4a
Merge commit 'eb4abc6be887e7187fd1bf0c7f0e9a12b8d8b711'
Conflicts:
setwithme/settings.py
setwithme/static/css/base.css
setwithme/static/js/base.js
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
eb4abc6be8
[+] server side for game ending
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
0e5e7a02e3
[+] game over, client part
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
103ae9c124
[-] Some cosmetics fixed
e-Legion 1 year, 10 months ago
Serge Travin committed revision
ffefedf82d
[+] Add middleware for csrf token cookie
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
c6327c4e60
[-] Don't re-render users on the game screen unless necessary
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
46cd322b0c
[-] Layout fixes for game screen
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
6c9d6da5ea
[-] Fixed cosmetic
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
5dfe0d3b4f
Merge branch 'master' of github.com:elegion/setwith.me
Conflicts:
setwithme/settings.py
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
57bbb22885
[-] Client-side set checking
e-Legion 1 year, 10 months ago
Serge Travin committed revision
604608a90b
[+] Return first_name + last_name as user name
Rather pretty name for anon
e-Legion 1 year, 10 months ago
Serge Travin committed revision
2c200aa9ca
[*] Prod fb settings in main settings
e-Legion 1 year, 10 months ago
Serge Travin committed revision
5c9e87afd5
[*] Do not override fb user by anon user
e-Legion 1 year, 10 months ago
Serge Travin committed revision
137ffc0f3b
[-] Remove prints
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
2651830b72
[+] not finished running sets on waiting
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
220548ddd8
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Serge Travin committed revision
e862249da8
[*] Sending array of {'id': ..., 'class': ...} in cards field for status request
e-Legion 1 year, 10 months ago
Serge Travin committed revision
fbfd4aad5f
[*] Limit username for anon by 30 digits
e-Legion 1 year, 10 months ago
Serge Travin committed revision
7521affc4b
[+] Error templates
e-Legion 1 year, 10 months ago
Serge Travin committed revision
e120af2695
[*] Re-create migrations
e-Legion 1 year, 10 months ago
Serge Travin committed revision
5ff0f76223
[*] Fix Facebook application settings
e-Legion 1 year, 10 months ago
Serge Travin committed revision
7b04963df6
[+] Prod facebook app settings
e-Legion 1 year, 10 months ago
Serge Travin committed revision
2d25b4cb1e
[+] Facebook and Anon users backends
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
f74b7e140e
[+] set generation, logo change
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
da5b9ef011
[+] google analytics
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
bb9c3fc9c8
[-] fixex after merge
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
4f6919ca29
Merge commit 'c1cb88702ae9151e756fb286d4a9c69b82a1ca4c'
Conflicts:
setwithme/static/css/base.css
setwithme/static/js/base.js
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
8e127c3f90
Merge branch 'master' of https://github.com/elegion/setwith.me
Conflicts:
setwithme/static/css/base.css
setwithme/static/js/base.js
e-Legion 1 year, 10 months ago
Serge Travin committed revision
27cc9af7fe
[*] cards_left fix
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
023329cd2b
[-] User now can't select more than 3 cards
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
5a089e0a11
[*] Disable text selection for cards
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
45cbc6a22f
[R] Refactored SetWithMe.Game
e-Legion 1 year, 10 months ago
Serge Travin committed revision
65d813b4dc
[*] Fix GameSessionState import
e-Legion 1 year, 10 months ago
Serge Travin committed revision
8b8396382a
[*] Add forgotten migration.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
e0003c1e90
[R] Verbose connection and game state fields.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
ab65e990a2
[R] Switch Game model to uuid pk.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
c3544f7a69
[R] Small cleanup.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
9c2cce4313
[R] Move timeout settings to one place.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
4edce395c3
[R] Cleanup code.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
dcfd6e114e
[*] Return remaining cards count in status.
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
7b509b5a5d
[-] Fixed redirect to the game screen
e-Legion 1 year, 10 months ago
Serge Travin committed revision
b92ad790d1
[*] Enable poller
e-Legion 1 year, 10 months ago
Serge Travin committed revision
61538224d7
[*] Fix game start
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
9a02179d65
[-] Fixes for header and footer layout
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
d5332fcb68
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
11419fcc23
[*] game cards layout
e-Legion 1 year, 10 months ago
Serge Travin committed revision
180d0d3028
[+] Redirect to active game from start_game view
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
3b52caea08
Merge commit '23145ea'
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
23145ea33f
[+] show cards in game
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
4ff5bb88ce
[+] show cards in game
e-Legion 1 year, 10 months ago
Serge Travin committed revision
5e8706b250
Merge branch 'master' of github.com:elegion/setwith.me
Conflicts:
setwithme/apps/game/models.py
setwithme/apps/game/views.py
e-Legion 1 year, 10 months ago
Serge Travin committed revision
d4b6385e9d
[+] Return serialized cards in status.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
b14cfbb5d3
[+] Save remaining cards and desk cards
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
b1621eae53
[+] Added admin into INSTALLED_APPS
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
1cd1fcc6bb
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
436d68f937
[+] simple cards shuffle and return in game status
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
d44321830f
[R] Searching for a new game moved into a separate view
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
b5ce6c4a4e
[+] admin activated [-] small fixes in game views
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
6e2a744056
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
f8fcdbb482
[+] converter from Card text to ids
e-Legion 1 year, 10 months ago
Serge Travin committed revision
4dc7b0e4ef
[+] Add migration
e-Legion 1 year, 10 months ago
Serge Travin committed revision
a153fc023b
Merge branch 'master' of github.com:elegion/setwith.me
e-Legion 1 year, 10 months ago
Serge Travin committed revision
cc740c888d
[+] Update game session and return client connection state
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
e31df9d691
[*] Logo links to the main page
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
a95d2cb6f5
[+] Search for new game layout
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
2ef43542f5
[R] Minor refactoring for core view
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
7e8e9e19c9
[-] Removed stub from core
e-Legion 1 year, 10 months ago
Serge Travin committed revision
e8b102c6d1
[+] Dumb put_set and show_set views.
e-Legion 1 year, 10 months ago
Serge Travin committed revision
ef1bdc2aee
[+] Game status json view
e-Legion 1 year, 10 months ago
Serge Travin committed revision
27f7ac8dd8
[*] drop waiting user when game starts
e-Legion 1 year, 10 months ago
Serge Travin committed revision
1097c90b6e
[+] add migration for waiting user
e-Legion 1 year, 10 months ago
Serge Travin committed revision
afd65c910e
[+] Starting new game
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
39535347f1
[+] Poller added
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
d7c6e314de
[+] main markup finished
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
1fcf51f240
[+] mini cards
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
b0955d3ac3
Merge branch 'master' of https://github.com/elegion/setwith.me
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
fc23116456
[+] not finished card layout
e-Legion 1 year, 10 months ago
Serge Travin committed revision
da4eb682a0
[+] Dumb game app
e-Legion 1 year, 10 months ago
Serge Travin committed revision
51924f8c49
[+] annoying added to reqs
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
e5fed306ca
[+] jQuery added
e-Legion 1 year, 10 months ago
Igor Kobylin committed revision
922ca3b809
[*] Make manage.py executable
e-Legion 1 year, 10 months ago
Serge Travin committed revision
c32d04a138
[+] Migration for users
e-Legion 1 year, 10 months ago
Serge Travin committed revision
e0175bc69a
[+] Initial stub users app
e-Legion 1 year, 10 months ago
Anatoliy Larin committed revision
41a593a3a2
[+] base site design
e-Legion 1 year, 10 months ago
Serge Travin committed revision
785cd59781
[+] using sqlite db
e-Legion 1 year, 10 months ago
Serge Travin committed revision
9a7e48b910
[+] stub root view
e-Legion 1 year, 10 months ago
Serge Travin committed revision
3d7975d7fd
[+] base templates
e-Legion 1 year, 10 months ago
Serge Travin committed revision
ae417ac039
[+] root gitigonre
e-Legion 1 year, 10 months ago
Serge Travin committed revision
ca45bf08f4
[+] Stub dirs for client code
e-Legion 1 year, 10 months ago
Serge Travin committed revision
7def09f8e8
[+] Epio initial config
e-Legion 1 year, 10 months ago
Serge Travin committed revision
17f81773ff
[+] Inital structure
Serge Travin grumbler
Anatoliy Larin alarin
Igor Kobylin ikobylin