Qwann/k fet/home #468

Merged
narmanli merged 9 commits from qwann/k-fet/home into k-fet 2017-03-11 13:27:10 +01:00
narmanli commented 2017-02-08 12:58:19 +01:00 (Migrated from git.eleves.ens.fr)

new features

Adding the menu on the K-Fêt home page. Adding hidden attribute to Article for articles people don't want to have on the menu. The menu only show items with is_sold = True and hidden = True.

review order

Since I'm stupid, I've merge the !139 into this MR, so it would be better to merge !139 before this merge request.

### new features Adding the menu on the K-Fêt home page. Adding `hidden` attribute to Article for articles people don't want to have on the menu. The menu only show items with `is_sold = True` and `hidden = True`. ### review order Since I'm stupid, I've merge the !139 into this MR, so it would be better to merge !139 before this merge request.
lstephan commented 2017-02-08 15:10:52 +01:00 (Migrated from git.eleves.ens.fr)

Ça me paraît stylé, quelques remarques :

  • Peut-être aligner les prix, pour que ça soit plus lisible
  • Dans gestioncof/home, un lien vers l'historique de ton compte s'il existe pourrait être pas mal.
Ça me paraît stylé, quelques remarques : - Peut-être aligner les prix, pour que ça soit plus lisible - Dans `gestioncof/home`, un lien vers l'historique de ton compte s'il existe pourrait être pas mal.
narmanli commented 2017-02-08 15:21:26 +01:00 (Migrated from git.eleves.ens.fr)

Euuuh, les prix sont pas alignés ? Qu'est-ce que tu entends par là ?
Sinon on s'était justement dis que si on voulait 'inciter' les usagers à consulter la page kfet/home on pourrait ne mettre le lien vers my_account que sur le home de la K-Fêt :)

Euuuh, les prix sont pas alignés ? Qu'est-ce que tu entends par là ? Sinon on s'était justement dis que si on voulait 'inciter' les usagers à consulter la page `kfet/home` on pourrait ne mettre le lien vers `my_account` que sur le home de la K-Fêt :)
narmanli commented 2017-02-08 15:29:25 +01:00 (Migrated from git.eleves.ens.fr)

Oups, j'ai oublié le CSS ^^

Oups, j'ai oublié le CSS ^^
narmanli commented 2017-02-08 15:40:34 +01:00 (Migrated from git.eleves.ens.fr)

Added 1 commit:

Added 1 commit: * ef59c115 - avec le css c'est mieux
narmanli commented 2017-03-05 19:20:15 +01:00 (Migrated from git.eleves.ens.fr)

Added 51 commits:

  • ef59c115...95b129e3 - 50 commits from branch k-fet
  • f52aba8c - Merge branch 'k-fet' into qwann/k-fet/home
Added 51 commits: * ef59c115...95b129e3 - 50 commits from branch `k-fet` * f52aba8c - Merge branch 'k-fet' into qwann/k-fet/home
narmanli commented 2017-03-05 19:43:10 +01:00 (Migrated from git.eleves.ens.fr)

Added 2 commits:

  • 9f94262b - removing inapropriate message
  • b0b2210e - Merge branch 'qwann/k-fet/home' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/home
Added 2 commits: * 9f94262b - removing inapropriate message * b0b2210e - Merge branch 'qwann/k-fet/home' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/home
narmanli commented 2017-03-05 20:04:56 +01:00 (Migrated from git.eleves.ens.fr)

Added 1 commit:

Added 1 commit: * 197da293 - css include added...
narmanli commented 2017-03-05 20:17:31 +01:00 (Migrated from git.eleves.ens.fr)

mentioned in merge request !184

mentioned in merge request !184
lstephan commented 2017-03-05 20:28:47 +01:00 (Migrated from git.eleves.ens.fr)

Peut-être le rajouter à la vue d'ensemble des articles aussi ? (ou au moins à k-fet/articles/XXX)

Peut-être le rajouter à la vue d'ensemble des articles aussi ? (ou au moins à `k-fet/articles/XXX`)
narmanli commented 2017-03-06 02:02:17 +01:00 (Migrated from git.eleves.ens.fr)

Added 2 commits:

  • dcc19bd9 - article.hidden in article & article_read
  • ca17e36b - clean display for is_sold
Added 2 commits: * dcc19bd9 - article.hidden in article & article_read * ca17e36b - clean display for is_sold
lstephan commented 2017-03-06 02:24:03 +01:00 (Migrated from git.eleves.ens.fr)

Ok pour merge =)

Ok pour merge =)
narmanli commented 2017-03-06 02:25:14 +01:00 (Migrated from git.eleves.ens.fr)

Resolved all discussions

Resolved all discussions
narmanli commented 2017-03-10 16:57:28 +01:00 (Migrated from git.eleves.ens.fr)

Added 9 commits:

  • ca17e36b...fbd0d760 - 8 commits from branch k-fet
  • 5ddcd2f1 - Merge branch 'k-fet' into qwann/k-fet/home
Added 9 commits: * ca17e36b...fbd0d760 - 8 commits from branch `k-fet` * 5ddcd2f1 - Merge branch 'k-fet' into qwann/k-fet/home
delobell commented 2017-03-11 13:27:04 +01:00 (Migrated from git.eleves.ens.fr)

mentioned in commit e6f0369874

mentioned in commit e6f03698740ef1300a49676a363837b5769ba37c
delobell commented 2017-03-11 13:27:09 +01:00 (Migrated from git.eleves.ens.fr)

Status changed to merged

Status changed to merged
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: DGNum/gestioCOF#468
No description provided.