774 Commits

Author SHA1 Message Date
slawkens
ec38a79235 feature: mail confirmed reward
Suggested by @EPuncker

# Conflicts:
#	system/hooks.php
2023-02-03 16:41:36 +01:00
slawkens
7e62bd74a3 Fix admin logout 2023-02-03 13:00:49 +01:00
slawkens
6c5215a8ed block access to some files 2023-02-03 12:52:41 +01:00
slawkens
63d2c5c6b5 Add redirect_from && redirect_to to router options
+ Also add * for all methods shortcut
2023-02-03 12:18:35 +01:00
slawkens
7d38945e8d Add missing var 2023-02-03 12:16:25 +01:00
slawkens
53732005aa This code wasn't used 2023-02-03 12:16:02 +01:00
slawkens
c4a5cae988 Delete accountmanagement.php 2023-02-03 12:15:43 +01:00
slawkens
69a92fb859 fix logout hook 2 2023-02-03 12:15:33 +01:00
slawkens
9fadba7d07 Move mass_* pages to correct folder 2023-02-03 12:14:36 +01:00
slawkens
11768424a3 Merge branch 'develop' into feature/new-router
# Conflicts:
#	composer.json
#	system/login.php
2023-02-03 07:31:39 +01:00
slawkens
feffdd1837 fix logout hook 2023-02-02 20:52:16 +01:00
slawkens
979532d3df Display warning if file included by hook does not exist 2023-02-02 20:51:55 +01:00
slawkens
74d013049d Made so it's possible to configure more directories as constants
More flexibility for the user.
2023-02-02 18:53:56 +01:00
slawkens
8c801dddec PHP 8.1 compatibility 2023-02-02 16:16:06 +01:00
slawkens
9de8145f82 TineMCE refactoring
Unified all tinyMCE instances used across AAC, now they are initiated in one single file
+ added option to upload images within editor (CTRL-C CTRL-V)
+ there is new folder: user/, which will be used for all user generated data, like image uploads, guild images, etc.
2023-02-02 15:41:33 +01:00
slawkens
77460b0832 Revert "Fix compatibility with PHP 8.1"
This reverts commit 1d1e927d56302e6d21cb51203eee7ad43b89b38d.
2023-02-02 15:39:20 +01:00
slawkens
1d1e927d56 Fix compatibility with PHP 8.1 2023-02-02 11:17:48 +01:00
slawkens
036abf83e5 Change GoogleReCAPTCHA.php to require_once
because conflicts with account_create_auto_login
2023-02-01 22:58:31 +01:00
slawkens
e737cf612c fix recaptcha v2-checkbox & v3 2023-02-01 22:54:35 +01:00
Gabriel Pedro
9560494ab0
feat: mounts load from xml (#211) 2023-01-19 20:47:00 +01:00
Gabriel Pedro
8aac3ec2e5
fix: add missing $use_datatable (#210)
* fix: datatables

* fix: datatables
2022-12-07 08:37:35 +01:00
Gabriel Pedro
269ca501f1
feat: mass account tool, mass teleport tool (#209)
* feat: mass account coins, premdays, points. mass teleport town, position

* fix: tab
2022-12-01 08:34:30 +01:00
slawkens
07887423c6 Merge branch 'develop' into feature/new-router 2022-11-28 21:42:47 +01:00
slawkens
35928fe576 small fixes 2022-11-28 21:37:38 +01:00
slawkens
60f64e21d8 Rewriting the router v2
To be more flexible
2022-11-28 21:37:25 +01:00
Gabriel Pedro
20638f430a
feat: add hook admin menu (#208)
* feat: add hook admin menu

* fix: removing menu sort

* feat: menu order property

* fix: menu order value

* feat: add main menu order
2022-11-28 18:05:08 +01:00
slawkens
8af786902d Add some error box to error 2022-11-28 16:42:01 +01:00
slawkens
ba04536169 $db->select: make $where parameter optional, allows to get all records 2022-11-28 15:53:14 +01:00
slawkens
2eb9f4d284 Move pages 2022-11-28 13:17:49 +01:00
slawkens
cdc06056c8 Merge branch 'develop' into feature/new-router 2022-11-28 13:14:09 +01:00
slawkens
44a6400fcf protect this from direct execution 2022-11-28 12:52:03 +01:00
slawkens
847c3db625 Update templates.header.html.twig 2022-11-28 12:49:30 +01:00
slawkens
f30181d485 Merge branch 'develop' into feature/recaptcha-v3-plus-login 2022-11-28 12:46:32 +01:00
slawkens
118e8c487e Fixes for racaptcha 2022-11-28 12:41:29 +01:00
slawkens
c73e476e88 Reverted support only for recaptcha v3
v2 & v3 are now both supported
2022-11-28 12:36:23 +01:00
slawkens
ac5b864ea9 Small fixes 2022-11-28 12:26:34 +01:00
slawkens
1be1bc9178 fix premium_ends_at for tfs 1.3+ 2022-11-07 09:11:57 +01:00
slawkens
2321cf84b0 patch changes & fixes from master branch
remove VERSION file
update rules
add 33 migration
add get_version_for_release.sh script
update schema
add use_character_sample_skills
2022-11-07 09:10:19 +01:00
slawkens
48d561ac6f Merge branch 'develop' into feature/new-router 2022-10-28 17:33:22 +02:00
slawkens
616b8eb61a some not-important changes 2022-10-28 17:16:17 +02:00
slawkens
e1d486c8c8 Add vocation into getTopPlayers 2022-10-28 14:41:59 +02:00
slawkens
b841c9f631 Fix typo in br locale 2022-10-28 14:41:43 +02:00
slawkens
e6c72efd18 Add more client versions 2022-10-28 14:41:28 +02:00
slawkens
9693fd260c Update account.change_mail.html.twig 2022-10-28 14:41:14 +02:00
slawkens
731755f05a Merge branch 'develop' into feature/new-router 2022-09-27 13:02:47 +02:00
slawkens
717b5fdd15 Add compat Gesior classes
To allow more custom pages be used with myaac
2022-09-27 10:06:03 +02:00
slawkens
32cf487128
Feature/recaptcha v3 plus login (#202)
* [WIP] New GoogleReCAPTCHA code
Support for v3
v2-invisible doesn't work yet

* Add some notice about recaptchas versions

* Lets support only ReCaptcha v3

Too much mess ;)

* Fixes
2022-08-31 11:16:48 +02:00
slawkens
a9941dea8a Fixes 2022-08-29 19:04:47 +02:00
slawkens
5c9737f281 Merge branch 'develop' into feature/recaptcha-v3-plus-login 2022-08-28 18:28:10 +02:00
slawkens
87a98531d9 Lets support only ReCaptcha v3
Too much mess ;)
2022-08-28 18:13:34 +02:00