arthur/artdanj-api
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/artdanj-api.git synced 2026-01-14 12:14:33 +01:00
Code Issues 2 Packages Projects Releases Wiki Activity

[PR #3] [MERGED] Merge dev into Master #5

New Issue
Closed
opened 2025-12-01 17:03:59 +01:00 by arthur · 0 comments
arthur commented 2025-12-01 17:03:59 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ArthurDanjou/artdanj-api/pull/3
Author: @ArthurDanjou
Created: 11/10/2021
Status: ✅ Merged
Merged: 11/10/2021
Merged by: @ArthurDanjou

Base: master ← Head: dev

📝 Commits (10+)

📊 Changes

167 files changed (+9522 additions, -5895 deletions)

View changed files

📝 .adonisrc.json (+6 -4)
📝 .dockerignore (+1 -0)
📝 .editorconfig (+0 -0)
📝 .env.example (+13 -15)
➕ .eslintignore (+3 -0)
➕ .eslintrc (+3 -0)
📝 .gitignore (+108 -7)
➖ .idea/.gitignore (+0 -5)
➖ .idea/artapi.iml (+0 -12)
➖ .idea/codeStyles/codeStyleConfig.xml (+0 -5)
➖ .idea/modules.xml (+0 -8)
➖ .idea/vcs.xml (+0 -6)
📝 Dockerfile (+5 -9)
📝 LICENSE (+0 -0)
📝 README.md (+3 -3)
📝 ace (+0 -0)
📝 ace-manifest.json (+40 -4)
➕ app/Controllers/Http/AnnouncesController.ts (+36 -0)
📝 app/Controllers/Http/AuthController.ts (+34 -118)
➕ app/Controllers/Http/ExperiencesController.ts (+57 -0)

...and 80 more files

📄 Description

No description provided

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ArthurDanjou/artdanj-api/pull/3 **Author:** [@ArthurDanjou](https://github.com/ArthurDanjou) **Created:** 11/10/2021 **Status:** ✅ Merged **Merged:** 11/10/2021 **Merged by:** [@ArthurDanjou](https://github.com/ArthurDanjou) **Base:** `master` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`dc4919f`](https://github.com/ArthurDanjou/artdanj-api/commit/dc4919fcd17afbbc8fa28a8f43fb709913787b71) Working on new features - [`0f7a29d`](https://github.com/ArthurDanjou/artdanj-api/commit/0f7a29d195c43ad35474ac8237e72192c40f89f7) Working on new features - [`1605721`](https://github.com/ArthurDanjou/artdanj-api/commit/1605721b571f20f01a5c28c488a797ef08c2366a) Working on new features - [`80655aa`](https://github.com/ArthurDanjou/artdanj-api/commit/80655aaae45845ac5016180088b50f0f47425f5e) Working on new features - [`46afb65`](https://github.com/ArthurDanjou/artdanj-api/commit/46afb656d81d7fef4d3954b94666544b313800fb) Merge branch 'master' into dev - [`cb3681f`](https://github.com/ArthurDanjou/artdanj-api/commit/cb3681f3b1630598b887255d1b183d8f71c1eb40) Working on emails - [`2881015`](https://github.com/ArthurDanjou/artdanj-api/commit/28810152b52fdc1dab0262fcd262a5538f0c1f1d) Rename tasks directory - [`cea5f2c`](https://github.com/ArthurDanjou/artdanj-api/commit/cea5f2c32f11be30d7586fc80be7fbe118d18571) Merge branch 'dev' of https://github.com/arthurdanjou/artapi into dev - [`bc21d0d`](https://github.com/ArthurDanjou/artdanj-api/commit/bc21d0d5083550892fccac037c4562b05771d701) Working on OAuth - [`b263de6`](https://github.com/ArthurDanjou/artdanj-api/commit/b263de65fa52d6e4272870073de2beac73757507) Working on OAuth ### 📊 Changes **167 files changed** (+9522 additions, -5895 deletions) <details> <summary>View changed files</summary> 📝 `.adonisrc.json` (+6 -4) 📝 `.dockerignore` (+1 -0) 📝 `.editorconfig` (+0 -0) 📝 `.env.example` (+13 -15) ➕ `.eslintignore` (+3 -0) ➕ `.eslintrc` (+3 -0) 📝 `.gitignore` (+108 -7) ➖ `.idea/.gitignore` (+0 -5) ➖ `.idea/artapi.iml` (+0 -12) ➖ `.idea/codeStyles/codeStyleConfig.xml` (+0 -5) ➖ `.idea/modules.xml` (+0 -8) ➖ `.idea/vcs.xml` (+0 -6) 📝 `Dockerfile` (+5 -9) 📝 `LICENSE` (+0 -0) 📝 `README.md` (+3 -3) 📝 `ace` (+0 -0) 📝 `ace-manifest.json` (+40 -4) ➕ `app/Controllers/Http/AnnouncesController.ts` (+36 -0) 📝 `app/Controllers/Http/AuthController.ts` (+34 -118) ➕ `app/Controllers/Http/ExperiencesController.ts` (+57 -0) _...and 80 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
arthur added the pull-request label 2025-12-01 17:03:59 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
pull-request
Mirrored from GitHub Pull Request
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
arthur
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: arthur/artdanj-api#5
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?