Commit graph

448 commits

Author SHA1 Message Date
AVMG20 b8741b8e10 Merge remote-tracking branch 'origin/development' into development 2021-12-14 19:17:52 +01:00
AVMG20 505bf7b6fa added translation manager 2021-12-14 19:17:44 +01:00
Dennis d7a26c1e17
Merge pull request #329 from 1day2die/localization
Fix shop page
2021-12-14 19:04:50 +01:00
1day2die 9ac3a86129 Fix shop page 2021-12-14 19:03:40 +01:00
Dennis 64d8283799
Merge pull request #327 from 1day2die/localization
Localization and multilanguage Support (German included)
2021-12-14 18:45:31 +01:00
1Day d9b9eb369e fix spaces 2021-12-14 16:08:51 +01:00
Dennis d572a603d3
Merge branch 'development' into localization 2021-12-14 16:06:45 +01:00
1Day 82ce13fcbd resolve conflicts 2021-12-14 16:05:27 +01:00
1Day 720622ae02 Fixed Datatables 2021-12-14 15:47:17 +01:00
1Day 47b7402db8 fix column 2021-12-14 15:24:53 +01:00
Dennis 42ec17b873
Merge pull request #317 from IceToast/fix_products_column_naming
fix: 🚑️ swapped nodes/eggs column naming -> now correct order
2021-12-14 15:22:36 +01:00
1Day 2e29c3e084 German Laravel default 2021-12-14 09:00:38 +01:00
1Day 8c2c943b2b added english translation for reference 2021-12-14 07:59:14 +01:00
IceToast fdd0f2131a style: 💄 fixed code formatting 2021-12-14 00:38:45 +01:00
1day2die e2328cb328 Translate Datatables 2021-12-13 22:39:40 +01:00
1Day ae67bd9a42 fix vouchers 2021-12-13 16:27:56 +01:00
1Day f54bed1c4a notification translations 2021-12-13 15:46:04 +01:00
1Day 60ad5fcd6b update localization file 2021-12-13 14:22:34 +01:00
1Day 1b6e059c99 removed multilines 2021-12-13 13:29:18 +01:00
1Day 3411418d15 Updated for invoices 2021-12-13 13:28:37 +01:00
1Day ad31f2a49f fixes 2021-12-13 11:48:47 +01:00
1Day 7ef8fdff4e guess im done? 2021-12-13 11:47:35 +01:00
1Day 6bc01d5ae6 All blade files 2021-12-13 11:14:42 +01:00
1Day 1a1223424a quicksafe 2021-12-13 10:42:22 +01:00
1Day 70828b6d48 fully translateable backend 2021-12-13 10:12:32 +01:00
1Day 88eafb72c5 quicksave 2021-12-13 08:59:27 +01:00
1Day 24ee173326 saving progress 2021-12-13 08:42:53 +01:00
Dennis ca38fce1af
Merge branch 'ControlPanel-gg:main' into localization 2021-12-06 17:16:48 +01:00
1day2die 9644fe0fe2 first steps 2021-12-06 17:11:48 +01:00
AVMG 9f85b05a5e
Merge pull request #321 from 1day2die/hotfix_decimals_paypal
HOTFIX: Error when calculating price+tax has 3 decimals
2021-12-02 18:18:06 +01:00
1Day fcef2c6b7c Update PaypalProduct.php 2021-12-02 12:06:02 +01:00
IceToast 38f1273d2d fix: 🚑️ swapped nodes/eggs column naming -> now correct order 2021-11-29 09:24:18 +01:00
AVMG 74e26ca042
Merge pull request #306 from ControlPanel-gg/development
update version number
2021-11-18 19:26:17 +01:00
AVMG20 bd6cec92ea update version number 2021-11-18 19:25:57 +01:00
AVMG 3a67fa892c
Merge pull request #305 from ControlPanel-gg/development
Increased api limits
Re-sync bug
2021-11-18 19:25:02 +01:00
AVMG 5103dad5a9
Merge pull request #304 from ControlPanel-gg/discord_link
Re-sync bug
2021-11-18 19:22:46 +01:00
AVMG20 836784be48 Re-sync bug 2021-11-18 19:22:09 +01:00
AVMG f79cb42936
Merge pull request #292 from ControlPanel-gg/ptero_api_limits_increase
increased the limit of most api request to pterodacttyl
2021-11-13 11:57:31 +01:00
AVMG20 fe6da0ee15 increased the limit of most api request to pterodacttyl 2021-11-13 11:56:34 +01:00
AVMG 47037dcf51
Merge pull request #287 from ControlPanel-gg/development
hotfix, create page node not properly updating with multiple locations
2021-11-13 00:17:19 +01:00
AVMG20 251614c507 hotfix, create page node not properly updating with multiple locations 2021-11-12 23:16:59 +01:00
AVMG 0c51471e5d
Merge pull request #285 from ControlPanel-gg/development
Development
2021-11-12 22:24:42 +01:00
AVMG20 47c251e48d removed out of credits info 2021-11-12 20:59:33 +01:00
AVMG 77729992ef
Merge pull request #284 from ControlPanel-gg/product_cloning_minimum_credits_bug
cloning minimum credits fixed
2021-11-12 21:42:45 +01:00
AVMG a0155a22eb
Merge pull request #283 from ControlPanel-gg/product_linking
oops
2021-11-12 21:27:11 +01:00
AVMG fccf0a19b0
Merge pull request #282 from ControlPanel-gg/product_linking
fixed the most annoying bug where the pre-selected node id was incorrect
2021-11-12 21:24:32 +01:00
AVMG c93cf6166a
Merge pull request #281 from ControlPanel-gg/product_linking
fixed product disabled not working properly
2021-11-12 21:02:22 +01:00
AVMG20 d15a9dabdb cloning minimum credits fixed 2021-11-12 20:42:12 +01:00
AVMG20 6bad46e4e7 oops 2021-11-12 20:26:39 +01:00
AVMG20 d7f1cf4c3a fixed the most annoying bug where the pre-selected node id was incorrect 2021-11-12 20:21:50 +01:00