API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Dec 5th, 2016
116
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 41.38 KB | None | 0 0
raw download clone embed print report
  1.  
  2.  
  3. Jolyanne@PC_Jojo MINGW32 /c/wamp64/www/webarena_group_SI3-03-AG (master)
  4. $ git log
  5. commit 4c9c6cb7b80907557613eb44f152af2f34e09d77
  6. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  7. Date: Mon Dec 5 08:51:14 2016 +0100
  8.  
  9. réparation api fighterview
  10.  
  11. commit 0f28bda10eaf34e9132126692f5e540eebe3ed3e
  12. Author: Megane <megane.pau@edu.ece.fr>
  13. Date: Mon Dec 5 08:17:45 2016 +0100
  14.  
  15. footers
  16.  
  17. commit 22b3396546fdf471ffc076e6e744da3b93ac767a
  18. Author: Megane <megane.pau@edu.ece.fr>
  19. Date: Mon Dec 5 08:15:44 2016 +0100
  20.  
  21. image + redirection google ? (à tester)
  22.  
  23. commit f6fefc07142d093c9a5aa91de669030b98ffbe68
  24. Author: Megane <megane.pau@edu.ece.fr>
  25. Date: Mon Dec 5 08:14:04 2016 +0100
  26.  
  27. mini modif css + images
  28.  
  29. commit 817567b60ea5ef50f9ed0ee0d85d4d0647c523e1
  30. Author: Arno <arnaud.petitcol@gmail.com>
  31. Date: Mon Dec 5 00:45:40 2016 +0100
  32.  
  33. &
  34.  
  35. commit 271d0cf4eea2fb7c0cf58c6abdef3faba1b610fe
  36. Author: Arno <arnaud.petitcol@gmail.com>
  37. Date: Mon Dec 5 00:42:39 2016 +0100
  38.  
  39. .
  40.  
  41. commit 7d04a67ca6089d5b23254173b9b3c05afd6b95f9
  42. Author: Arno <arnaud.petitcol@gmail.com>
  43. Date: Mon Dec 5 00:27:30 2016 +0100
  44.  
  45. indentation
  46.  
  47. commit 56688fe365e34504166cdc96b5e94ac4b06dbe8a
  48. Merge: 128d194 1248cd2
  49. Author: Marie! <perin.mariemp@gmail.com>
  50. Date: Sun Dec 4 23:31:45 2016 +0100
  51.  
  52. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  53.  
  54. commit 128d1949508d190e0a71f8e669f7d84168732b1c
  55. Author: Marie! <perin.mariemp@gmail.com>
  56. Date: Sun Dec 4 23:31:28 2016 +0100
  57.  
  58. footer
  59.  
  60. commit 1248cd256839091b744c0ae46a7daf5e91e2b302
  61. Merge: 9d372cb f3dd1bc
  62. Author: Arno <arnaud.petitcol@gmail.com>
  63. Date: Sun Dec 4 23:26:43 2016 +0100
  64.  
  65. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  66.  
  67. commit 9d372cb96491bdc31ea377d3540800f38c50168d
  68. Author: Arno <arnaud.petitcol@gmail.com>
  69. Date: Sun Dec 4 23:26:35 2016 +0100
  70.  
  71. fin bug email
  72.  
  73. commit f3dd1bc4da1124e04a1045080980760f09839535
  74. Merge: ac32c29 71cf0cc
  75. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  76. Date: Sun Dec 4 23:20:00 2016 +0100
  77.  
  78. conflit résolu
  79.  
  80. commit ac32c29d58f3a943ad08688d35504cae7b7e1e42
  81. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  82. Date: Sun Dec 4 23:16:21 2016 +0100
  83.  
  84. bug
  85.  
  86. commit 71cf0cca069c39a896417ce20669998d1f26aca4
  87. Author: 4rno <arnaud.petitcol@gmail.com>
  88. Date: Sun Dec 4 23:08:28 2016 +0100
  89.  
  90. zr
  91.  
  92. commit cb16c34fcf789c1228ba6dafecfbebbd4e7e78da
  93. Merge: 3004bf0 6804bb7
  94. Author: 4rno <arnaud.petitcol@gmail.com>
  95. Date: Sun Dec 4 22:40:49 2016 +0100
  96.  
  97. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  98.  
  99. commit 3004bf07111caab2afbc4f4d68a18d7a0950b4f7
  100. Author: 4rno <arnaud.petitcol@gmail.com>
  101. Date: Sun Dec 4 22:40:38 2016 +0100
  102.  
  103. server image
  104.  
  105. commit 6804bb755b2876be648791fc3bb2429595188357
  106. Merge: c76c92a cf39945
  107. Author: Marie! <perin.mariemp@gmail.com>
  108. Date: Sun Dec 4 22:40:00 2016 +0100
  109.  
  110. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  111.  
  112. commit c76c92ae4c477025382e66cbb99add233b1fb921
  113. Merge: 8c3b7d9 a0eb5d6
  114. Author: Marie! <perin.mariemp@gmail.com>
  115. Date: Sun Dec 4 22:39:44 2016 +0100
  116.  
  117. conflit résolu
  118.  
  119. commit cf3994524d4d24ea706efa9cb3014695d45350ab
  120. Merge: 95b0c64 a0eb5d6
  121. Author: Arno <arnaud.petitcol@gmail.com>
  122. Date: Sun Dec 4 22:29:35 2016 +0100
  123.  
  124. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  125.  
  126. commit 95b0c640b7b33fe7e41ac776715990c359465e65
  127. Author: Arno <arnaud.petitcol@gmail.com>
  128. Date: Sun Dec 4 22:29:25 2016 +0100
  129.  
  130. debug mail
  131.  
  132. commit 8c3b7d9c10a90203dd889a33d291eabab59d9bc7
  133. Author: Marie! <perin.mariemp@gmail.com>
  134. Date: Sun Dec 4 22:25:33 2016 +0100
  135.  
  136. restriction actions
  137.  
  138. commit a0eb5d67b3501ddf38f14cc2d1cfc987ed7cc6e8
  139. Merge: bbd12a8 1b8bfc6
  140. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  141. Date: Sun Dec 4 22:20:32 2016 +0100
  142.  
  143. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  144.  
  145. commit bbd12a8e1b0783b4649731d9c10ebdbdda35f627
  146. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  147. Date: Sun Dec 4 22:20:21 2016 +0100
  148.  
  149. blindage again
  150.  
  151. commit 1b8bfc64d3a99a861e8820606e10490e3b002304
  152. Merge: cad7429 aaa49fd
  153. Author: 4rno <arnaud.petitcol@gmail.com>
  154. Date: Sun Dec 4 21:09:34 2016 +0100
  155.  
  156. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  157.  
  158. # Conflicts:
  159. # webroot/img/545f827c-576c-4dc5-ab6d-27c33186dc3e_62.jpg
  160.  
  161. commit cad7429b6de690e8e737803ad446078ab4219d60
  162. Author: 4rno <arnaud.petitcol@gmail.com>
  163. Date: Sun Dec 4 21:09:13 2016 +0100
  164.  
  165. nettoyage photo
  166.  
  167. commit aaa49fd1f07588019bb23366b46d67604cdb4df9
  168. Merge: 92426d3 ff477e1
  169. Author: Arno <arnaud.petitcol@gmail.com>
  170. Date: Sun Dec 4 20:48:52 2016 +0100
  171.  
  172. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  173.  
  174. commit 92426d35219d74268bb464a87b3823642b7fed4c
  175. Author: Arno <arnaud.petitcol@gmail.com>
  176. Date: Sun Dec 4 20:48:46 2016 +0100
  177.  
  178. correction bug
  179.  
  180. commit ff477e180f021134d359a120eb01588c62337cb6
  181. Merge: 35487ce 008a217
  182. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  183. Date: Sun Dec 4 20:13:35 2016 +0100
  184.  
  185. no message
  186.  
  187. commit 35487ce4a1bb3b8bf4065c0994924dd2c76d0435
  188. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  189. Date: Sun Dec 4 20:13:02 2016 +0100
  190.  
  191. no message
  192.  
  193. commit 5f9c4352ebf19481d5ba40e46e3579510a02ed0c
  194. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  195. Date: Sun Dec 4 20:10:40 2016 +0100
  196.  
  197. fin api
  198.  
  199. commit 551aca92ed0a0c51294aba2c2c85b810e917524d
  200. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  201. Date: Sun Dec 4 19:38:37 2016 +0100
  202.  
  203. API
  204.  
  205. commit 008a2178012b4798e7e54ee889dc1387d9c9fdc1
  206. Merge: 34ad635 8bfa452
  207. Author: Arno <arnaud.petitcol@gmail.com>
  208. Date: Sun Dec 4 19:02:07 2016 +0100
  209.  
  210. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  211.  
  212. commit 34ad6351121a577098f043051b22148d218a1b9a
  213. Author: Arno <arnaud.petitcol@gmail.com>
  214. Date: Sun Dec 4 19:01:24 2016 +0100
  215.  
  216. english pize
  217.  
  218. commit 8bfa452f04a42a6255cd853d86239e923970649f
  219. Author: Marie! <perin.mariemp@gmail.com>
  220. Date: Sun Dec 4 19:00:15 2016 +0100
  221.  
  222. Non suppression du perso et message quand killed
  223.  
  224. commit b4cf31e2b617a9ca18e9bc7c4f6e493936ec7c6b
  225. Merge: a1ce6c4 e186471
  226. Author: Arno <arnaud.petitcol@gmail.com>
  227. Date: Sun Dec 4 18:00:02 2016 +0100
  228.  
  229. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  230.  
  231. commit a1ce6c4c5b072d2a2841e34c44c55dc05ab612e8
  232. Author: Arno <arnaud.petitcol@gmail.com>
  233. Date: Sun Dec 4 17:59:55 2016 +0100
  234.  
  235. récup mdp
  236.  
  237. commit e186471edef4cd42522a3f56951c269d1d505b15
  238. Merge: e7b8fd7 c2dd21d
  239. Author: 4rno <arnaud.petitcol@gmail.com>
  240. Date: Sun Dec 4 17:54:14 2016 +0100
  241.  
  242. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  243.  
  244. commit e7b8fd74f840a41511ae14905dab09e91eba5b7b
  245. Author: 4rno <arnaud.petitcol@gmail.com>
  246. Date: Sun Dec 4 17:54:04 2016 +0100
  247.  
  248. nouvelle image
  249.  
  250. commit c2dd21dcdcbe41439abe8209319c318ee230cf08
  251. Merge: 0b1cc50 e9efa43
  252. Author: Marie! <perin.mariemp@gmail.com>
  253. Date: Sun Dec 4 17:42:47 2016 +0100
  254.  
  255. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  256.  
  257. commit 0b1cc50fed58a0038374ac3ed0a671bb9cf9eb41
  258. Author: Marie! <perin.mariemp@gmail.com>
  259. Date: Sun Dec 4 17:42:38 2016 +0100
  260.  
  261. Résolution logs sights
  262.  
  263. commit e9efa4306ec4b542e13fb91fb6837ff69c47e404
  264. Merge: 53b03ed bc5e68c
  265. Author: Arno <arnaud.petitcol@gmail.com>
  266. Date: Sun Dec 4 16:53:33 2016 +0100
  267.  
  268. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  269.  
  270. commit 53b03edc669dbb5f771dae48c1ba56f5c0d78c0e
  271. Merge: e3c3f54 ad6cfa3
  272. Author: Arno <arnaud.petitcol@gmail.com>
  273. Date: Sun Dec 4 16:53:17 2016 +0100
  274.  
  275. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  276.  
  277. # Conflicts:
  278. # nbproject/private/private.xml
  279. # src/Controller/AppController.php
  280. # src/Template/Arenas/index.ctp
  281.  
  282. commit bc5e68c6d9ed5cc5bf5766f3fa44d722e5160eef
  283. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  284. Date: Sun Dec 4 16:51:24 2016 +0100
  285.  
  286. debug
  287.  
  288. commit e3c3f54a8c16262d2a02c003411a43435f265d98
  289. Author: Arno <arnaud.petitcol@gmail.com>
  290. Date: Sun Dec 4 16:47:52 2016 +0100
  291.  
  292. tentative commit après un WE...
  293.  
  294. commit ad6cfa335b3d95966bbd5aaeea7b51e17cf79182
  295. Merge: e1f265c 6c16d94
  296. Author: 4rno <arnaud.petitcol@gmail.com>
  297. Date: Sun Dec 4 16:45:33 2016 +0100
  298.  
  299. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  300.  
  301. commit e1f265c75fb0bf9cc3fd54d3b8c2015deddfb571
  302. Author: 4rno <arnaud.petitcol@gmail.com>
  303. Date: Sun Dec 4 16:45:27 2016 +0100
  304.  
  305. Server
  306.  
  307. kesako encore .. ?
  308.  
  309. commit 6c16d945bb963ce8763faf39e9ce8071ebf9ea8c
  310. Merge: 2016f1a 2de15c0
  311. Author: Marie! <perin.mariemp@gmail.com>
  312. Date: Sun Dec 4 16:25:46 2016 +0100
  313.  
  314. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  315.  
  316. commit 2016f1a949d441686d706a5185523753835a4752
  317. Author: Marie! <perin.mariemp@gmail.com>
  318. Date: Sun Dec 4 16:25:34 2016 +0100
  319.  
  320. début correction logs
  321.  
  322. commit 2de15c0618ee18d01fb4360e3de5066936bf8c8e
  323. Merge: 2770d33 3b232cc
  324. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  325. Date: Sun Dec 4 16:23:35 2016 +0100
  326.  
  327. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  328.  
  329. commit 2770d33e577ab7820c51f396921292994d0c3508
  330. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  331. Date: Sun Dec 4 16:15:47 2016 +0100
  332.  
  333. case monstre débug
  334.  
  335. commit 3b232cc4085113e71b4bd5f6a3b78d298220a9ab
  336. Author: Megane <megane.pau@edu.ece.fr>
  337. Date: Sun Dec 4 16:09:50 2016 +0100
  338.  
  339. mini correction css
  340.  
  341. commit 9cf517808ad1dc1049a557674b6b18420d52c63b
  342. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  343. Date: Sun Dec 4 13:58:16 2016 +0100
  344.  
  345. avec l'id
  346.  
  347. commit 52cb53807ccfccc0355be4c5fadd44d0ea625dff
  348. Author: Marie! <perin.mariemp@gmail.com>
  349. Date: Sun Dec 4 13:46:35 2016 +0100
  350.  
  351. réparation conflit
  352.  
  353. commit 7d61b34d60ad45645dc4214def1ea76bd093936a
  354. Merge: 23283a4 6360b26
  355. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  356. Date: Sun Dec 4 13:32:51 2016 +0100
  357.  
  358. conflits
  359.  
  360. commit 23283a458ba871eea1d06b8550559c2d7ff215ca
  361. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  362. Date: Sun Dec 4 13:29:06 2016 +0100
  363.  
  364. no message
  365.  
  366. commit 97ee959bf6db3bbd4ba7fa7806a1c0176da7cf08
  367. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  368. Date: Sun Dec 4 13:27:37 2016 +0100
  369.  
  370. décharge des controlleurs dans les models
  371.  
  372. commit 6360b26280be0a64e6035eeb53357eb22cb93f8c
  373. Merge: 96f9261 2f3b584
  374. Author: Marie! <perin.mariemp@gmail.com>
  375. Date: Sun Dec 4 12:43:37 2016 +0100
  376.  
  377. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  378.  
  379. commit 96f9261b5637eb8d3d3a9f8b148f8157ae2ffc39
  380. Author: Marie! <perin.mariemp@gmail.com>
  381. Date: Sun Dec 4 12:43:16 2016 +0100
  382.  
  383. Diary ok !
  384.  
  385. commit 2f3b5845182cf61d0f5a8360629b71d3d991663c
  386. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  387. Date: Sun Dec 4 10:26:32 2016 +0100
  388.  
  389. réparation du bug potion
  390.  
  391. commit e4f9ca29ab43262c7591d43e339802dc80cf60e1
  392. Author: Megane <megane.pau@edu.ece.fr>
  393. Date: Sun Dec 4 01:01:14 2016 +0100
  394.  
  395. css alert obstacle
  396.  
  397. commit 5851399e1b89a926d37839a8fc8a44cadec2bea5
  398. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  399. Date: Sun Dec 4 00:22:27 2016 +0100
  400.  
  401. débug
  402.  
  403. commit b8e1906d074e9fe53abc0ff91c50972abbf3c46c
  404. Merge: d9af71e 5bf33ec
  405. Author: Megane <megane.pau@edu.ece.fr>
  406. Date: Sat Dec 3 23:45:21 2016 +0100
  407.  
  408. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  409.  
  410. commit d9af71ede51bd9269d2ab7342a7938617c0643ec
  411. Author: Megane <megane.pau@edu.ece.fr>
  412. Date: Sat Dec 3 23:45:11 2016 +0100
  413.  
  414. CSS message pièges+monstre (trafiquage html, plus de css dedans)
  415. misc affichage currenthealth/health
  416. misc image potion
  417.  
  418. commit 5bf33ec561b5a615cc353d72ffcaa2355c4899b4
  419. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  420. Date: Sat Dec 3 22:39:32 2016 +0100
  421.  
  422. log dans footer
  423.  
  424. commit a5edcfb3f8b138f0439ffd4a7a86336dac8301ac
  425. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  426. Date: Sat Dec 3 22:14:45 2016 +0100
  427.  
  428. changement footer avec option en plus
  429.  
  430. commit a8f9bc45a7a67ed2dc7d59615a383cdef5a99ce8
  431. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  432. Date: Sat Dec 3 22:08:50 2016 +0100
  433.  
  434. section log décommenté
  435.  
  436. commit 6e8e409774c318ded633b80f0e5a698f5c2d4a73
  437. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  438. Date: Sat Dec 3 22:04:05 2016 +0100
  439.  
  440. fin bonus+ reglage des pieges et du monstre+ potion qui ajoute 3 a la vie actulle du joueur
  441.  
  442. commit c9ed1a0012d01d350c0b66a6f8620e66f542c81e
  443. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  444. Date: Sat Dec 3 20:25:24 2016 +0100
  445.  
  446. fin bonus obstacle
  447.  
  448. commit 17a66cabc9190889d95bc4d46ba80145ae388393
  449. Merge: 9ca9410 55a1e4f
  450. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  451. Date: Sat Dec 3 18:13:36 2016 +0100
  452.  
  453. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  454.  
  455. commit 9ca941064d72770de6d4135c43d3a93587c1a1b7
  456. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  457. Date: Sat Dec 3 18:13:27 2016 +0100
  458.  
  459. bonus obstacles presque fini
  460.  
  461. commit 55a1e4f250fb86cf205611bc5c5008b4f8cf0643
  462. Author: Marie! <perin.mariemp@gmail.com>
  463. Date: Sat Dec 3 18:02:36 2016 +0100
  464.  
  465. sans les debug c'est mieux
  466.  
  467. commit 3e81def2fb2d568966f550dea3122e084c224a4b
  468. Merge: 026f271 13499f3
  469. Author: Marie! <perin.mariemp@gmail.com>
  470. Date: Sat Dec 3 18:00:49 2016 +0100
  471.  
  472. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  473.  
  474. # Conflicts:
  475. # nbproject/private/private.xml
  476. # src/Controller/SightsController.php
  477.  
  478. commit 026f2718064c4987ba316a039874a85bc0714f25
  479. Author: Marie! <perin.mariemp@gmail.com>
  480. Date: Sat Dec 3 17:57:27 2016 +0100
  481.  
  482. RESTRICTION LOGS HYPER STYLE DANS SIGHTS
  483.  
  484. commit 13499f3aebda66d3e75ca40c6be7c2c54f31a2c3
  485. Merge: 6149c1e 603f21f
  486. Author: Megane <megane.pau@edu.ece.fr>
  487. Date: Sat Dec 3 16:27:44 2016 +0100
  488.  
  489. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  490.  
  491. commit 6149c1edded38dbfaa8b7e693bb5ed7f9d37541e
  492. Author: Megane <megane.pau@edu.ece.fr>
  493. Date: Sat Dec 3 16:27:32 2016 +0100
  494.  
  495. correction test liste fighters vide
  496.  
  497. commit 603f21f354dc36e26b2f4a93adfc3b100ddd58ef
  498. Merge: 2d4cef6 9d3a665
  499. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  500. Date: Sat Dec 3 16:10:47 2016 +0100
  501.  
  502. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  503.  
  504. commit 2d4cef6803cadc5c14e108368f72d547af347c86
  505. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  506. Date: Sat Dec 3 16:10:36 2016 +0100
  507.  
  508. réglage des compétences upgrade
  509.  
  510. commit 9d3a665165c477e0ec616770a69cafbb879293a2
  511. Author: Megane <megane.pau@edu.ece.fr>
  512. Date: Sat Dec 3 15:17:04 2016 +0100
  513.  
  514. modif mineure : titres des pages
  515.  
  516. commit c13e05994b351a110507c6c0aa6cc26a00fd593b
  517. Author: Megane <megane.pau@edu.ece.fr>
  518. Date: Sat Dec 3 14:27:20 2016 +0100
  519.  
  520. misc css
  521.  
  522. commit ecebc8a95f8f6ceb8a7600d4916613df32337415
  523. Author: Megane <megane.pau@edu.ece.fr>
  524. Date: Sat Dec 3 14:18:36 2016 +0100
  525.  
  526. Correction du bug de la page home
  527.  
  528. commit 91a5d6e0566bf1b1fabd660c9137971a2f0a9bfa
  529. Author: Megane <megane.pau@edu.ece.fr>
  530. Date: Sat Dec 3 12:29:52 2016 +0100
  531.  
  532. misc
  533.  
  534. commit 415b8d29d02a456398093c4429d063f61d2eedf8
  535. Author: Megane <megane.pau@edu.ece.fr>
  536. Date: Sat Dec 3 12:02:02 2016 +0100
  537.  
  538. HTML/CSS homepage
  539.  
  540. commit 679e2bfb023a47ec4087ffe2ad3d79bf296597ea
  541. Author: Megane <megane.pau@edu.ece.fr>
  542. Date: Sat Dec 3 11:25:35 2016 +0100
  543.  
  544. Rectification css arenas
  545.  
  546. commit 5bdc595a1cc772034bc07f7c021212fbc15157de
  547. Author: Megane <megane.pau@edu.ece.fr>
  548. Date: Sat Dec 3 10:44:14 2016 +0100
  549.  
  550. CSS inscription + connexion + inscription/connexion
  551.  
  552. commit 690d3ca2204ba16015b8d87b34721ca09b649f76
  553. Author: Megane <megane.pau@edu.ece.fr>
  554. Date: Sat Dec 3 08:59:48 2016 +0100
  555.  
  556. correction
  557.  
  558. commit 199b54bd7667f687981fb825256b4a9dd7fe76bb
  559. Author: Megane <megane.pau@edu.ece.fr>
  560. Date: Sat Dec 3 08:58:46 2016 +0100
  561.  
  562. FIN CSS SIGHTS
  563.  
  564. commit 514d7c99fff099451e7d87759cac9d3a59e5f960
  565. Merge: 63962f1 1fb9601
  566. Author: Megane <megane.pau@edu.ece.fr>
  567. Date: Sat Dec 3 03:15:50 2016 +0100
  568.  
  569. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  570.  
  571. commit 63962f1116fe9f376740c87b37e40b7bf137092a
  572. Author: Megane <megane.pau@edu.ece.fr>
  573. Date: Sat Dec 3 03:15:32 2016 +0100
  574.  
  575. CSS sights de la map
  576.  
  577. commit 1fb96015a0bf022c83fb9c11049b92f6950dd868
  578. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  579. Date: Sat Dec 3 02:38:43 2016 +0100
  580.  
  581. blindage tools
  582.  
  583. commit 95de06c3242209fc0a90a85816f1e1baf786f71f
  584. Merge: 70df50b 48aa637
  585. Author: Arno <arnaud.petitcol@gmail.com>
  586. Date: Sat Dec 3 00:55:19 2016 +0100
  587.  
  588. merge
  589.  
  590. commit 70df50bffdd0b1ad2a6c69bcf56a291a9d1e8baa
  591. Author: Arno <arnaud.petitcol@gmail.com>
  592. Date: Sat Dec 3 00:54:27 2016 +0100
  593.  
  594. MAIL OK
  595. Début récup mdp
  596.  
  597. commit 48aa637307a2a2f181555bc4df0887b89c780053
  598. Merge: 0d881d1 efcd77c
  599. Author: Marie! <perin.mariemp@gmail.com>
  600. Date: Sat Dec 3 00:16:11 2016 +0100
  601.  
  602. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  603.  
  604. commit 0d881d1e9439756e6bfc8d8b3be731354c095482
  605. Author: Marie! <perin.mariemp@gmail.com>
  606. Date: Sat Dec 3 00:16:03 2016 +0100
  607.  
  608. Début restriction logs
  609.  
  610. commit efcd77c32391637507b0fe2f0c755e0fdf5bb9e0
  611. Author: 4rno <arnaud.petitcol@gmail.com>
  612. Date: Fri Dec 2 22:17:34 2016 +0100
  613.  
  614. server
  615.  
  616. commit 16ecd54ffc9465a6ba30b8cb6439f3a7b51f3685
  617. Author: 4rno <arnaud.petitcol@gmail.com>
  618. Date: Fri Dec 2 21:07:07 2016 +0100
  619.  
  620. modification URL server
  621.  
  622. commit 4095f37f0e84f53942da3f8fe15d11cddc294589
  623. Merge: 2e82bda 6ded1be
  624. Author: 4rno <arnaud.petitcol@gmail.com>
  625. Date: Fri Dec 2 20:57:41 2016 +0100
  626.  
  627. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  628.  
  629. commit 2e82bda6f857b2e2d88bbc984ac69a8c71e4f50f
  630. Author: 4rno <arnaud.petitcol@gmail.com>
  631. Date: Fri Dec 2 20:57:35 2016 +0100
  632.  
  633. kesako ?
  634.  
  635. commit 6ded1be57cee2c0ac452b7eb2ee2b222cb8223dd
  636. Merge: 86bdaa6 74e5e21
  637. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  638. Date: Fri Dec 2 20:03:29 2016 +0100
  639.  
  640. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  641.  
  642. commit 86bdaa632a58684d207ae48afc526e552afa4ddb
  643. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  644. Date: Fri Dec 2 20:02:40 2016 +0100
  645.  
  646. blindage des redirection
  647.  
  648. commit 74e5e2181da58885d926b8c0a2db191deadcf656
  649. Merge: 24ad581 032e0b9
  650. Author: Arno <arnaud.petitcol@gmail.com>
  651. Date: Fri Dec 2 17:46:02 2016 +0100
  652.  
  653. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  654.  
  655. commit 24ad5811ccace1e061a96cffcf83abee5f2d05a4
  656. Author: Arno <arnaud.petitcol@gmail.com>
  657. Date: Fri Dec 2 17:45:49 2016 +0100
  658.  
  659. Blindage connexion
  660.  
  661. commit 032e0b9d4b1c00e1ebc8bf2f94f39da87e688924
  662. Author: Marie! <perin.mariemp@gmail.com>
  663. Date: Fri Dec 2 13:37:36 2016 +0100
  664.  
  665. possibilité mdp clair
  666.  
  667. commit 93642b49e25cc44308c3c2ed577b7c0a6b8f6d35
  668. Merge: a5fb3be 36765d0
  669. Author: Marie! <perin.mariemp@gmail.com>
  670. Date: Fri Dec 2 13:31:03 2016 +0100
  671.  
  672. conflit résolu
  673.  
  674. commit a5fb3be0441e556c7571b062cc3f0c19b7f2cefb
  675. Author: Marie! <perin.mariemp@gmail.com>
  676. Date: Fri Dec 2 13:28:56 2016 +0100
  677.  
  678. hash mdp
  679.  
  680. commit 36765d06c5f2276524c8db2fc58bd05c81c6e585
  681. Author: Arno <arnaud.petitcol@gmail.com>
  682. Date: Fri Dec 2 13:26:37 2016 +0100
  683.  
  684. correction bug login
  685.  
  686. commit 3608465f6ddb0f67c0061afc2bc5c99dca059c8d
  687. Author: Megane <megane.pau@edu.ece.fr>
  688. Date: Fri Dec 2 08:18:42 2016 +0100
  689.  
  690. CSS Diary + New fighter + View Fighter + links corrigés sur le header
  691. !!!!! Augmentation de skills au niveau de viewfighter !!!!!!
  692.  
  693. commit 7f8c8613763f9ec086a9805ffd3a6d26c5a68045
  694. Author: Megane <megane.pau@edu.ece.fr>
  695. Date: Fri Dec 2 00:31:24 2016 +0100
  696.  
  697. lien logout
  698.  
  699. commit 86bf0b256f05bb4358bb2af352def25f2a1a4fa1
  700. Merge: 61a628a 8747a6c
  701. Author: Arno <arnaud.petitcol@gmail.com>
  702. Date: Fri Dec 2 00:07:11 2016 +0100
  703.  
  704. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  705.  
  706. commit 61a628a6a612ab0c709c500f42d1ee220ebafe32
  707. Author: Arno <arnaud.petitcol@gmail.com>
  708. Date: Fri Dec 2 00:06:01 2016 +0100
  709.  
  710. maj lien
  711.  
  712. commit 8747a6c5d94755729005eda6a5a9a4d240ab9d5b
  713. Merge: f497abe 2922d78
  714. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  715. Date: Fri Dec 2 00:05:57 2016 +0100
  716.  
  717. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  718.  
  719. commit f497abe38e7e66d4989220bfc81ea7f4dce336dc
  720. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  721. Date: Fri Dec 2 00:05:49 2016 +0100
  722.  
  723. plus de pb, on peut jouer !
  724.  
  725. commit 2922d78bd14b95002d289577d20b0b50b520fedc
  726. Merge: 8b66789 5178426
  727. Author: Arno <arnaud.petitcol@gmail.com>
  728. Date: Thu Dec 1 23:57:47 2016 +0100
  729.  
  730. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  731.  
  732. commit 8b667896fa18ff5aa28d52547ae32f12c09dbcba
  733. Author: Arno <arnaud.petitcol@gmail.com>
  734. Date: Thu Dec 1 23:56:24 2016 +0100
  735.  
  736. Suppression connexionController
  737.  
  738. commit 517842626987a25eb0fb894457421a2e0d8fbec9
  739. Author: Megane <megane.pau@edu.ece.fr>
  740. Date: Thu Dec 1 23:54:13 2016 +0100
  741.  
  742. correction player_idu
  743.  
  744. commit 8cc48ab9d202b5b38ee151546261388824ca8b28
  745. Merge: 79a0c9c 29c953c
  746. Author: Megane <megane.pau@edu.ece.fr>
  747. Date: Thu Dec 1 23:25:13 2016 +0100
  748.  
  749. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  750.  
  751. commit 79a0c9cc280c852f2e911096e1dddff0f560cc2e
  752. Author: Megane <megane.pau@edu.ece.fr>
  753. Date: Thu Dec 1 23:24:51 2016 +0100
  754.  
  755. misc
  756.  
  757. commit a401123fe0317147e3ef5dc0a890f4cba9fb038a
  758. Merge: 2999e13 89bbc19
  759. Author: Megane <megane.pau@edu.ece.fr>
  760. Date: Thu Dec 1 23:24:40 2016 +0100
  761.  
  762. conflits réglés (lien au diary et délires de sessions bougés sur loggedin.ctp)
  763. !!!!! pb au niveau de l'inscription et l'ID récup à la connexion player_idu['User']['id'] ('id' non défini?)
  764.  
  765. commit 29c953ca5f158f69db3d134cbd804dc15f72b81e
  766. Author: Marie! <perin.mariemp@gmail.com>
  767. Date: Thu Dec 1 23:10:48 2016 +0100
  768.  
  769. reparation
  770.  
  771. commit ea1a2398e8a57983dd13f610b6fe6389cc6e265b
  772. Merge: 25e1c1d 89bbc19
  773. Author: Marie! <perin.mariemp@gmail.com>
  774. Date: Thu Dec 1 22:31:09 2016 +0100
  775.  
  776. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  777.  
  778. commit 25e1c1d69ecd361818554c50a6e20a9c6a4596e1
  779. Author: Marie! <perin.mariemp@gmail.com>
  780. Date: Thu Dec 1 22:30:52 2016 +0100
  781.  
  782. test
  783.  
  784. commit 2999e13abeae53e3ddc80edced951e4b44eb9642
  785. Author: Megane <megane.pau@edu.ece.fr>
  786. Date: Thu Dec 1 22:28:31 2016 +0100
  787.  
  788. CSS : header + footer de base; page fighters
  789.  
  790. commit 89bbc198359ad2f947f36b54dc3bd8ce8735809b
  791. Merge: 0e81650 5ce056c
  792. Author: Marie! <perin.mariemp@gmail.com>
  793. Date: Thu Dec 1 22:14:54 2016 +0100
  794.  
  795. ..
  796.  
  797. commit 0e816502eb98d2a5568d7428fb1f1935a3224051
  798. Author: Marie! <perin.mariemp@gmail.com>
  799. Date: Thu Dec 1 22:13:25 2016 +0100
  800.  
  801. reparation
  802.  
  803. commit 5ce056c208f22d054acde630b6a169417f80fafa
  804. Merge: 93bb6f0 8adbe31
  805. Author: Marie! <perin.mariemp@gmail.com>
  806. Date: Thu Dec 1 21:55:15 2016 +0100
  807.  
  808. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  809.  
  810. # Conflicts:
  811. # nbproject/private/private.xml
  812. # src/Controller/ArenasController.php
  813. # src/Controller/SightsController.php
  814. # src/Model/Table/EventsTable.php
  815.  
  816. commit 93bb6f02b5585f6ed7a111a3da81cc8c0c537cd1
  817. Author: Marie! <perin.mariemp@gmail.com>
  818. Date: Thu Dec 1 21:42:19 2016 +0100
  819.  
  820. début action point
  821.  
  822. commit 8adbe3162d347fb878bdd5e52829f126c7947efe
  823. Merge: f5524c9 b939caf
  824. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  825. Date: Thu Dec 1 21:11:07 2016 +0100
  826.  
  827. no message
  828.  
  829. commit f5524c9db68405918dea921044df8a3f538f4d39
  830. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  831. Date: Thu Dec 1 21:10:25 2016 +0100
  832.  
  833. remettre en gitignore
  834.  
  835. commit b939cafeddaf049f72b8a37b81a45fe5bc073892
  836. Author: Arno <arnaud.petitcol@gmail.com>
  837. Date: Thu Dec 1 19:54:23 2016 +0100
  838.  
  839. correction type .ctp
  840.  
  841. commit d1d266b4c9c4b72ac0936010927d57c53af110f7
  842. Author: Arno <arnaud.petitcol@gmail.com>
  843. Date: Thu Dec 1 19:54:09 2016 +0100
  844.  
  845. Nettoyage code
  846.  
  847. commit f7d0cb4291315ff7b164dd0f1584c3b997dadbb7
  848. Merge: 7f29249 ef9e8c2
  849. Author: Arno <arnaud.petitcol@gmail.com>
  850. Date: Thu Dec 1 18:55:59 2016 +0100
  851.  
  852. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  853.  
  854. commit 7f29249071b5ed394ea56e6df5481d75c68d3c09
  855. Author: Arno <arnaud.petitcol@gmail.com>
  856. Date: Thu Dec 1 18:55:52 2016 +0100
  857.  
  858. co facebook
  859.  
  860. commit ef9e8c2a1d405c5a843c18154dc60f09a0cf9fd7
  861. Merge: 63d217e 3e42fdf
  862. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  863. Date: Thu Dec 1 18:11:00 2016 +0100
  864.  
  865. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  866.  
  867. commit 63d217e6889d8b81a4a452146b5c9c0bc08681e5
  868. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  869. Date: Thu Dec 1 18:10:48 2016 +0100
  870.  
  871. ajout des compétences fini
  872.  
  873. commit 3e42fdf584004feeb57b8887c1d9cc0d55caeaa3
  874. Author: 4rno <arnaud.petitcol@gmail.com>
  875. Date: Thu Dec 1 17:56:56 2016 +0100
  876.  
  877. ?
  878.  
  879. commit 2e12eb52eb759d904b368014da01a0f0f05ddc50
  880. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  881. Date: Thu Dec 1 17:54:22 2016 +0100
  882.  
  883. augmentation level et compétence
  884.  
  885. commit 0ee3104c6b2b7f280d0d73f8c0657d3b44bb202c
  886. Merge: 0d4ee8d a2233aa
  887. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  888. Date: Thu Dec 1 16:27:26 2016 +0100
  889.  
  890. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  891.  
  892. commit 0d4ee8daa64d9954592bf23338aa0819e44c615b
  893. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  894. Date: Thu Dec 1 16:27:17 2016 +0100
  895.  
  896. réglage des bugs+page diary mais sans limite de 24h
  897.  
  898. commit a2233aabfaf5740fb2cf479718d348a9f62658d2
  899. Merge: 4a39d9a f332efa
  900. Author: 4rno <arnaud.petitcol@gmail.com>
  901. Date: Thu Dec 1 16:01:30 2016 +0100
  902.  
  903. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  904.  
  905. commit 4a39d9a7fb5be7f1c231b485c7264a210c6c32c4
  906. Author: 4rno <arnaud.petitcol@gmail.com>
  907. Date: Thu Dec 1 16:01:19 2016 +0100
  908.  
  909. Suite co facebook
  910.  
  911. commit f332efaaef10fc75c2cb160289edc91ad7bf8e66
  912. Author: Megane <megane.pau@edu.ece.fr>
  913. Date: Thu Dec 1 14:33:14 2016 +0100
  914.  
  915. misc
  916.  
  917. commit 4d957a5943b5ec57b0ad6d624e11767c4b7590d4
  918. Merge: 7b43af6 290a84e
  919. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  920. Date: Thu Dec 1 14:29:30 2016 +0100
  921.  
  922. no message
  923.  
  924. commit 7b43af659ad1cb86e38232161aea0a20203fa6f0
  925. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  926. Date: Thu Dec 1 14:28:43 2016 +0100
  927.  
  928. variable de session+ gestion des différents perso d'un mm joueur
  929.  
  930. commit 290a84ec296d3a84e98f6aee7660822d53f0bf7b
  931. Author: 4rno <arnaud.petitcol@gmail.com>
  932. Date: Thu Dec 1 14:06:49 2016 +0100
  933.  
  934. server suite
  935.  
  936. commit c2fad420f6b72d3689a7666842005c0135f2723c
  937. Author: 4rno <arnaud.petitcol@gmail.com>
  938. Date: Thu Dec 1 11:47:32 2016 +0100
  939.  
  940. Ajout server
  941.  
  942. commit 7d952ac1cb2ffd06669feed16835d945050ee76f
  943. Merge: 65cfe97 195b23b
  944. Author: Arno <arnaud.petitcol@gmail.com>
  945. Date: Thu Dec 1 10:37:14 2016 +0100
  946.  
  947. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  948.  
  949. commit 65cfe9788dc9ccd9fd46b17dfac59d1db84cbcc5
  950. Author: Arno <arnaud.petitcol@gmail.com>
  951. Date: Thu Dec 1 10:37:07 2016 +0100
  952.  
  953. Nettoyage google
  954. Avancement FB
  955.  
  956. commit 195b23b7b717f01d4844f3e7ae222909458c6339
  957. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  958. Date: Thu Dec 1 02:37:08 2016 +0100
  959.  
  960. blindage bonus+ attaque aléatoire en fonction de la force+ diary controller
  961.  
  962. commit 1b38772e578a2d0c16e78d10d7686c3fbeaf8920
  963. Merge: 2b0406b db0bf08
  964. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  965. Date: Wed Nov 30 15:50:59 2016 +0100
  966.  
  967. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  968.  
  969. commit 2b0406b6a96c0d666d52d17d7b995f4c42a91769
  970. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  971. Date: Wed Nov 30 15:50:47 2016 +0100
  972.  
  973. gestion de tous les bonus: ramasser, lacher, augmenter les skills du perso
  974.  
  975. commit db0bf086039cc1787ea4f3cf2adb1c60034cbe0f
  976. Author: Marie! <perin.mariemp@gmail.com>
  977. Date: Wed Nov 30 15:00:47 2016 +0100
  978.  
  979. reparation conflit
  980.  
  981. commit 9c717c30f5417d75273a743ddf567679b1362cf7
  982. Merge: 84a4d79 5ee172b
  983. Author: Marie! <perin.mariemp@gmail.com>
  984. Date: Wed Nov 30 14:58:53 2016 +0100
  985.  
  986. conflit
  987.  
  988. commit 84a4d7945c9d10285e083014eea7bb83aa82f261
  989. Author: Marie! <perin.mariemp@gmail.com>
  990. Date: Wed Nov 30 14:57:08 2016 +0100
  991.  
  992. avancement fb
  993.  
  994. commit 5ee172bac5b0135e74fb89448378d3c5f8f47394
  995. Merge: 1bbec31 c783465
  996. Author: Arno <arnaud.petitcol@gmail.com>
  997. Date: Wed Nov 30 14:52:12 2016 +0100
  998.  
  999. conflit resolution
  1000.  
  1001. commit 1bbec31b3195c60beca610ceb1087b6cf87d5026
  1002. Author: Arno <arnaud.petitcol@gmail.com>
  1003. Date: Wed Nov 30 14:45:56 2016 +0100
  1004.  
  1005. Connexion Google : Ca marche
  1006.  
  1007. commit c78346518f99959f6f84fddca0bbd8827ef17fa0
  1008. Merge: 60a3d38 ac83c19
  1009. Author: Marie! <perin.mariemp@gmail.com>
  1010. Date: Wed Nov 30 13:25:13 2016 +0100
  1011.  
  1012. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  1013.  
  1014. # Conflicts:
  1015. # src/Controller/AppController.php
  1016.  
  1017. commit 60a3d38f9ea1956e5097e0be92866e59f2a38147
  1018. Author: Marie! <perin.mariemp@gmail.com>
  1019. Date: Wed Nov 30 13:23:00 2016 +0100
  1020.  
  1021. inscription OK ! + redirection sur CREATE FIGHTER de mégane
  1022.  
  1023. commit ac83c19a0dad53157d949e29a7511293b7c5e96a
  1024. Author: Megane <megane.pau@edu.ece.fr>
  1025. Date: Wed Nov 30 12:08:57 2016 +0100
  1026.  
  1027. correction creatino fighteer
  1028.  
  1029. commit 471e33db619c173b404f539d058b415857fc4eeb
  1030. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1031. Date: Wed Nov 30 11:53:38 2016 +0100
  1032.  
  1033. plus de conflit
  1034.  
  1035. commit 540c0e889af19c748df5de28143b7d44f6fa58e1
  1036. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1037. Date: Wed Nov 30 11:52:58 2016 +0100
  1038.  
  1039. plus de conflits
  1040.  
  1041. commit 33e456d23f6dff1d0c59963ab8c066b5db314ea1
  1042. Merge: 1a809c4 38ea4ae
  1043. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1044. Date: Wed Nov 30 11:49:52 2016 +0100
  1045.  
  1046. no message
  1047.  
  1048. commit 1a809c45b3e210fa33015c4c6fa2db8f8cdac3e3
  1049. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1050. Date: Wed Nov 30 11:48:49 2016 +0100
  1051.  
  1052. affiche sur la carte les perso n'appartenant pas a un mm joueur
  1053.  
  1054. commit 38ea4ae05a7ba11b822c15b3712304eeb55f75c4
  1055. Merge: c673a98 22ca3a0
  1056. Author: Marie! <perin.mariemp@gmail.com>
  1057. Date: Wed Nov 30 11:38:58 2016 +0100
  1058.  
  1059. conflit
  1060.  
  1061. commit c673a98d72521286c37f07d0833549d46e8d6c01
  1062. Author: Marie! <perin.mariemp@gmail.com>
  1063. Date: Wed Nov 30 11:34:00 2016 +0100
  1064.  
  1065. ..
  1066.  
  1067. commit 22ca3a03173f0a33c66118bc1333de5aa830d05f
  1068. Merge: a336819 e65c33d
  1069. Author: Arno <arnaud.petitcol@gmail.com>
  1070. Date: Wed Nov 30 11:33:10 2016 +0100
  1071.  
  1072. ça avance, ça avance ..
  1073.  
  1074. commit a336819d6d8980d08fbc5001f9e49fede5929ba6
  1075. Author: Arno <arnaud.petitcol@gmail.com>
  1076. Date: Wed Nov 30 11:30:13 2016 +0100
  1077.  
  1078. Fusion
  1079.  
  1080. commit e65c33de505c835551628e4cc62e015ef2d2a81a
  1081. Merge: a698c81 4297456
  1082. Author: Marie! <perin.mariemp@gmail.com>
  1083. Date: Wed Nov 30 10:56:55 2016 +0100
  1084.  
  1085. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  1086.  
  1087. # Conflicts:
  1088. # nbproject/private/private.xml
  1089. # src/Controller/AppController.php
  1090.  
  1091. commit a698c8106bb2c6e6aba0c68d0a26cd6cc1728917
  1092. Author: Marie! <perin.mariemp@gmail.com>
  1093. Date: Wed Nov 30 10:54:32 2016 +0100
  1094.  
  1095. co fb (début)
  1096.  
  1097. commit 4297456a1f46bac84cbe47a30c7b05a25b93d554
  1098. Author: Megane <megane.pau@edu.ece.fr>
  1099. Date: Wed Nov 30 10:40:02 2016 +0100
  1100.  
  1101. misc
  1102.  
  1103. commit 87e4604b2a0c70f3fbb1beef052a116feb4c26b2
  1104. Author: Megane <megane.pau@edu.ece.fr>
  1105. Date: Wed Nov 30 08:44:28 2016 +0100
  1106.  
  1107. fonctions adaptées à l'utilisation de la session
  1108.  
  1109. commit a239a102a163c921467e83727e2633c3efc24c97
  1110. Author: Megane <megane.pau@edu.ece.fr>
  1111. Date: Wed Nov 30 08:22:43 2016 +0100
  1112.  
  1113. buttons
  1114.  
  1115. commit 224adff7b0877fb5f826d3e01e534db858e9fe85
  1116. Author: Megane <megane.pau@edu.ece.fr>
  1117. Date: Wed Nov 30 08:00:29 2016 +0100
  1118.  
  1119. view fighter + création css
  1120.  
  1121. commit 35edadd8e09afd10696e735908a2625b2588e51e
  1122. Author: Megane <megane.pau@edu.ece.fr>
  1123. Date: Wed Nov 30 03:52:45 2016 +0100
  1124.  
  1125. link vers sights en post
  1126.  
  1127. commit e8a817c2a2bc8d4d287b146f575e958fbdbbee1c
  1128. Author: Megane <megane.pau@edu.ece.fr>
  1129. Date: Wed Nov 30 03:46:18 2016 +0100
  1130.  
  1131. Lien vers Sights (play with this fighter)
  1132.  
  1133. commit ec71e62ad4848e0f352e5c9ecac0115ece07cd2a
  1134. Author: Megane <megane.pau@edu.ece.fr>
  1135. Date: Wed Nov 30 03:25:26 2016 +0100
  1136.  
  1137. suppression avatar après suppression du fighter
  1138.  
  1139. commit 268e9b6d4fb9bd7280743fe783dcad69ed991fdd
  1140. Author: Megane <megane.pau@edu.ece.fr>
  1141. Date: Wed Nov 30 03:02:07 2016 +0100
  1142.  
  1143. Fighter creation OK
  1144.  
  1145. commit 1063d19178de04521f24c5017b800ef0e730b091
  1146. Author: Megane <megane.pau@edu.ece.fr>
  1147. Date: Wed Nov 30 02:24:24 2016 +0100
  1148.  
  1149. typo
  1150.  
  1151. commit 03b4f4cd0e2c55c82ad76a424705814f843b723d
  1152. Author: Megane <megane.pau@edu.ece.fr>
  1153. Date: Wed Nov 30 02:23:36 2016 +0100
  1154.  
  1155. auth allow corrigé
  1156.  
  1157. commit ab8c544d2e4401ae38171d1ee7946bb48b0c3008
  1158. Merge: ef6dd95 3a04615
  1159. Author: Megane <megane.pau@edu.ece.fr>
  1160. Date: Wed Nov 30 02:20:40 2016 +0100
  1161.  
  1162. images jpg + png
  1163. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  1164.  
  1165. # Conflicts:
  1166. # src/Controller/AppController.php
  1167.  
  1168. commit ef6dd95f80cee175eff918d9e7e1b5b3e8202d22
  1169. Author: Megane <megane.pau@edu.ece.fr>
  1170. Date: Wed Nov 30 02:05:03 2016 +0100
  1171.  
  1172. affichage fighters avatars pour jpg et png
  1173.  
  1174. commit 3a04615314ecda5857c31a9df11a9570aa4b236f
  1175. Merge: 3e98364 84c9058
  1176. Author: Marie! <perin.mariemp@gmail.com>
  1177. Date: Tue Nov 29 23:48:37 2016 +0100
  1178.  
  1179. merge
  1180.  
  1181. commit 3e983641a72361bf4432da29305bdb953df4982c
  1182. Author: Marie! <perin.mariemp@gmail.com>
  1183. Date: Tue Nov 29 23:43:37 2016 +0100
  1184.  
  1185. Début Facebook
  1186.  
  1187. commit 84c90582570008c6d37a14a6703c4410c6be5bc5
  1188. Merge: a7c60ee 48f53f4
  1189. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1190. Date: Tue Nov 29 20:37:09 2016 +0100
  1191.  
  1192. conflit
  1193.  
  1194. commit a7c60eef22d3e7bea90eb2e028ca7a3587be48cb
  1195. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1196. Date: Tue Nov 29 20:34:50 2016 +0100
  1197.  
  1198. fin attaque + mise en place BONUS
  1199.  
  1200. commit 48f53f4cfa6a364bf10830fe66f09f3ab8853d51
  1201. Author: Megane <megane.pau@edu.ece.fr>
  1202. Date: Tue Nov 29 18:48:01 2016 +0100
  1203.  
  1204. Affichage fighters + suppression fighters fonctionnelles
  1205.  
  1206. commit fc3ca392783b3e239a64a9d0ea5b94f6d1bd44aa
  1207. Author: Megane <megane.pau@edu.ece.fr>
  1208. Date: Tue Nov 29 04:42:14 2016 +0100
  1209.  
  1210. Déplacement fonctions + modif(début) + supprimer fighter + liens
  1211.  
  1212. commit 2aeb7dd5b0f99d5b4532479ad3e7ef0c913acce8
  1213. Author: Megane <megane.pau@edu.ece.fr>
  1214. Date: Tue Nov 29 03:41:47 2016 +0100
  1215.  
  1216. Vue des Fighters + modif avatars
  1217.  
  1218. commit 2e9e193b1379f595c1538c866cb94b351586ffa0
  1219. Merge: f1d0b92 4006c05
  1220. Author: Arno <arnaud.petitcol@gmail.com>
  1221. Date: Mon Nov 28 23:16:55 2016 +0100
  1222.  
  1223. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  1224.  
  1225. # Conflicts:
  1226. # nbproject/private/private.xml
  1227.  
  1228. commit f1d0b9232acbcd56d48fad94f773e2d7b3743c0f
  1229. Author: Arno <arnaud.petitcol@gmail.com>
  1230. Date: Mon Nov 28 23:15:42 2016 +0100
  1231.  
  1232. Début du rassemblement
  1233.  
  1234. commit 4006c056d99c02be6a02b5d3f7a20a12810b09ec
  1235. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1236. Date: Mon Nov 28 21:38:55 2016 +0100
  1237.  
  1238. attaque et gestion des évènements
  1239.  
  1240. commit 99cd709f53cdd5183086fb91da6f7397a092ba88
  1241. Merge: 6a7047d 6cf85ec
  1242. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1243. Date: Mon Nov 28 20:24:48 2016 +0100
  1244.  
  1245. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  1246.  
  1247. commit 6a7047dc0fd338a2fc7d53d99f0787a4e3e6eca9
  1248. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1249. Date: Mon Nov 28 20:21:13 2016 +0100
  1250.  
  1251. affichage qui prend en commpte la vue du perso
  1252.  
  1253. commit 6cf85ec9e13f5392ebd028225a61cd9873c6b16a
  1254. Author: Megane <megane.pau@edu.ece.fr>
  1255. Date: Mon Nov 28 07:23:12 2016 +0100
  1256.  
  1257. typo corrigée
  1258.  
  1259. commit 9f76b9f470eab6306539cf3ec72af0c92d5d26fa
  1260. Author: Megane <megane.pau@edu.ece.fr>
  1261. Date: Mon Nov 28 07:20:08 2016 +0100
  1262.  
  1263. CHANTIER DE LA MORT : ajout nouveau fighter database + form ajout nouveau fighter (avec avatar) + voir un fighter
  1264.  
  1265. commit ad43c8ca83fc0e12912571638725b36b32c0a53f
  1266. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1267. Date: Sun Nov 27 11:32:18 2016 +0100
  1268.  
  1269. déplacement bouton + début attaque par clic sur perso
  1270.  
  1271. commit 3ae395ebd9c7e311bcd6ea54a914d44830cd878f
  1272. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1273. Date: Wed Nov 23 02:06:14 2016 +0100
  1274.  
  1275. déplacements complets + chargements des images en fonction des persos
  1276. j'ai supp. le gazon de la table surroundings
  1277.  
  1278. commit 29f0087c4581e8eaa6e7de816da3398717bb7b01
  1279. Merge: 0a85061 75f49a0
  1280. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1281. Date: Tue Nov 22 16:56:14 2016 +0100
  1282.  
  1283. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  1284.  
  1285. # Conflicts:
  1286. # nbproject/private/private.xml
  1287.  
  1288. commit 0a85061832310e1bc0e7eb1c71596b987d17a4a2
  1289. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1290. Date: Tue Nov 22 16:54:57 2016 +0100
  1291.  
  1292. déplacements
  1293.  
  1294. commit 75f49a01a5cc102274e0b30acfc3e40323d5315a
  1295. Author: Arno <arnaud.petitcol@gmail.com>
  1296. Date: Tue Nov 22 16:53:12 2016 +0100
  1297.  
  1298. Lien Google+ et Inscription
  1299.  
  1300. commit 79080795d75cd789c478f06f371ff78b39786d93
  1301. Merge: 1966856 bd3bf99
  1302. Author: Marie! <perin.mariemp@gmail.com>
  1303. Date: Tue Nov 22 15:37:56 2016 +0100
  1304.  
  1305. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  1306.  
  1307. # Conflicts:
  1308. # nbproject/private/private.xml
  1309. # src/Controller/ConnexionController.php
  1310. # src/Template/Connexion/index.ctp
  1311.  
  1312. commit 196685667da9d6f39ecbcf448bd650586e702957
  1313. Author: Marie! <perin.mariemp@gmail.com>
  1314. Date: Tue Nov 22 15:33:21 2016 +0100
  1315.  
  1316. création fighters
  1317.  
  1318. commit bd3bf99ac75f49f41e13a9611138e5d4cd15d942
  1319. Author: Arno <arnaud.petitcol@gmail.com>
  1320. Date: Tue Nov 22 15:30:48 2016 +0100
  1321.  
  1322. Connexion bdd
  1323.  
  1324. commit d7860787cc25f12ad8c1436a53cde9b2ec4de7cf
  1325. Author: Marie! <perin.mariemp@gmail.com>
  1326. Date: Sun Nov 20 19:06:31 2016 +0100
  1327.  
  1328. connexion google qui marche pas
  1329.  
  1330. commit b6b34f6a3f566fba6967c52c7f7929dd189263f3
  1331. Merge: df08f63 c3c6c53
  1332. Author: Marie! <perin.mariemp@gmail.com>
  1333. Date: Sun Nov 20 13:53:06 2016 +0100
  1334.  
  1335. Merge branch 'master' of https://bitbucket.org/teaming4/web_project
  1336.  
  1337. commit df08f63352fba4010c4c389b7a9a7b0a0d20ec9c
  1338. Author: Marie! <perin.mariemp@gmail.com>
  1339. Date: Sun Nov 20 13:52:00 2016 +0100
  1340.  
  1341. Revert "tout dans arneascontroller"
  1342.  
  1343. This reverts commit 8b64de5a45956006f9a0f7c036932cf744fb49f7.
  1344.  
  1345. commit 8b64de5a45956006f9a0f7c036932cf744fb49f7
  1346. Author: Marie! <perin.mariemp@gmail.com>
  1347. Date: Sun Nov 20 13:48:41 2016 +0100
  1348.  
  1349. tout dans arneascontroller
  1350.  
  1351. Dans composer.json, dans "require-dev" rajouter la ligne "google/apiclient": "1.0.*@beta"
  1352. toujours dans composer.json, dans "autoload" rajouter "Google\\": "./vendor/google/apiclient"
  1353.  
  1354. Dans la console windows :
  1355. cd C:\wamp64\www\webarena_group_SI3-03-AG
  1356. composer update
  1357.  
  1358. commit c3c6c5395ae16a1c60e94f0b3e912b4db2a7ad2b
  1359. Author: Arno <arnaud.petitcol@gmail.com>
  1360. Date: Sun Nov 20 11:43:06 2016 +0100
  1361.  
  1362. Début Session
  1363.  
  1364. commit af485247990a2f38a50300b7203658fb358b50ad
  1365. Author: Arno <arnaud.petitcol@gmail.com>
  1366. Date: Fri Nov 18 12:05:03 2016 +0100
  1367.  
  1368. Chantier, gros dawa
  1369.  
  1370. commit 60df402faa2a7dd4c908700d024c17bd19f73a80
  1371. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1372. Date: Fri Nov 11 20:53:24 2016 +0100
  1373.  
  1374. vue+déplacement haut (incomplet)
  1375.  
  1376. commit b06e297546abfe65f4673262b255905b77356461
  1377. Author: Marie! <perin.mariemp@gmail.com>
  1378. Date: Thu Nov 10 14:01:11 2016 +0100
  1379.  
  1380. fin de l'inscription (pas lightbox)
  1381.  
  1382. commit 9baf31754ae43120f1ca97cfd0777de4c3828ef4
  1383. Merge: 194ef0e 3a5c21e
  1384. Author: Arno <arnaud.petitcol@gmail.com>
  1385. Date: Thu Nov 10 13:44:32 2016 +0100
  1386.  
  1387. Conflit
  1388.  
  1389. commit 194ef0e456a4ca9f06e30cfad35a0ac11facdb00
  1390. Author: Arno <arnaud.petitcol@gmail.com>
  1391. Date: Thu Nov 10 13:42:16 2016 +0100
  1392.  
  1393. [CONNEXION] Vérification log in
  1394.  
  1395. commit 3a5c21e454222f38b96835db4879158ef695df40
  1396. Author: Marie! <perin.mariemp@gmail.com>
  1397. Date: Thu Nov 10 13:27:54 2016 +0100
  1398.  
  1399. inscription player
  1400.  
  1401. commit dff2e5f3d3f89063574d01b12964d46a4af86ba2
  1402. Merge: 9d0d145 c3e9db7
  1403. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1404. Date: Wed Nov 9 23:08:15 2016 +0100
  1405.  
  1406. Mise en place map avec visuel
  1407.  
  1408. commit 9d0d145771f355fd609872ee364f9b6d811366f4
  1409. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1410. Date: Wed Nov 9 20:56:59 2016 +0100
  1411.  
  1412. modification home.ctp
  1413.  
  1414. commit c3e9db7fa4c5f6f9c6753504b8792f8e0a335670
  1415. Merge: 7863c55 5f62a62
  1416. Author: Arno <arnaud.petitcol@gmail.com>
  1417. Date: Tue Nov 8 14:17:14 2016 +0100
  1418.  
  1419. nbproject/private/private.xml -> truc chelou à mettre en gitignore ?
  1420.  
  1421. commit 7863c5531a448b67ec2f2be4d00ad4c280bbe692
  1422. Author: Arno <arnaud.petitcol@gmail.com>
  1423. Date: Tue Nov 8 14:08:55 2016 +0100
  1424.  
  1425. Début de la partie Connexion
  1426.  
  1427. commit 5f62a625c8e75fbfa85c1a2679a436e454b608fe
  1428. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1429. Date: Tue Nov 8 00:06:04 2016 +0100
  1430.  
  1431. sight view
  1432.  
  1433. commit a4738a4698671639e24bea4837bcb7b760145497
  1434. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1435. Date: Mon Nov 7 21:09:00 2016 +0100
  1436.  
  1437. home page + map grid
  1438.  
  1439. commit c1e8911c74fabd5b5eb660a31684d91bf179da24
  1440. Merge: 9e92f31 0c2621f
  1441. Author: Arno <arnaud.petitcol@gmail.com>
  1442. Date: Wed Oct 26 12:28:00 2016 +0200
  1443.  
  1444. tp3
  1445.  
  1446. commit 9e92f31cd7464385371d07aec18ce6e4c08c9c89
  1447. Author: Arno <arnaud.petitcol@gmail.com>
  1448. Date: Wed Oct 26 12:23:39 2016 +0200
  1449.  
  1450. TP3
  1451.  
  1452. commit 0c2621f038ab4919ed5fe802a6e27d99b264929d
  1453. Author: jolyannebn <jolyanne.boivin@edu.ece.fr>
  1454. Date: Wed Oct 26 12:21:43 2016 +0200
  1455.  
  1456. tp3
  1457.  
  1458. commit 787839a66e2fa71abd1dac8f5ef3be85471b669a
  1459. Author: Arno <arnaud.petitcol@gmail.com>
  1460. Date: Sun Oct 23 19:23:54 2016 +0200
  1461.  
  1462. Fin TP Datas Management
  1463.  
  1464. commit 9a2abbbd1f0f913f806ddcffa6c6a22568e616e5
  1465. Author: Arno <arnaud.petitcol@gmail.com>
  1466. Date: Sun Oct 23 17:50:29 2016 +0200
  1467.  
  1468. Premier commit
  1469. (END)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!