Commit Graph

  • a99ebfba9a Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-09 14:24:32 +0200
  • 469855e570 editerProfil v2 OK Tmadkaud 2017-10-09 14:24:14 +0200
  • a093883530 editerProfil OK Tmadkaud 2017-10-09 14:20:23 +0200
  • 9f09fbc0f1 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-09 14:01:04 +0200
  • 447cb3a0b4 trier carte opcom OK Tmadkaud 2017-10-09 14:00:37 +0200
  • 379d797970 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-09 13:52:00 +0200
  • 71d6a98812 Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-09 13:51:52 +0200
  • 8d1a90b306 trier carte Tmadkaud 2017-10-09 13:51:21 +0200
  • bf326bf913 btn filtres + card footer fix Viiciouss 2017-10-09 13:51:00 +0200
  • 8657888bcf Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-09 13:24:32 +0200
  • 49ff98d08e trier opcom Tmadkaud 2017-10-09 13:23:55 +0200
  • 85cdbce8e4 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-09 00:56:33 +0200
  • 6fec7f2bf6 Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-09 00:49:36 +0200
  • 89e0facf14 version stable sauf bloquer admin Tmadkaud 2017-10-09 00:49:09 +0200
  • 8b840c5db1 statut et validation en couleur Viiciouss 2017-10-09 00:27:20 +0200
  • 5146d61e7b version stable envoyer carte 08 10 2017 Tmadkaud 2017-10-08 23:32:44 +0200
  • f82937dfac validation envoie carte: en cours manque ngif correct Viiciouss 2017-10-08 23:17:57 +0200
  • 564755890e validation envoie carte: en cours merge fix Viiciouss 2017-10-08 22:59:12 +0200
  • 8ab4108c86 version statble 08 10 2017 Tmadkaud 2017-10-08 22:54:41 +0200
  • 04f9e4042f validation envoie carte: en cours 2 Viiciouss 2017-10-08 22:53:15 +0200
  • 8d0e321f5d validation envoie carte: en cours Viiciouss 2017-10-08 22:50:15 +0200
  • 383e38ccab delais dans envoyer carte Tmadkaud 2017-10-08 18:58:52 +0200
  • f4040c6ef7 correction bug envoyer carte et validation date file register creation opcom Tmadkaud 2017-10-08 16:32:50 +0200
  • 4fb99acc1d Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-07 20:49:42 +0200
  • e47845ef85 version stable v1 07 10 2017 Tmadkaud 2017-10-07 20:49:05 +0200
  • 88f20f3ac0 toastr pour les autres vues Viiciouss 2017-10-07 20:48:12 +0200
  • 173385e530 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-07 19:43:20 +0200
  • 6a17020763 toastr creation opcomm Viiciouss 2017-10-07 19:42:58 +0200
  • 6d9d27469c filleul anonyme Tmadkaud 2017-10-07 19:32:33 +0200
  • 2ef14348d8 Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-07 18:39:37 +0200
  • 3fe9e86cb2 correction Bug critique register envoyer carte finition Tmadkaud 2017-10-07 18:38:43 +0200
  • ed82881e32 home text section Viiciouss 2017-10-07 17:50:24 +0200
  • 06ca71e16f Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-06 21:41:08 +0200
  • d0ed16548b bug envoyer carte en cours Tmadkaud 2017-10-06 21:38:18 +0200
  • 0a72d187a5 home en construction: ajout d'image Viiciouss 2017-10-06 21:37:23 +0200
  • 47945e77de Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-06 21:34:23 +0200
  • 8cf20dda90 home en construction Viiciouss 2017-10-06 21:34:14 +0200
  • cf06cb0adc bug login register ok Tmadkaud 2017-10-06 20:42:36 +0200
  • af0abf0213 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-06 16:22:54 +0200
  • 09c0182cae 50% des bug xjc Tmadkaud 2017-10-06 15:50:25 +0200
  • 6dac42ed88 correction bug 05 10 2017 Tmadkaud 2017-10-05 20:43:36 +0200
  • 8805798aea devise design Viiciouss 2017-10-05 20:09:50 +0200
  • 12d2f4d914 compteurs des listes debiter si carte expiré Tmadkaud 2017-10-05 18:38:11 +0200
  • 7bbccf15ee details carte parrain admin Viiciouss 2017-10-05 18:32:50 +0200
  • 99ce84995d bouton retour admin Viiciouss 2017-10-05 18:12:13 +0200
  • a9f9616b4a Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-05 15:37:44 +0200
  • 4204f31b23 version stable avant rdv 05 10 2017 Tmadkaud 2017-10-05 15:37:17 +0200
  • 59ebe4e154 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-05 15:00:36 +0200
  • e9effe5ed0 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-05 15:00:26 +0200
  • 90a150a51b filter mask 6 Tmadkaud 2017-10-05 15:00:19 +0200
  • 93b6c44d80 Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-05 14:48:16 +0200
  • 77f5ee5d23 scanner et envoyer carte correction faute Tmadkaud 2017-10-05 14:47:54 +0200
  • bcdbe730aa Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-05 14:43:54 +0200
  • a0fb20f07e finition v1.2 + responsive Viiciouss 2017-10-05 14:43:44 +0200
  • d73471050b changement texte login register profil edit profil Tmadkaud 2017-10-05 14:29:07 +0200
  • e8b781d32d version stable avant rdv 04 10 2017 Tmadkaud 2017-10-04 23:18:00 +0200
  • a5d94b1a40 version stable 04 10 2017 Tmadkaud 2017-10-04 22:54:40 +0200
  • 5a50b392e9 Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-04 22:45:38 +0200
  • e6e44b4b8c finition v1.1 Viiciouss 2017-10-04 22:39:37 +0200
  • 6fda1e5563 Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-04 22:27:50 +0200
  • 359cc80b22 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-04 22:27:33 +0200
  • d46b013be5 finition v1 Viiciouss 2017-10-04 22:27:26 +0200
  • a203ba8dea bug historique ok Tmadkaud 2017-10-04 22:13:53 +0200
  • 03ed7952c9 all html titles modification Viiciouss 2017-10-04 21:08:37 +0200
  • 44b75971d3 Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-04 20:44:00 +0200
  • b7c160de20 nav-admin logout + tarif xjc Viiciouss 2017-10-04 20:43:33 +0200
  • 21fdd6a6da Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-04 18:59:35 +0200
  • d78a3df173 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-04 18:59:19 +0200
  • 061659d778 list-scan admin html padding Viiciouss 2017-10-04 18:57:49 +0200
  • 174f76db25 Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-04 18:50:27 +0200
  • 3d93e974fa list-scan admin html Viiciouss 2017-10-04 18:49:53 +0200
  • 85eac27840 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-04 18:41:05 +0200
  • aeb31161f3 Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-04 18:36:37 +0200
  • 0f8be66f69 envoyer carte ok Tmadkaud 2017-10-04 18:35:59 +0200
  • f56b854fa9 barre en dessous des cartes Viiciouss 2017-10-04 18:33:49 +0200
  • 49b43e24ed bug envoyer carte ok Tmadkaud 2017-10-04 17:45:40 +0200
  • 5d0a1a4504 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-04 17:26:13 +0200
  • 6ae73c32fe Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-04 17:26:06 +0200
  • 7e69067b73 bug envoyer carte Tmadkaud 2017-10-04 17:25:39 +0200
  • dc70f9003e scanner-carte html list des scans Viiciouss 2017-10-04 17:24:39 +0200
  • d06f9c1796 liste carte envoyer ok liste scan en cours Tmadkaud 2017-10-04 16:53:53 +0200
  • 7eb759fb45 list carte admin fix Viiciouss 2017-10-04 15:49:31 +0200
  • 3f5bba5014 list carte liste scan html/css Viiciouss 2017-10-04 15:46:28 +0200
  • 05afcd3ebd creation des component scan effectuer et carte envoyer admin Tmadkaud 2017-10-04 15:26:11 +0200
  • 6d81ac3cd1 validation date tri de toute les listes Tmadkaud 2017-10-04 15:06:47 +0200
  • 400288e935 admin demande de validation v2 Tmadkaud 2017-10-03 22:44:22 +0200
  • 5bc4e5c5c1 admin historique carte bloquer Viiciouss 2017-10-03 21:11:50 +0200
  • db7fa6e403 admin demande de validation v1 Tmadkaud 2017-10-03 21:07:02 +0200
  • 62f113971b Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-03 20:47:40 +0200
  • 58abd1fe75 admin fonction rejeter valider Tmadkaud 2017-10-03 20:47:11 +0200
  • 8e64c166e1 demandeop boutton design Viiciouss 2017-10-03 20:46:56 +0200
  • 293f427536 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-03 20:32:17 +0200
  • 98345b2b91 admin v2 Tmadkaud 2017-10-03 20:32:02 +0200
  • 402ddbe1ef Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-03 20:29:04 +0200
  • 7caa9f29b3 admin opcom rejeter Tmadkaud 2017-10-03 20:28:40 +0200
  • ff2888faec Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry Tmadkaud 2017-10-03 20:23:52 +0200
  • 0526a753d7 Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis Viiciouss 2017-10-03 20:23:49 +0200
  • b1f13cedb0 admin opcom en cour Tmadkaud 2017-10-03 20:23:22 +0200
  • 4e8293f484 demande-op list cartes Viiciouss 2017-10-03 20:21:35 +0200
  • 430ccbaf66 liste op admin inversé Tmadkaud 2017-10-03 20:02:58 +0200