Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

Feature/projects #3

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Feature/projects #3

wants to merge 28 commits into from

Conversation

121593
Copy link
Contributor

@121593 121593 commented Nov 25, 2018

Et voilà la partie projet !
Elle n'est pas tout à fait complète (il manque notamment le management des machines et les styles) ; mais il y à déjà pas mal de choses à regarder.
++

marol and others added 28 commits October 31, 2018 19:19
Merged changes from feature/introduce_sass
c6111b8
@121593
Add three dependencies
a139ebe 
Validate.js: form validation
express-sanitizer: xss prevention
quill delta to html: Server side rendering of Quill objects
@121593
Add projects public route
13d526f
@121593
Update model
9c6922a
@121593
Load express-sanitizer
bccd9c7
@121593
Create custom validation for project
c3ebc70
@121593
Create public project pages
66cec29
@121593
Create menu entries
2cc2a45
@121593
Add hook to add scripts/stylessheets
f9a5aaa 
Seems that there is a code formatting conflict
@121593
Create partials for project list, form, and user icon
392bf1b
@121593
Create project-related private pages
87c8b2d
@121593
Create script for form edition.
9c3e7f7 
Handling ajax deletion, quill editor management
@121593
Adapt members page to the new project architecture
280afec
@121593
Various style additions related to projects
0dc0996
@121593
Add three dependencies
d110711 
Validate.js: form validation
express-sanitizer: xss prevention
quill delta to html: Server side rendering of Quill objects
@121593
Add projects public route
9f33a5f
@121593
Update model
c729392
@121593
Load express-sanitizer
16dae9b
@121593
Create custom validation for project
972b924
@121593
Create public project pages
ebd7379
@121593
Create menu entries
ffd722c
@121593
Add hook to add scripts/stylessheets
9dea0f1 
Seems that there is a code formatting conflict
@121593
Create partials for project list, form, and user icon
6409fd1
@121593
Create project-related private pages
6836773
@121593
Create script for form edition.
4d571a2 
Handling ajax deletion, quill editor management
@121593
Adapt members page to the new project architecture
02fa6cf
@121593
Various style additions related to projects
f9d31af
@121593
Merge remote-tracking branch 'origin/feature/projects' into feature/p…
9f6b1c1 
…rojects
@nicolasdb nicolasdb requested a review from satblip December 9, 2019 10:49
@satblip
Copy link
Member

satblip commented Dec 9, 2019

already reviewed

@nicolasdb
Copy link
Member

on cloture le PR alors, non?

@satblip
Copy link
Member

satblip commented Dec 13, 2019

Nop, je vais récupérer les views, elle est ouverte pour une raison ;)

@121593 121593 mentioned this pull request Mar 5, 2020
Open
@nicolasdb
Copy link
Member

Up.
y a des conflits à résoudre ici. Je ne sais pas de quand mais il est probable que c'est dû à mon PR. J'ai désactivé la page membre et modifié un peu top et bottom dans leur contenu.

@nicolasdb
Copy link
Member

En fait, dans bottom.ejs, il manque Loic dans le "design by"
La formule est très longue, ou alors, on dit que le design est collectif via github et on met le lien vers la page des contributions

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@satblip satblip Awaiting requested review from satblip

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@121593 @satblip @nicolasdb