master #13

Merged

remi.regnault merged 48 commits from master into WORK-RRE

remi.regnault commented

Owner

There is no content yet.

remi.regnault added 48 commits

98eff64c49 Merge pull request 'master' (#2 ) from master into WORK-RHA

Reviewed-on: #2

dce8fa2af7 add file for images ios and android

7b3e20bf31 add splash screen and icons

40b4a15661 Mise à jour de 'README.md'

836f4f2f13 add custom button

c4baa57882 button component working, the design is not perfect

84b80607ea Merge pull request 'WORK-RHA' (#3 ) from WORK-RHA into master

Reviewed-on: #3

f8ed5401b5 the desing for the button is finished

0902b66882 Merge pull request 'the desing for the button is finished' (#4 ) from WORK-RHA into master

Reviewed-on: #4

baf18e5f80 add component for ingredient, the back end is not complete

b6d223f13d Merge pull request 'add component for ingredient, the back end is not complete' (#5 ) from WORK-RHA into master

Reviewed-on: #5

fa8d926686 add component for display selected recipes with images

5ee03b380b improve the design and the composant

659382d99b improve the design and the composant

863cc541a1 Merge pull request 'WORK-RHA' (#6 ) from WORK-RHA into master

Reviewed-on: #6

81c8f99256 add a new component, a reduce version of the recipeElement

4890744690 Package.json

638278ec99 Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package-lock.json
#	package.json

087d9cd7f9 add a new component

47e632bb88 Merge pull request 'WORK-RHA' (#7 ) from WORK-RHA into master

Reviewed-on: #7

b8b5e1469f Merge remote-tracking branch 'origin/master'

438350efeb add a new component SelectedIngredients

45ab6bd7d3 add a few component like tabbar and selected ingredient, changes the recipe display and create a new page

7f048e4efb Profile Component

da6c25d296 add modal

db13c03fae Profile Component

a3b27eaaab modify modal

cffe1126bb Profile Component

11b7df605c upgrade parameters for selected ingredient, the modal is functionnal, to do : filters selection

5dbe2d635d Merge pull request 'WORK-RHA' (#8 ) from WORK-RHA into master

Reviewed-on: #8

8f79508a11 Profile Component

1141d4576a Merge remote-tracking branch 'origin/master'

61c8ede6c8 Merge branch 'WORK-LPA'

# Conflicts:
#	LeftOvers/App.js
#	LeftOvers/package-lock.json
#	LeftOvers/package.json

f5c2806562 add recipe selection and change tobBar

57d46bbe36 add modification

40781dd815 Merge branch 'master' of https://codefirst.iut.uca.fr/git/Sae_LeftOvers/LeftOvers

c78229b370 Merge pull request 'master' (#10 ) from master into WORK-RHA

Reviewed-on: #10

0728523c62 finish page recipe details, some details to change like images and button on other pages but they are finished

eea8e874bc Merge pull request 'WORK-RHA' (#11 ) from WORK-RHA into master

Reviewed-on: #11

93eaee5ccc upgrade some component and changes somes images

48b984929b add images and changes somes details

6991a3eb3e Merge pull request 'WORK-RHA' (#12 ) from WORK-RHA into master

Reviewed-on: #12

2234e74ac9 Ajouter '.drone.yml'

1a9bf3ae76 Mise à jour de '.drone.yml'

ee11d25fc6 Mise à jour de '.drone.yml'

03a8191bd1 Mise à jour de '.drone.yml'

9f92f9a60b Mise à jour de '.drone.yml'

60694ef7d9 Mise à jour de '.drone.yml'

remi.regnault merged commit 8cec5a7c77 into WORK-RRE 1 year ago

remi.regnault referenced this issue from a commit

Merge pull request 'master' (#13) from master into WORK-RRE

continuous-integration/drone/push Build is failing

Details

The pull request has been merged as 8cec5a7c77.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Sae_LeftOvers/LeftOvers#13