581 Commits

Author SHA1 Message Date
Stefan A. Brannfjell
8ac0eb8370 Merge pull request #241 from Pwntus/master
Added option to sort by vocation to highscore page. Resolves #93
2016-05-21 17:11:05 +02:00
Pwntus
e65762a96c Indent fix. 2016-05-21 09:05:10 +02:00
Pwntus
eb90646ab6 Fixed tiny bug. 2016-05-21 09:02:09 +02:00
Pwntus
38221b34c8 Added option to sort by vocation to highscore page. 2016-05-21 08:34:27 +02:00
Stefan A. Brannfjell
5f03d514e7 Merge pull request #240 from gpedro/feat/config-lua-parser
feat: getConfigLua added into engine/general
2016-05-17 02:15:34 +02:00
Gabriel Pedro
1cc404faaa feat: getConfigLua added into engine/general 2016-05-14 14:47:40 -04:00
Stefan A. Brannfjell
6c97205e48 Merge pull request #239 from gpedro/fix/issue-214
resolves #214
2016-05-13 20:52:04 +02:00
Gabriel Pedro
4e18cb3c66 resolves #214 2016-05-11 18:32:51 -04:00
Stefan A. Brannfjell
42195da9dc Merge pull request #238 from gpedro/fix/issue-237
resolves #237
2016-05-12 00:19:24 +02:00
Gabriel Pedro
b3413ccee9 resolves #237 2016-05-11 18:18:06 -04:00
Stefan A. Brannfjell
db47690e7f Merge pull request #236 from gpedro/feat/pagseguro
resolves #161
2016-05-06 14:30:44 +02:00
Gabriel Pedro
816801880f fix: sanitizing pagseguro 2016-05-04 20:30:37 -04:00
Stefan A. Brannfjell
fb32e03ead Merge pull request #235 from gpedro/fix/issue-71
resolves #71
2016-05-04 23:59:04 +02:00
Stefan A. Brannfjell
01414350a0 Merge pull request #234 from gpedro/fix/issue-105
resolves #105
2016-05-04 23:54:18 +02:00
Stefan A. Brannfjell
5b432e9cb5 Merge pull request #233 from gpedro/fix/issue-228
resolves #228
2016-05-04 23:53:26 +02:00
Stefan A. Brannfjell
3be32a0c8d Merge pull request #232 from gpedro/fix/issue-168
resolves #168
2016-05-04 23:49:26 +02:00
Stefan A. Brannfjell
2018200561 Merge pull request #231 from gpedro/fix/issue-227
resolves #227
2016-05-04 23:47:53 +02:00
Gabriel Pedro
1804fe0059 fix: missing var, thanks @dalvorsn for testing 2016-05-02 17:30:43 -04:00
Gabriel Pedro
358b16e748 fix: removing comma 2016-05-02 16:27:32 -04:00
Gabriel Pedro
e48ee4854d feat: finishing pagseguro implementation 2016-05-02 13:59:19 -04:00
Gabriel Pedro
ae28021d86 resolves #71 2016-05-02 12:47:30 -04:00
Gabriel Pedro
583001e91d feat: improving pagseguro payment 2016-05-02 04:27:20 -04:00
Gabriel Pedro
2b37cbb4ca resolves #105 2016-05-02 03:46:32 -04:00
Gabriel Pedro
151f8da5c3 resolves #228
updating nicedit for using imgur api v3 and refactoring youtubeButton
2016-05-02 03:02:18 -04:00
Gabriel Pedro
57656b2e2d resolves #168 2016-05-02 01:48:21 -04:00
Gabriel Pedro
c9fd3a0fdb resolves #227 2016-05-02 01:31:19 -04:00
Stefan A. Brannfjell
afee5eab13 Merge pull request #229 from ElGovanni/master
Recovery System
2016-04-19 23:14:12 +02:00
ElGovanni
91d0ffa95c Recovery System
Similar to this original from Tibia.
2016-04-19 20:41:57 +02:00
Stefan A. Brannfjell
dfa6ceaa32 Merge pull request #223 from HalfAway/master
Updated gallery links to Imgland.net's new domain for images.
2015-12-02 21:52:48 +01:00
HalfAway
35bc0f983f Updated gallery links to Imgland.net's new domain for images. 2015-12-02 15:04:33 +01:00
Znote
a23b38090d Slightly better syntax of previous commit. 2015-11-03 20:41:32 +01:00
Znote
a29f3e93f5 Hide select town field when creating a new character if there is only one town to select. 2015-11-03 20:21:10 +01:00
Znote
b4b3843abc Showing flags in highscores.php is optional in config.php 2015-10-24 16:57:48 +02:00
Stefan A. Brannfjell
857814b447 Merge pull request #220 from forgee/fix_#205
Fix #205 special/database2znoteaac.php
2015-10-24 16:17:59 +02:00
Stefan A. Brannfjell
de5c6a231d Merge pull request #221 from forgee/fix_#216
Partial fix for #216
2015-10-23 19:51:23 +02:00
Martin Nylind
ab117b203b Add elapsedTime in connect.php
Ensure that connect.php always has function elapsedTime available.
2015-10-23 10:56:14 +02:00
Martin Nylind
01b8b50110 Partial fix for #216
Users can change their flag in the account settings.
2015-10-22 20:03:21 +02:00
Martin Nylind
fff61ef79d Fix #205 special/database2znoteaac.php
Conversion of old accounts works with TFS_10. Should work with TFS_02 and TFS_03 too but untested.
2015-10-22 17:46:07 +02:00
Stefan A. Brannfjell
ab2f40df72 Merge pull request #212 from triath/patch-1
Fix bug in deleting characters from myaccount.php
2015-08-19 23:48:35 +02:00
triath
e37ab046bd Use id in query instead of character_name 2015-08-19 18:19:31 +02:00
triath
74f8c0bbfa Fix bug in deleting characters from myaccount.php
The bug was that if you had multiple characters pending for deletion for different dates this query would set all pending characters as done even if they weren't deleted and they would therefore be prevented from being deleted or cancelled.
2015-08-19 17:28:58 +02:00
Stefan A. Brannfjell
40a23dd18b Merge pull request #211 from att3/master
Fix paygol IPN by adding the missing functions (sanitize, getValue)
2015-08-19 15:01:55 +02:00
Atte
52ae81233d Fix paygol IPN by adding the missing functions (sanitize, getValue)
Now it will also check if the serviceID in config.php is the same as it is in paygol. Because, it is possible to do 'fake' payments at paygol, by just changing the report URL, to report url on any other OT (assuming we know the file name) and thus it will pass the IP check, because the request is coming from paygol.
2015-08-18 16:24:19 +03:00
Stefan A. Brannfjell
9a1f08a5d1 Merge pull request #209 from triath/dont-show-empty-pages-in-highscore
Don't display options for empty pages in highscores
2015-08-17 02:23:27 +02:00
Stefan A. Brannfjell
8ac1b51fff Merge pull request #207 from Tandloze/master
[Znote 1.5] Flags by Raggaer reworked
2015-08-17 02:22:31 +02:00
Tandloze
651b62686c Fixed some things
Added $config to enable or disable country flags its on false by
default.
Also some advice from Znote for securing integer database values.
Cleanedup some if statements.
2015-08-15 23:24:44 +02:00
Triath
5c6fcb7673 There is no need to display options that would lead to empty pages.
This will display options for actual pages (if actual rows is less than config) or maximum rows / rowsPerPage from config whichever is less.

I did this for my site, thought I would share it if you want it. Please enter the commit message for your changes. Lines starting
2015-08-15 18:36:22 +02:00
Stefan A. Brannfjell
8e4d44fe4c Merge pull request #208 from triath/use-protect_page()-in-helpdesk.php
Use standard function protect_page() in helpdesk.php
2015-08-15 16:22:25 +02:00
triath
583840679c Use standard function protect_page() in helpdesk.php
To be consistent I think we should use the standard function protect_page() instead of a custom if statement in helpdesk.php so its the behaviour is the same as in other places.
2015-08-15 14:50:25 +02:00
Tandloze
a2b241b6c1 Dont show comment if there is none to show. 2015-08-14 21:45:25 +02:00