| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/piernov' into alexichi | alexichi | 2016-04-25 | 1 | -5/+17 |
| |\ | | | | | | | | | | | Conflicts: craftmine.php index.xhtml | ||||
| | * | Display error received from server + switch to specified tab on load | piernov | 2016-04-24 | 1 | -0/+2 |
| | | | |||||
| | * | Add client side JS shop functions | piernov | 2016-04-24 | 1 | -3/+4 |
| | | | |||||
| | * | 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 |
| | | | |||||
| * | | Merge branch 'master' of piernov.org:candybox into alexichi | alexichi | 2016-04-25 | 1 | -12/+15 |
| |\| | | | | | | | | | Conflicts: js/craftmine.js | ||||
| | * | Fix Mine setup/update | piernov | 2016-04-23 | 1 | -7/+10 |
| | | | |||||
| | * | Spelling mistake: datas→data | piernov | 2016-04-23 | 1 | -11/+11 |
| | | | |||||
| * | | nothing special | alexichi | 2016-04-24 | 1 | -2/+2 |
| |/ | |||||
| * | mise du parseInt et mise à jour mots anglais | alexichi | 2016-04-21 | 1 | -0/+51 |
| | | |||||
| * | Add empty JS | alexichi | 2016-04-20 | 1 | -0/+0 |
 |
index : candybox | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |