 Shadow
|
9105f360f0
|
Update version.php
|
2014-03-10 09:52:00 +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
|
cdc84e1ffd
|
Update editServerSet.tpl
|
2014-03-10 08:59:12 +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
|
7cfb7c006a
|
Merge branch 'patch-12' of https://github.com/sempoi/TravianZ into sempoi-patch-12
|
2014-03-10 08:31:00 +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
|
b94e054bdd
|
Merge pull request #134 from sempoi/patch-22
Update mapscroll2.tpl
|
2014-03-10 08:29:48 +02:00 |
|
|
Shadow
|
d91f503e26
|
Merge pull request #133 from sempoi/patch-21
Update mapscroll.tpl
|
2014-03-10 08:29:43 +02:00 |
|
|
Shadow
|
82d2324f21
|
Merge pull request #118 from sempoi/patch-6
Update process.php
|
2014-03-10 08:29:05 +02:00 |
|
|
Shadow
|
e169081611
|
Merge pull request #117 from sempoi/patch-5
Update constant_format.tpl
|
2014-03-10 08:28:49 +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
|
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 |
|
|
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
|
9b3abe87e3
|
Merge pull request #132 from sempoi/patch-20
Update editServerSet.tpl
|
2014-03-10 08:27:23 +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
|
37d4d564c9
|
Update mapscroll2.tpl
|
2014-03-08 20:24:03 +08:00 |
|
|
sempoi
|
c52ec838a3
|
Update mapscroll.tpl
|
2014-03-08 20:21:20 +08:00 |
|
|
sempoi
|
00aae86239
|
Update editServerSet.tpl
|
2014-03-08 19:45:49 +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
|
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 |
|
|
sempoi
|
157e209a85
|
Update process.php
|
2014-03-08 15:50:53 +08:00 |
|
|
sempoi
|
6ba2da8da7
|
Update constant_format.tpl
|
2014-03-08 15:47:47 +08:00 |
|
|
sempoi
|
0e6b45d605
|
Update constant_format.tpl
|
2014-03-08 15:46:15 +08:00 |
|
|
Shadow
|
9c4ffbf024
|
Merge pull request #113 from sempoi/patch-2
Update db_MYSQL.php
|
2014-03-07 15:14:24 +02:00 |
|
|
sempoi
|
49e2be568d
|
Update db_MYSQL.php
|
2014-03-07 20:47:25 +08:00 |
|