|
|
6d8f696af6
|
Merge pull request #45 from gnieark/master
master to dev
|
2015-12-27 18:10:34 +01:00 |
|
|
|
217dd0a4d0
|
Merge pull request #44 from jcolfej/dev
Add in .gitignore and translate ...
|
2015-12-27 18:04:11 +01:00 |
|
Jordann
|
5c119412e4
|
Translate EN for tictactoe docs
|
2015-12-27 17:30:10 +01:00 |
|
Jordann
|
b0d725c0ea
|
Translate EN for Battleship docs
|
2015-12-27 16:53:58 +01:00 |
|
Jordann
|
3402eb93e3
|
Update to remove TMP file for Windows, Mac, ...
|
2015-12-27 16:53:34 +01:00 |
|
|
|
ad33503cc0
|
edit bots
|
2015-12-27 16:50:10 +01:00 |
|
|
|
448fb767a8
|
Merge pull request #43 from gnieark/dev
translation
|
2015-12-27 14:04:14 +01:00 |
|
|
|
c35b12c375
|
Merge pull request #42 from jcolfej/dev
Add EN translation
|
2015-12-27 14:01:44 +01:00 |
|
Jordann
|
20d703b2dc
|
Add translation
|
2015-12-27 13:53:12 +01:00 |
|
|
|
f12207546e
|
edit bots
|
2015-12-27 13:03:45 +01:00 |
|
|
|
a64bbd22fe
|
home
|
2015-12-27 12:57:16 +01:00 |
|
|
|
05b919cca8
|
Merge pull request #41 from gnieark/dev
users bot's description
|
2015-12-26 22:11:48 +01:00 |
|
|
|
6960365485
|
fix scores
|
2015-12-26 22:08:09 +01:00 |
|
|
|
6c01de8fc8
|
php fix parse error
|
2015-12-26 22:06:15 +01:00 |
|
|
|
eb7652416c
|
php fix parse error
|
2015-12-26 22:05:07 +01:00 |
|
|
|
8bbff1c216
|
bots description page
|
2015-12-26 22:04:27 +01:00 |
|
|
|
7ddce64fc7
|
bots description page
|
2015-12-26 21:59:05 +01:00 |
|
|
|
86337d9169
|
Merge pull request #40 from gnieark/dev
dev / master links
|
2015-12-26 19:42:13 +01:00 |
|
|
|
4999ba0eae
|
css
|
2015-12-26 19:41:13 +01:00 |
|
|
|
1660a87282
|
dev and master
|
2015-12-26 19:35:11 +01:00 |
|
|
|
1709021e73
|
Merge pull request #39 from gnieark/dev
Dev
|
2015-12-26 14:47:57 +01:00 |
|
|
|
673daee66a
|
Merge branch 'dev' of github.com:gnieark/botsArena into dev
|
2015-12-26 14:45:40 +01:00 |
|
|
|
f60e17a83d
|
remove htaccess debug mode (will be setup on apache configuration for the dev vhost)
|
2015-12-26 14:45:24 +01:00 |
|
|
|
8cd2ae071f
|
Merge pull request #38 from gnieark/master
<->
|
2015-12-26 14:40:45 +01:00 |
|
|
|
f715642ae3
|
Merge pull request #37 from gnieark/dev
Update README.md
|
2015-12-26 12:29:46 +01:00 |
|
|
|
cf863f79c7
|
Update README.md
|
2015-12-26 12:29:02 +01:00 |
|
|
|
4b091fd8cc
|
Merge branch 'dev' of github.com:gnieark/botsArena into dev
|
2015-12-25 20:40:59 +01:00 |
|
|
|
802bc799f1
|
readme
|
2015-12-25 20:40:47 +01:00 |
|
|
|
a8fc0ac7ff
|
Update README.md
|
2015-12-25 20:40:05 +01:00 |
|
|
|
6f618b5574
|
Merge pull request #36 from gnieark/dev
Dev
|
2015-12-25 20:37:36 +01:00 |
|
|
|
814937937c
|
Merge pull request #35 from gnieark/dev
Dev
|
2015-12-25 20:27:10 +01:00 |
|
|
|
059f268d76
|
install.sql
|
2015-12-25 20:26:35 +01:00 |
|
|
|
2487af0df8
|
Merge pull request #34 from gnieark/master
<->
|
2015-12-25 20:23:22 +01:00 |
|
|
|
8c00535ebd
|
Merge branch 'master' of github.com:gnieark/botsArena
Conflicts:
install.sql
|
2015-12-25 20:21:30 +01:00 |
|
|
|
0a4b65082c
|
git push origin masterMerge branch 'dev'
|
2015-12-25 20:13:45 +01:00 |
|
|
|
014a83dd5b
|
install.sql
|
2015-12-25 19:53:49 +01:00 |
|
|
|
f4f3a1f5e4
|
Merge pull request #32 from CamTosh/patch-1
Delete merge fail
|
2015-12-25 19:41:47 +01:00 |
|
Tosh Camille
|
9a2412351d
|
Delete merge fail
|
2015-12-25 19:21:55 +01:00 |
|
|
|
628ed50cea
|
plop
|
2015-12-25 19:17:48 +01:00 |
|
|
|
43cebbd6f5
|
legals
|
2015-12-25 19:14:45 +01:00 |
|
|
|
2481e88356
|
readme
|
2015-12-25 18:51:12 +01:00 |
|
|
|
d59249252f
|
readme
|
2015-12-25 18:48:32 +01:00 |
|
|
|
da01e620fb
|
Merge pull request #31 from gnieark/dev
readme
|
2015-12-25 18:46:26 +01:00 |
|
|
|
c38794c1df
|
Merge pull request #30 from gnieark/dev
readme
|
2015-12-25 18:43:51 +01:00 |
|
|
|
a970943af5
|
Merge pull request #29 from gnieark/dev
css limit gif size, + responsive
|
2015-12-25 01:17:35 +01:00 |
|
|
|
84d43edef4
|
css limit gif size, + responsive
|
2015-12-25 01:16:31 +01:00 |
|
|
|
0cc23fd85e
|
Merge pull request #28 from gnieark/dev
animation
|
2015-12-24 18:29:29 +01:00 |
|
|
|
79da420534
|
animation
|
2015-12-24 16:32:50 +01:00 |
|
|
|
0715852675
|
Merge pull request #27 from gnieark/dev
Dev
|
2015-12-24 16:05:47 +01:00 |
|
|
|
e8c2343373
|
animation
|
2015-12-24 16:00:59 +01:00 |
|
