candybox - [no description]

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add sendInfo() from PHPfeat/messages	piernov	2016-04-27	1	-2/+10
\|
*	Merge remote-tracking branch 'origin/alexichi' into piernov	piernov	2016-04-25	13	-77/+66
\|\
\| *	change class of Hire a Miner, and change type submit to button for items	alexichi	2016-04-25	2	-2/+2
\| \|
\| *	Mise en commun du shop et de la guilde	alexichi	2016-04-25	6	-34/+30
\| \|
\| *	Merge remote-tracking branch 'origin/piernov' into alexichi	alexichi	2016-04-25	22	-1636/+417
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: craftmine.php index.xhtml
\| * \|	remove useless files and add .gitignore to not see them again	alexichi	2016-04-25	3	-71/+1
\| \| \|
\| * \|	Add the guild	alexichi	2016-04-25	3	-20/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add buttons to hireMiner and purchase the guild on xhtml javascript send request to the server php -> update $_SESSION for miner
\| * \|	Merge branch 'master' of piernov.org:candybox into alexichi	alexichi	2016-04-25	2	-15/+19
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/craftmine.js
\| * \| \|	nothing special	alexichi	2016-04-24	1	-2/+2
\| \| \| \|
\| * \| \|	nothing special	alexichi	2016-04-24	1	-2/+2
\| \| \| \|
\| * \| \|	add file for the guild ,client side (not finish)	alexichi	2016-04-23	1	-0/+18
\| \| \| \|
\| * \| \|	add file for server side	alexichi	2016-04-23	1	-0/+29
\| \| \| \|
\| * \| \|	add 2 buttons for createGuild and hireMiner	alexichi	2016-04-23	1	-2/+7
\| \| \| \|
\| * \| \|	add require_once and some cases of the switch	alexichi	2016-04-23	1	-0/+3
\| \| \| \|
* \| \| \|	Add Symbola font for items icons	piernov	2016-04-25	2	-0/+6
\| \| \| \|
* \| \| \|	Merge branch 'feat/shop' into piernov	piernov	2016-04-25	1	-1/+0
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Account already debitedfeat/shop	piernov	2016-04-25	1	-1/+0
\| \| \| \|
* \| \| \|	Merge branch 'feat/shop' into piernov	piernov	2016-04-24	1	-0/+1
\|\\| \| \|
\| * \| \|	Include PHP inc/craftmine.php	piernov	2016-04-24	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'doc' into piernov	piernov	2016-04-24	8	-1601/+46
\|\ \ \ \
\| * \| \| \|	Update Proposition initiale	piernov	2016-04-24	8	-1601/+46
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'feat/shop' into piernov	piernov	2016-04-24	13	-15/+370
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Add css/craftmine.css	piernov	2016-04-24	1	-0/+9
\| \| \| \|
\| * \| \|	Rewrote index.xhtml: GUI rework	piernov	2016-04-24	1	-6/+72
\| \| \| \|
\| * \| \|	Display error received from server + switch to specified tab on load	piernov	2016-04-24	1	-0/+2
\| \| \| \|
\| * \| \|	Add JS GUI helpers	piernov	2016-04-24	1	-0/+42
\| \| \| \|
\| * \| \|	Add client side JS shop functions	piernov	2016-04-24	2	-3/+61
\| \| \| \|
\| * \| \|	Decode JSON before calling callback and prevent call in case of error	piernov	2016-04-24	1	-3/+7
\| \| \| \|
\| * \| \|	Add JS debitAccount() helper	piernov	2016-04-24	1	-0/+5
\| \| \| \|
\| * \| \|	Send gold, shop and inventory infos from PHP all at once when requested on ↵	piernov	2016-04-24	3	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	loading by client
\| * \| \|	json_encode() PHP gold amount sent to client	piernov	2016-04-24	1	-1/+1
\| \| \| \|
\| * \| \|	Move session_start() after all requires (needed for classes to work ↵	piernov	2016-04-24	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	correctly in $_SESSION)
\| * \| \|	Add shop related PHP request handling	piernov	2016-04-24	1	-0/+4
\| \| \| \|
\| * \| \|	Add PHP shop requests handlers	piernov	2016-04-24	1	-0/+59
\| \| \| \|
\| * \| \|	Add debit/creditAccount() PHP account management helpers	piernov	2016-04-24	1	-0/+18
\| \| \| \|
\| * \| \|	Add PHP Inventory class	piernov	2016-04-24	1	-0/+41
\| \| \| \|
\| * \| \|	Add PHP Item class	piernov	2016-04-24	1	-0/+17
\| \| \| \|
\| * \| \|	Add sendError() PHP error message helper	piernov	2016-04-24	1	-0/+15
\| \|/ /
* / /	Add .htaccess for using index.xhtml as DirectoryIndex	piernov	2016-04-24	1	-0/+1
\|/ /
* \|	Fix Mine setup/update	piernov	2016-04-23	2	-11/+15
\| \|
* \|	Spelling mistake: datas→data	piernov	2016-04-23	1	-11/+11
\|/
*	Add Proposition initiale document	piernov	2016-04-21	8	-0/+1890
\|
*	mise du parseInt et mise à jour mots anglais	alexichi	2016-04-21	2	-0/+102
\|
*	modification du chemin du fichier js	alexichi	2016-04-21	1	-5/+5
\|
*	suppression d'un case du switch	alexichi	2016-04-21	1	-0/+10
\|
*	Mise à jour des mots en anglais	alexichi	2016-04-21	2	-0/+40
\| \| \| \|	suppression de la méthode update mine
*	Update index.xhtml	alexichi	2016-04-20	1	-4/+13
\|
*	Add main PHP script	alexichi	2016-04-20	1	-0/+29
\|
*	Add empty JS	alexichi	2016-04-20	1	-0/+0
\|
*	Add Bootstrap CSS	alexichi	2016-04-20	1	-0/+11
\|