From 541f25ad3dd1535cb6fa67ccba9813dceb715632 Mon Sep 17 00:00:00 2001 From: Gnieark Date: Fri, 10 Jun 2016 09:27:30 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index f7cd127..7f47aee 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,7 @@ It's a website for programming AI challenges. Everyone can read a game's specifi # Still in dev - The stable website (Using github API, Vhost is synchronized to branch master) is [https://botsarena.tinad.fr/](https://botsarena.tinad.fr/) -- Dev [http://botsarena-dev.tinad.fr/](http://botsarena-dev.tinad.fr/) (synchronized on this repo 's dev branch), can show messages like "parse error","Internal server error" etc... -To do: -- English translation -- Develop others arenas (thinking about Connect Four, tron, and maybe one day chess) -- Fixes -- Show bot's description -- Page for bot's owners (manage description url etc...) +- Dev [http://botsarena-dev.tinad.fr/](http://botsarena-dev.tinad.fr/) (identifiant: plop password: plip) (synchronized on this repo 's dev branch),As it's a dev version you can show messages like "parse error","Internal server error" etc... # Contribute You are welcome, Make pull requests on branch dev. Im available on twitter [@gnieark](https://twitter.com/gnieark) in order to talk. From d6428fdab03f3aba29e4a3ed76676fb9175eb034 Mon Sep 17 00:00:00 2001 From: Gnieark Date: Sat, 11 Jun 2016 21:55:46 +0200 Subject: [PATCH 2/2] Makefile should close https://github.com/gnieark/botsArena/issues/54 because phpmailer wasn't pushed on prod vhost --- Makefile | 6 ++++++ src/PHPMailer | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..cf42e84 --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +.PHONY:update +update: + git submodule init + git submodule update + git submodule foreach git reset --hard + git submodule foreach git pull origin master diff --git a/src/PHPMailer b/src/PHPMailer index 7c8b786..1d85f9e 160000 --- a/src/PHPMailer +++ b/src/PHPMailer @@ -1 +1 @@ -Subproject commit 7c8b786228bb9e1561ff60a2d6f7f6ce91be6fee +Subproject commit 1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a