xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-28 16:44:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,608 Commits 20 Branches 6 Tags
d26fba6d00a5fc90bfaf49d05bc6ffbd747381d5
Commit Graph

143 Commits

Author SHA1 Message Date
Tomas Kasparek ec18bd788c fix PHP Fatal error: Cannot redeclare class Generator on PHP 5.5 
PHP 5.5 STL introdouced class Generator and PHP interpret thinks we want to redeclare it -> rename Generator class to something else
 2015-07-08 13:35:20 +02:00
Shadow 3dd66f6e9b translate fix 2015-06-22 11:29:40 +03:00
Shadow 2bec69c295 fix mh 2014-12-20 19:43:15 +02:00
Shadow 2bf923020d Resetting Game Server 2014-12-02 09:32:11 +02:00
Shadow ce308e2e9c Resetting Game Server 2014-12-02 09:31:51 +02:00
Shadow e215031011 Resetting Game Server 2014-12-02 09:29:01 +02:00
Shadow 4f1d04e864 Update admin.php 2014-12-02 09:28:08 +02:00
Shadow b781d1f6d1 Update playeradditionalinfo.tpl 2014-11-25 13:58:45 +02:00
Shadow 6deedfc8d7 Update deletion.tpl 2014-10-29 14:27:29 +02:00
Shadow ee29c5bb7f Merge pull request #143 from sempoi/patch-31 
Update addUsers.tpl
 2014-03-24 07:26:02 +02:00
Shadow 7a0470a30d Merge pull request #142 from sempoi/patch-30 
Update village.tpl
 2014-03-24 07:25:51 +02:00
Shadow 170f365897 Merge pull request #141 from sempoi/patch-29 
Update addABTroops.tpl
 2014-03-24 07:25:41 +02:00
Shadow bf50e409b8 Merge pull request #140 from sempoi/patch-28 
Update admin.php
 2014-03-24 07:25:33 +02:00
Shadow 1c92b54ea2 Merge pull request #139 from sempoi/patch-27 
Update addTroops.tpl
 2014-03-24 07:25:24 +02:00
Shadow 07225f37f6 Merge pull request #137 from sempoi/patch-25 
Update editAdditional.tpl
 2014-03-24 07:24:50 +02:00
sempoi d7ad354896 Update addUsers.tpl 2014-03-21 20:56:22 +08:00
sempoi 4ed53da25f Update village.tpl 2014-03-21 20:21:15 +08:00
Shadow d2f10a83ec Update function.php 2014-03-21 11:38:35 +02:00
sempoi acff77cda5 Update addABTroops.tpl 2014-03-19 00:12:35 +08:00
sempoi 4190c0081d Update admin.php 2014-03-19 00:08:50 +08:00
sempoi 0811b7341b Update addTroops.tpl 2014-03-19 00:06:19 +08:00
sempoi c51ee0755e Update editAdditional.tpl 2014-03-18 23:54:46 +08:00
Shadow 7cfa82a18d hero update 2014-03-18 07:35:37 +02:00
Shadow 61322c2fc2 Update addUsers.tpl 2014-03-11 11:36:08 +02:00
Shadow 7e11659ea2 Update config.tpl 2014-03-11 11:35:20 +02:00
Shadow c084e99771 Update editServerSet.tpl 2014-03-11 11:33:49 +02:00
Shadow b24a424a61 Update editServerSet.tpl 2014-03-10 09:16:24 +02:00
Shadow a01e0f618e Update config.tpl 2014-03-10 09:16:14 +02:00
Shadow 22638039cb Update config.tpl 2014-03-10 09:01:37 +02:00
Shadow c73b8d1e84 Update editServerSet.tpl 2014-03-10 08:50:37 +02:00
Shadow d9e9a82200 fix 2014-03-10 08:42:13 +02:00
Shadow 15c6bb2fea Merge branch 'master' of https://github.com/Shadowss/TravianZ 
Conflicts:
	Admin/Templates/config.tpl
	Admin/Templates/editServerSet.tpl
 2014-03-10 08:39:06 +02:00
Shadow c848e87fb7 update 2014-03-10 08:36:48 +02:00
Shadow 900e1bc338 Merge pull request #120 from sempoi/patch-8 
Update editAdminInfo.tpl
 2014-03-10 08:28:31 +02:00
Shadow 5d89926d6d Merge pull request #121 from sempoi/patch-9 
Update editExtraSet.tpl
 2014-03-10 08:28:26 +02:00
Shadow 21a1ccd1be Merge pull request #122 from sempoi/patch-10 
Update editLogSet.tpl
 2014-03-10 08:28:21 +02:00
Shadow 8e1ac52907 Merge pull request #123 from sempoi/patch-11 
Update editNewsboxSet.tpl
 2014-03-10 08:28:17 +02:00
Shadow 304cd46e8e Merge pull request #125 from sempoi/patch-13 
Update config.tpl
 2014-03-10 08:28:10 +02:00
sempoi 00aae86239 Update editServerSet.tpl 2014-03-08 19:45:49 +08:00
sempoi d731218b33 Update config.tpl 2014-03-08 16:04:34 +08:00
sempoi 9f7de2e60c Update editServerSet.tpl 2014-03-08 16:01:30 +08:00
sempoi c7173aa084 Update editNewsboxSet.tpl 2014-03-08 15:57:43 +08:00
sempoi 3562807643 Update editLogSet.tpl 2014-03-08 15:56:39 +08:00
sempoi bd7ae0d74c Update editExtraSet.tpl 2014-03-08 15:55:47 +08:00
sempoi b0d88601af Update editAdminInfo.tpl 2014-03-08 15:54:46 +08:00
Shadow a54eb1ff91 reports 2014-03-06 08:58:27 +02:00
Shadow ddb54bceff Update village.tpl 2014-03-06 07:30:35 +02:00
Shadow cca7f5f1b4 credits 2014-03-05 09:01:50 +02:00
armando1980 de0e9d4bbd report for admin 
need foldert notice
not upload the folder as notice

I try to do
 2014-03-04 19:00:45 -05:00
Shadow 1108059ea0 update 2014-03-04 13:52:13 +02:00