Commit Graph

688 Commits

Author SHA1 Message Date
Shadow e641d9e9d4 vacation mode but i will disable it just implemented but will be disabled 2014-03-12 08:40:59 +02:00
Shadow 743a19326c Merge pull request #136 from sempoi/patch-24
Update Database.php
2014-03-10 08:30:18 +02:00
Shadow 2e39afb951 Merge pull request #135 from sempoi/patch-23
Update Session.php
2014-03-10 08:30:01 +02:00
Shadow 2b76df286d Merge pull request #116 from sempoi/patch-4
Update constant_format.tpl
2014-03-10 08:28:44 +02:00
Shadow 80e8205058 Merge pull request #126 from sempoi/patch-14
Update editAdminInfo.php
2014-03-10 08:28:05 +02:00
Shadow 7c91ab364b Merge pull request #130 from sempoi/patch-18
Update editLogSet.php
2014-03-10 08:27:52 +02:00
Shadow 9316a32e5f Merge pull request #128 from sempoi/patch-16
Update editNewsboxSet.php
2014-03-10 08:27:47 +02:00
Shadow 0e0f08c0b7 Merge pull request #129 from sempoi/patch-17
Update editExtraSet.php
2014-03-10 08:27:42 +02:00
Shadow 87e83f498c Merge pull request #131 from sempoi/patch-19
Update editServerSet.php
2014-03-10 08:27:34 +02:00
Shadow 69389645ea quest update 2014-03-10 08:07:16 +02:00
sempoi 1fa26378cd Update Database.php 2014-03-08 20:33:13 +08:00
sempoi 3cd3ac31a4 Update Session.php 2014-03-08 20:31:45 +08:00
sempoi 0626ef20d5 Update editServerSet.php 2014-03-08 16:17:15 +08:00
sempoi 541853b7dd Update editLogSet.php 2014-03-08 16:15:55 +08:00
sempoi 9689ccb2c1 Update editExtraSet.php 2014-03-08 16:14:23 +08:00
sempoi 70809fa641 Update editNewsboxSet.php 2014-03-08 16:13:20 +08:00
sempoi c78d610980 Update editAdminInfo.php 2014-03-08 16:09:57 +08:00
sempoi 0e6b45d605 Update constant_format.tpl 2014-03-08 15:46:15 +08:00
sempoi 49e2be568d Update db_MYSQL.php 2014-03-07 20:47:25 +08:00
Shadow 3cb2ce2782 Update en.php 2014-03-07 07:31:10 +02:00
Shadow ff68e792b7 Update editBuildings.php 2014-03-06 07:38:14 +02:00
Shadow 6718e429b5 Update function.php 2014-03-06 07:36:22 +02:00
Shadow fa52446234 Update database.php 2014-03-06 07:33:26 +02:00
Shadow cca7f5f1b4 credits 2014-03-05 09:01:50 +02:00
Shadow 2b02c0aadf Merge branch 'master' of https://github.com/Shadowss/TravianZ
Conflicts:
	Admin/Templates/village.tpl
2014-03-04 13:47:54 +02:00
Shadow 19767cf6a6 update admin panel 2014-03-04 12:44:25 +02:00
Shadow 66b15135fe Update Session.php 2014-03-04 08:22:58 +02:00
Shadow 77d49433f4 update 2014-03-03 09:57:40 +02:00
Shadow 19b89d433c quest update 2014-03-03 09:53:56 +02:00
Shadow 5fb572f93e Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-26 07:38:23 +02:00
Shadow 923b4b3e18 updates admin 2014-02-26 07:38:09 +02:00
Shadow 841632b3fc Update Profile.php 2014-02-26 07:32:05 +02:00
Shadow 6c94bb2a8b Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-21 15:29:45 +02:00
Shadow 48264ad2db update 2014-02-21 15:29:41 +02:00
Shadow 1e46ecc77c Update Battle.php 2014-02-19 07:37:37 +02:00
Shadow 06af170c47 Update Units.php 2014-02-18 08:26:33 +02:00
Shadow 102d42e731 Merge pull request #95 from armando1980/patch-41
fix lang rally point ok by: Armando
2014-02-17 08:42:24 +02:00
Shadow 57ce864b4d Merge pull request #94 from armando1980/patch-40
fix lang rally point ok by: Armando
2014-02-17 08:41:53 +02:00
Shadow fe94e6325e Merge pull request #93 from armando1980/patch-39
fix lang rally point ok by: Armando
2014-02-17 08:41:45 +02:00
Shadow 0b114cf444 Merge pull request #92 from armando1980/patch-38
fix lang rally point ok by: Armando
2014-02-17 08:41:07 +02:00
Shadow 8e1bec2160 Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-17 08:12:10 +02:00
Shadow 0231274907 lang update 2014-02-17 08:11:54 +02:00
armando1980 636ef7c372 fix lang rally point ok by: Armando 2014-02-16 18:33:47 -05:00
armando1980 f46e71d775 fix lang rally point ok by: Armando 2014-02-16 18:33:30 -05:00
armando1980 d5ea4fdbe5 fix lang rally point ok by: Armando 2014-02-16 18:19:37 -05:00
armando1980 9e135efcb5 fix lang rally point ok by: Armando 2014-02-16 18:15:00 -05:00
Shadow 1996e5df42 Update Building.php 2014-02-16 09:01:00 +02:00
Shadow ef45f955c4 Update Automation.php 2014-02-14 11:41:51 +02:00
Shadow 6996bd7d31 Update Battle.php 2014-02-14 11:30:19 +02:00
Shadow 64b32ed26a Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-13 08:05:22 +02:00