thubrecht/poulpe
1
0
Fork 0
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Qwann/move user #13

Merged
narmanli merged 11 commits from qwann/move_user into master 2017-05-16 19:13:53 +02:00
Conversation 10 Commits 11 Files changed 27 +42 -156
narmanli commented 2017-02-21 17:09:27 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Change le nom de l'appli user en users. À merge après !7

Change le nom de l'appli `user` en `users`. À merge après !7
narmanli commented 2017-02-21 20:49:39 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Added 8 commits:

  • c7db0c10 - include forgotten
  • 8055be4c - fixes
  • f33db473 - typo + PEP8
  • a41d2b99 - regexp urls
  • fa7f0469 - Merge branch 'models' into qwann/html/base2
  • 6d370196 - Merge branch 'qwann/html/base2' into qwann/html/user
  • 1a7df9de - Merge branch 'qwann/html/user' into qwann/views/shared
  • 0175db89 - Merge branch 'qwann/views/shared' into qwann/move_user
Added 8 commits: * c7db0c10 - include forgotten * 8055be4c - fixes * f33db473 - typo + PEP8 * a41d2b99 - regexp urls * fa7f0469 - Merge branch 'models' into qwann/html/base2 * 6d370196 - Merge branch 'qwann/html/base2' into qwann/html/user * 1a7df9de - Merge branch 'qwann/html/user' into qwann/views/shared * 0175db89 - Merge branch 'qwann/views/shared' into qwann/move_user
narmanli commented 2017-02-21 21:00:43 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Added 2 commits:

  • 7f2f995e - wrong merge fixed
  • 79770b0b - Merge branch 'qwann/views/shared' into qwann/move_user
Added 2 commits: * 7f2f995e - wrong merge fixed * 79770b0b - Merge branch 'qwann/views/shared' into qwann/move_user
narmanli commented 2017-02-21 21:22:32 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Added 6 commits:

  • e72969e9 - initial migrations
  • 524876a0 - Merge branch 'models' into qwann/html/base2
  • c863fa30 - Merge branch 'qwann/html/base2' into qwann/html/user
  • c3180281 - forgotten include
  • cf808595 - Merge branch 'qwann/html/base2' into qwann/html/user
  • 37aa00e9 - Merge branch 'qwann/html/user' into qwann/move_user
Added 6 commits: * e72969e9 - initial migrations * 524876a0 - Merge branch 'models' into qwann/html/base2 * c863fa30 - Merge branch 'qwann/html/base2' into qwann/html/user * c3180281 - forgotten include * cf808595 - Merge branch 'qwann/html/base2' into qwann/html/user * 37aa00e9 - Merge branch 'qwann/html/user' into qwann/move_user
narmanli commented 2017-03-05 13:27:15 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Added 6 commits:

  • 01014c68 - 1 commit from branch master
  • 8fcc1988 - Merge branch 'qwann/html/user' into qwann/views/shared
  • b40713be - Merge branch 'models' into qwann/html/base2
  • 25a936e1 - Merge branch 'qwann/html/base2' into qwann/html/user
  • a11b84a3 - Merge branch 'qwann/html/user' into qwann/views/shared
  • dd2f4d65 - Merge branch 'qwann/views/shared' into qwann/move_user
Added 6 commits: * 01014c68 - 1 commit from branch `master` * 8fcc1988 - Merge branch 'qwann/html/user' into qwann/views/shared * b40713be - Merge branch 'models' into qwann/html/base2 * 25a936e1 - Merge branch 'qwann/html/base2' into qwann/html/user * a11b84a3 - Merge branch 'qwann/html/user' into qwann/views/shared * dd2f4d65 - Merge branch 'qwann/views/shared' into qwann/move_user
narmanli commented 2017-03-05 19:12:51 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Added 4 commits:

  • be1a89a4 - small fixes
  • f47608d2 - Merge branch 'qwann/html/base2' into qwann/html/user
  • afdc821c - Merge branch 'qwann/html/user' into qwann/views/shared
  • 9c4e9505 - Merge branch 'qwann/views/shared' into qwann/move_user
Added 4 commits: * be1a89a4 - small fixes * f47608d2 - Merge branch 'qwann/html/base2' into qwann/html/user * afdc821c - Merge branch 'qwann/html/user' into qwann/views/shared * 9c4e9505 - Merge branch 'qwann/views/shared' into qwann/move_user
narmanli commented 2017-04-06 00:45:23 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 3 commits

  • 3729f300 - removing shared from STATICFILES_DIRS
  • 03b1fc31 - Merge branch 'qwann/html/user' into qwann/views/shared
  • 9f4ab91a - Merge branch 'qwann/views/shared' into qwann/move_user

Compare with previous version

added 3 commits * 3729f300 - removing shared from STATICFILES_DIRS * 03b1fc31 - Merge branch 'qwann/html/user' into qwann/views/shared * 9f4ab91a - Merge branch 'qwann/views/shared' into qwann/move_user [Compare with previous version](https://git.eleves.ens.fr/cof-geek/GestionEvenementiel/merge_requests/8/diffs?diff_id=389&start_sha=9c4e950593821655da6f8ab1a9c8515dff4f413c)
narmanli commented 2017-04-26 19:01:14 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 2 commits

  • 7a4a836d - small fixes
  • 6e733492 - Merge branch 'qwann/views/shared' into qwann/move_user

Compare with previous version

added 2 commits * 7a4a836d - small fixes * 6e733492 - Merge branch 'qwann/views/shared' into qwann/move_user [Compare with previous version](https://git.eleves.ens.fr/cof-geek/GestionEvenementiel/merge_requests/8/diffs?diff_id=455&start_sha=9f4ab91aade0ce76b9d21916ddfe687777a3c400)
narmanli commented 2017-05-09 22:59:23 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 8 commits

  • 6e733492...01d8f2bb - 7 commits from branch master
  • e5bfb0bd - Merge branch 'master' into qwann/move_user

Compare with previous version

added 8 commits * 6e733492...01d8f2bb - 7 commits from branch `master` * e5bfb0bd - Merge branch 'master' into qwann/move_user [Compare with previous version](https://git.eleves.ens.fr/cof-geek/GestionEvenementiel/merge_requests/8/diffs?diff_id=460&start_sha=6e733492ac7949f3378886582eb9083aba75ad52)
mpepin commented 2017-05-16 19:13:51 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

mentioned in commit ba6bff5ec4

mentioned in commit ba6bff5ec4959e8409b7ecf1edd1135f76a687fe
mpepin commented 2017-05-16 19:13:53 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

merged

merged
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Doing

   
Doing

   
Good first issue

   
To Do
No labels
Doing
Doing
Good first issue
To Do
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
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: thubrecht/poulpe#13
No description provided.
Delete branch "qwann/move_user"

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?