Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update #469

Merged
merged 584 commits into from
Apr 6, 2014
Merged

Update #469

merged 584 commits into from
Apr 6, 2014

Conversation

Shadowss
Copy link
Contributor

@Shadowss Shadowss commented Mar 3, 2014

No description provided.

armando1980 and others added 30 commits January 23, 2014 22:49
@armando1980
fix lang ok by: Armando
4dbd34b
@armando1980
fix lang ok by: Armando
20f1680
@armando1980
fix lang ok by: Armando
e95fb89
@armando1980
fix alliance rank Attacker and defender Armando
69eb265
@armando1980
fix alliance rank Attacker Armando
ffefd6d
@armando1980
fix alliance rank defender Armando
988f3c8
@Shadowss
Merge pull request #58 from armando1980/patch-19
043e102 
Adding Artefact and plan  by: Armando
@Shadowss
Merge pull request #59 from armando1980/patch-18
224dd4d 
Adding Artefact and plan  by: Armando
@Shadowss
Merge pull request #60 from armando1980/patch-17
aa070b6 
Adding Artefact and plan  by: Armando
@Shadowss
Merge pull request #61 from armando1980/patch-16
0e45cbb 
Adding Artefact and plan  by: Armando
@Shadowss
Merge pull request #62 from armando1980/patch-20
02d25db 
fix lang ok by: Armando
@Shadowss
Merge pull request #64 from armando1980/patch-22
8512820 
fix lang ok by: Armando
@Shadowss
Merge pull request #63 from armando1980/patch-21
72d8c95 
fix lang ok by: Armando
@Shadowss
Merge pull request #66 from armando1980/patch-24
542395e 
fix alliance rank Attacker and defender Armando
@Shadowss
Merge pull request #67 from armando1980/patch-25
e3b232e 
fix alliance rank Attacker Armando
@Shadowss
Merge pull request #68 from armando1980/patch-26
924d0a5 
fix alliance rank defender Armando
@Shadowss
Merge pull request #65 from armando1980/patch-23
ff2fee5 
fix lang ok by: Armando
@Shadowss
Update vilview.tpl
9b222a6
@Shadowss
Update vilview.tpl
9336155
@armando1980
fix correct population in oasis
03bf6f1 
you need install for work correctly
@armando1980
add option Spanish by Armando
3da80bc
@KFCSpike
Task 4 - Billions is a bit optimistic
2482a28
@KFCSpike
Task6 - Tweak completion message
178e58a
@KFCSpike
Task 6 uses SERVER_NAME when referencing the menu choice when complet…
4f9436e 
…ed - changing left menu to also use SERVER_NAME and moving the plus link above the Game Rules link
@KFCSpike
Task 7 - Tweak response when completed
1681f07
@KFCSpike
Task9 - Use SERVER_NAME instead of Travian
e8d8489
@KFCSpike
Task9 - Use SERVER_NAME instead of Travian, tweak message, and don't …
f792db7 
…say extend all resource tiles to 1 as this is said in order
@KFCSpike
Task10 - Beginners Protection might not be days so tweak the message
ee95966
@KFCSpike
Task11 - Tweak messages
fff0c8e
@KFCSpike
Task12 - Tweak message to correctly show server name
5fb25fd
Shadowss and others added 28 commits March 12, 2014 13:55
@Shadowss
Update medal.php
2bfa7d3
@Shadowss
Update profile.tpl
9258cab
@Shadowss
Update profile.tpl
feac499
@Shadowss
Update medal.php
267380f
@Shadowss
Update medal.php
9c111ab
@Shadowss
Update medal.php
9731d1a
@Shadowss
credit
23f8978
@Shadowss
install update
6e62f22
@Shadowss
hero update
7cfa82a
@Shadowss
Update function.php
d626660
@Shadowss
Update function.php
1a06675
@sempoi
Update editAdditional.tpl
c51ee07
@sempoi
Update medal.php
4b6401a
@sempoi
Update addTroops.tpl
0811b73
@sempoi
Update admin.php
4190c00
@sempoi
Update addABTroops.tpl
acff77c
@Shadowss
Update function.php
d2f10a8
@sempoi
Update village.tpl
4ed53da
@sempoi
Update addUsers.tpl
d7ad354
@Shadowss
Merge pull request #137 from sempoi/patch-25
07225f3 
Update editAdditional.tpl
@Shadowss
Merge pull request #138 from sempoi/patch-26
6863d65 
Update medal.php
@Shadowss
Merge pull request #139 from sempoi/patch-27
1c92b54 
Update addTroops.tpl
@Shadowss
Merge pull request #140 from sempoi/patch-28
bf50e40 
Update admin.php
@Shadowss
Merge pull request #141 from sempoi/patch-29
170f365 
Update addABTroops.tpl
@Shadowss
Merge pull request #142 from sempoi/patch-30
7a0470a 
Update village.tpl
@Shadowss
Merge pull request #143 from sempoi/patch-31
ee29c5b 
Update addUsers.tpl
@Shadowss
Update addUsers.php
cae32d6
@Shadowss
Update Battle.php
2926e6b
yi12345 added a commit that referenced this pull request Apr 6, 2014
@yi12345
Merge pull request #469 from Shadowss/master
8161792 
Update
@yi12345 yi12345 merged commit 8161792 into yi12345:master Apr 6, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Shadowss @eliopinho @yi12345 @armando1980 @KFCSpike @sempoi