Commit Graph

Select branches

Hide Pull Requests

bugfix/matches-transactions

develop

feature/account-deletion

feature/admin-platform

feature/api-admin-user-endpoint

feature/api-adminstats-transactions

feature/api-stats

feature/bestof-series-interface

feature/coin-purchase

feature/matches-api-endpoints

feature/websockets-game-continue

fix/single-player

fix/websocket-errors

hot-fix/fixing-games-history

hotfix/websockets

init

master

na/change-project-base

na/comment-removal

na/fix-histories

na/matches-home-page

#1

#100

#101

#102

#103

#104

#2

#3

#57

#58

#59

#60

#61

#62

#68

#69

#70

#71

#72

#73

#74

#75

#76

#77

#78

#82

#83

#84

#85

#86

#87

#88

#89

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• 1299becf9a Merge pull request 'hotfix/websockets' (#104) from hotfix/websockets into master master AfonsoCMSousa 2026-01-03 18:05:41 +00:00
• 13205c6e80 fix: rm .env files hotfix/websockets FernandoJVideira 2026-01-03 17:57:04 +00:00
• 2cd1d53616 fix: prod ready websockets FernandoJVideira 2026-01-03 17:55:45 +00:00
• 5b504d10bd merge FernandoJVideira 2026-01-03 17:22:09 +00:00
• 5ea8c0df23 Merge pull request 'fixing game history, leaderboard, stats and removing more comments' (#103) from hot-fix/fixing-games-history into master FernandoJVideira 2026-01-03 17:08:27 +00:00
• b6845ee0ea fixing game history and removing comments hot-fix/fixing-games-history Edd 2026-01-03 16:59:14 +00:00
• 3ba3487f81 Merge pull request 'Version 1.0' (#102) from develop into master FernandoJVideira 2026-01-03 14:49:00 +00:00
• 55399ab06a Merge pull request 'removed comments' (#101) from na/comment-removal into develop develop FernandoJVideira 2026-01-03 14:46:58 +00:00
• f7328d59eb removed comments na/comment-removal KZix 2026-01-03 14:45:14 +00:00
• b046a85806 Merge pull request 'fix/single-player' (#100) from fix/single-player into develop FernandoJVideira 2026-01-03 14:26:49 +00:00
• a3da9af90d hotfix: Singler player now plays fine fix/single-player AfonsoCMSousa 2026-01-03 14:02:58 +00:00
• 83832aaaa9 hotfix: Finnal fix AfonsoCMSousa 2026-01-03 14:01:38 +00:00
• 4cfab79611 Merge pull request 'feature/bestof-series-interface' (#99) from feature/bestof-series-interface into develop FernandoJVideira 2026-01-03 13:26:18 +00:00
• 00cb5ba966 SyntaxSquad/DADProject#16 fix: merge conflics fixed feature/bestof-series-interface AfonsoCMSousa 2026-01-03 13:25:21 +00:00
• ceba5178f3 SyntaxSquad/DADProject#16 fix: i forgot this AfonsoCMSousa 2026-01-03 13:14:59 +00:00
• 0fb64ff30c SyntaxSquad/DADProject#16 feat: MATCHES AND STUFF AfonsoCMSousa 2026-01-03 13:14:37 +00:00
• e0ca8e51a6 SyntaxSquad/DADProject#16 feat: Can now start matches, just missing the actuall gameplay AfonsoCMSousa 2026-01-03 04:52:02 +00:00
• cd25915d92 Merge pull request 'fix:admin & user match table sort' (#98) from fix/frontend-admin-match-sort into develop FernandoJVideira 2026-01-03 02:35:07 +00:00
• bcfa5c06f7 fix:user profile match table sort FernandoJVideira 2026-01-03 02:33:22 +00:00
• 3dcd8df4c7 SyntaxSquad/DADProject#16 fix: Cancle and Return is working and some other fixes involving game duration AfonsoCMSousa 2026-01-03 02:19:00 +00:00
• 46e3f0eef6 fix:admin match table sort FernandoJVideira 2026-01-03 02:11:41 +00:00
• 7e6766c726 SyntaxSquad/DADProject#16 merge: fix merge conflics AfonsoCMSousa 2026-01-03 00:53:51 +00:00
• 1088749386 SyntaxSquad/DADProject#16 fix: Surrender if leave AfonsoCMSousa 2026-01-03 00:51:42 +00:00
• 52cb893bd0 Merge pull request 'Added matches scrollable to home page' (#96) from na/matches-home-page into develop KZix 2026-01-03 00:43:38 +00:00
• 59fea64df5 Merge branch 'develop' into na/matches-home-page na/matches-home-page Edd 2026-01-03 00:43:07 +00:00
• a09639abcf Merge pull request 'feature/frontend-add-match-profile-tabs' (#97) from feature/frontend-add-match-profile-tabs into develop Edd 2026-01-03 00:43:03 +00:00
• 2d2d0149d8 little date adjustements Edd 2026-01-03 00:42:04 +00:00
• 894a38bb27 Added corrections to user profile and admin match and game history KZix 2026-01-03 00:41:24 +00:00
• 432d3c0b88 Added matches scrollable to home page Edd 2026-01-03 00:39:08 +00:00
• 1a7916a836 Added list for games and matches in the user profile KZix 2026-01-03 00:06:26 +00:00
• 030b00059e Merge pull request 'feature/websockets-matches' (#95) from feature/websockets-matches into develop Edd 2026-01-02 22:23:20 +00:00
• a804f41956 Final touches KZix 2026-01-02 22:11:47 +00:00
• 25d21f7cf8 Merge branch 'develop' into feature/websockets-matches KZix 2026-01-02 21:47:30 +00:00
• c3f8c3fff0 Matches almost done still refining KZix 2026-01-02 21:45:37 +00:00
• 23d0ea1343 SyntaxSquad/DADProject#16 fix: Timer issues and Forfeight button AfonsoCMSousa 2026-01-02 20:12:18 +00:00
• 1dc2d25a41 Merge pull request 'feature/multiplayer-game-interface' (#94) from feature/multiplayer-game-interface into develop KZix 2026-01-02 19:18:04 +00:00
• 7c8fdd6ea2 SyntaxSquad/DADProject#15 fix: Merge Conflicts Fixed. AfonsoCMSousa 2026-01-02 19:12:35 +00:00
• 5e90de812b SyntaxSquad/DADProject#15 feat: Added Multiplayer View and Stuff AfonsoCMSousa 2026-01-02 19:07:27 +00:00
• ee28333da8 Merge pull request 'Admin platform, with users, transactions, games and admin creation' (#93) from feature/admin-platform into develop AfonsoCMSousa 2026-01-02 16:20:26 +00:00
• e89b60c844 Admin platform, with users, transactions, games and admin creation feature/admin-platform Edd 2026-01-02 16:17:55 +00:00
• b9df0a4d4a Merge pull request 'fix:websocket errors & polict change' (#92) from fix/websocket-errors into develop AfonsoCMSousa 2026-01-02 14:29:39 +00:00
• 3a7b1b9794 fix:websocket errors & polict change fix/websocket-errors FernandoJVideira 2026-01-02 14:26:54 +00:00
• 5880960c42 Merge remote-tracking branch 'origin/develop' into feature/multiplayer-game-interface AfonsoCMSousa 2026-01-02 13:34:53 +00:00
• ef277a3cfd Merge pull request 'Issues Websockets #48 #49 #51 e #54' (#91) from feature/websockets-game-continue into develop AfonsoCMSousa 2026-01-02 13:33:21 +00:00
• e23ca3d1ff Issues Websockets #48 #49 #51 e #54 feature/websockets-game-continue KZix 2026-01-02 13:24:20 +00:00
• e84dd993af SyntaxSquad/DADProject#15 feat: Initial Idea AfonsoCMSousa 2026-01-02 00:39:39 +00:00
• bcdf542606 Merge pull request 'Created statistics personal and general' (#90) from feature/statistics into develop FernandoJVideira 2026-01-01 12:34:40 +00:00
• 16f8d3bdfc Created statistics personal and general Edd 2025-12-31 23:57:54 +00:00
• 45d8aa0035 Merge pull request 'Implemented coin purchase-flow' (#89) from feature/coin-purchase into develop AfonsoCMSousa 2025-12-31 22:41:09 +00:00
• c0af76abd3 Implemented coin purchase-flow feature/coin-purchase Edd 2025-12-31 18:28:29 +00:00
• ff16a57a97 Merge pull request 'Bugfix: Added api logic with transactions when match is finished, started and joined' (#88) from bugfix/matches-transactions into develop FernandoJVideira 2025-12-31 15:54:20 +00:00
• cf238d5451 Added api logic with transactions when match is finished, started and joined bugfix/matches-transactions KZix 2025-12-31 15:48:24 +00:00
• 50ae1b7f1f Merge pull request 'Added endpoint to create tranasactions' (#87) from feature/api-coinpurchase into develop Edd 2025-12-31 11:07:11 +00:00
• 5975208877 Added endpoint to create tranasactions KZix 2025-12-31 01:13:27 +00:00
• f3e8ffc400 Merge pull request 'matches and transactions history fully operational' (#86) from na/fix-histories into develop KZix 2025-12-31 00:31:59 +00:00
• 1b03558f93 matches and transactions history fully operational na/fix-histories Edd 2025-12-31 00:16:14 +00:00
• 881a60a388 Merge pull request 'feature/api-adminstats-transactions' (#85) from feature/api-adminstats-transactions into develop AfonsoCMSousa 2025-12-30 19:24:49 +00:00
• cf3ca26382 removed comments on code feature/api-adminstats-transactions KZix 2025-12-30 19:17:49 +00:00
• 58e6615876 Merge branch 'develop' into feature/api-adminstats-transactions KZix 2025-12-30 19:02:09 +00:00
• 9bfa06b1ce Added endpoint to get authenticated user's transactions KZix 2025-12-30 19:01:02 +00:00
• 2a438dce26 Merge pull request 'feat: api users change password endpoint' (#84) from feature/api-update-password into develop Edd 2025-12-30 17:17:06 +00:00
• f38f08923f Added transaction details for the logged user KZix 2025-12-30 16:13:46 +00:00
• 5f845b2ba7 Added routes, admin statistics to the controller and added models for coin transaction and coin transaction type KZix 2025-12-30 16:08:53 +00:00
• 54b4fc7cb1 feat: api users change password endpoint FernandoJVideira 2025-12-30 10:55:46 +00:00
• 3d23627433 Merge pull request 'register, coin balance, game history and transactions mockup' (#83) from na/history-and-register into develop KZix 2025-12-30 10:24:15 +00:00
• 4f391e3638 histories are a little messed, will change the logic in the future (techdebt) Edd 2025-12-30 01:49:39 +00:00
• c456c9482f Merge pull request 'feature/api-stats' (#82) from feature/api-stats into develop FernandoJVideira 2025-12-29 19:08:47 +00:00
• 754a227608 Merge branch 'develop' into feature/api-stats feature/api-stats KZix 2025-12-29 19:07:38 +00:00
• 83f92e670d Merge pull request 'feature/api-admin-policies' (#78) from feature/api-admin-policies into develop KZix 2025-12-29 17:11:15 +00:00
• 59df3e2d37 Added protection to Nickname and added user get coins endpoint KZix 2025-12-29 15:59:25 +00:00
• 39f55a12c0 Adde routes for statistics KZix 2025-12-29 15:40:23 +00:00
• edecef3af8 added StatisticsController.php and changed the User.php model and ProfileController.php that were missing some imports KZix 2025-12-29 15:34:56 +00:00
• 51f745a3dd Merge branch 'develop' into feature/api-admin-policies FernandoJVideira 2025-12-29 14:53:44 +00:00
• 4b311c74eb fix: added missing route FernandoJVideira 2025-12-29 14:47:32 +00:00
• 0ecdc30bd4 fix: removed .env FernandoJVideira 2025-12-29 11:11:53 +00:00
• 25c819c6e4 feat: api admin user and game policies FernandoJVideira 2025-12-29 11:09:11 +00:00
• f60b25f29b chore: stop tracking package-lock.json KZixandFernandoJVideira 2025-12-28 16:54:01 +00:00
• 52887fc2eb SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 added packagelock.json to gitignore KZixandFernandoJVideira 2025-12-28 16:45:23 +00:00
• c4078d9b82 SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 added sockets for game joining and card play KZixandFernandoJVideira 2025-12-28 16:34:51 +00:00
• d29e44c61c Added dummy user to create a game KZixandFernandoJVideira 2025-12-28 16:30:18 +00:00
• 8f7102b335 SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 Added initial setup for websockets KZixandFernandoJVideira 2025-12-27 19:52:46 +00:00
• a34027889f remove package-lock EddandFernandoJVideira 2025-12-25 01:51:47 +00:00
• 87e0dc2518 home page feature final EddandFernandoJVideira 2025-12-25 01:49:02 +00:00
• 79be3544cb SyntaxSquad/DADProject#14 missed one file KZixandFernandoJVideira 2025-12-24 16:02:03 +00:00
• eafb4a4d1c SyntaxSquad/DADProject#14 added surrender button KZixandFernandoJVideira 2025-12-24 16:00:53 +00:00
• 08c20acdf4 SyntaxSquad/DADProject#14 Added final touches to the gameplay KZixandFernandoJVideira 2025-12-24 15:48:16 +00:00
• ab231ee94f SyntaxSquad/DADProject#14 fixed routes KZixandFernandoJVideira 2025-12-23 22:02:40 +00:00
• ceb3d735ad SyntaxSquad/DADProject#14 Bot works and play works, still has some bugs KZixandFernandoJVideira 2025-12-23 21:52:09 +00:00
• 5924d08f73 SyntaxSquad/DADProject#14 added start logic for bot KZixandFernandoJVideira 2025-12-23 20:08:19 +00:00
• 3ec6f8971c SyntaxSquad/DADProject#14 added protection to logout inside a game and going to another page KZixandFernandoJVideira 2025-12-23 19:43:57 +00:00
• e68f1357cc Added game start for single player, 3 and 9 card game types and protected the pages for only logged in players KZixandFernandoJVideira 2025-12-23 00:18:34 +00:00
• cfda949ea6 feat: gameboard ui FernandoJVideira 2025-12-20 17:03:18 +00:00
• c68cda350e home page feature part 1 EddandFernandoJVideira 2025-12-21 23:12:13 +00:00
• b7daa4610b tmp: pc change FernandoJVideira 2025-12-29 09:43:25 +00:00
• 329bbcc1d3 Merge pull request 'feature/initial_gameplay_websockets' (#77) from feature/initial_gameplay_websockets into develop FernandoJVideira 2025-12-28 18:05:52 +00:00
• b35cac3b2c chore: stop tracking package-lock.json KZix 2025-12-28 16:54:01 +00:00
• b5c3c552da SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 added packagelock.json to gitignore KZix 2025-12-28 16:45:23 +00:00
• 14dd4b3a4e SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 added sockets for game joining and card play KZix 2025-12-28 16:34:51 +00:00
• 0d0f7569a6 Added dummy user to create a game KZix 2025-12-28 16:30:18 +00:00
• 09c4732e19 SyntaxSquad/DADProject#46 SyntaxSquad/DADProject#47 Added initial setup for websockets KZix 2025-12-27 19:52:46 +00:00