Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update (En image !) #43

Merged
merged 92 commits into from
Nov 3, 2016
Merged

Update (En image !) #43

merged 92 commits into from
Nov 3, 2016

Conversation

Scriptodude
Copy link
Collaborator

Suite à #40
Fix de #24
Cette mise à jour remet les changements perdus cette été à cause des merge conflicts de cet été

Page d'accueil

vendeurbut

Page des employés

pageemployee

Page des vendeurs

Aucun vendeur n'était ajouté dans l'image, à venir un screenshot avec tout!

pagevendeur

Page du rapport

Ajout de l'interval de date à venir !

rapportact

Oublie

Lors de la correction des merge conflicts de cet été, j'ai perdu mes commits sur l'interval de dates sur le rapport, je m'y remet bientôt!

Scriptodude and others added 30 commits June 6, 2016 14:41
It seems the coverage calculates the whole virtualenv django python files, while it should only count the project files.
It seems the coverage calculates the whole virtualenv django python files, while it should only count the project files. (reverted from commit 9711984)
Updated .gitignore

Added omit to .travis.yml
@Scriptodude
Copy link
Collaborator Author

Ping @ventilooo
Pour des raisons weirdo, mon autre PR n'a pas pris en compte l'historique des commits (WTF)
Mais bon, j'ai réussi à les ravoirs, y'en a qui date là dedans ! OUF !

@coveralls
Copy link

coveralls commented Nov 2, 2016

Coverage Status

Coverage decreased (-0.5%) to 52.5% when pulling 732fded on Scriptodude:master into 58e269a on AESSUQAM:develop.

@coveralls
Copy link

coveralls commented Nov 2, 2016

Coverage Status

Coverage increased (+0.1%) to 53.086% when pulling 269970c on Scriptodude:master into 58e269a on AESSUQAM:develop.

@ventilooo ventilooo merged commit 3288bf9 into AESSUQAM:develop Nov 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants