API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jan 8th, 2016
95
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 28.86 KB | None | 0 0
raw download clone embed print report
  1. commit 89fce6be49cd565972cf21fca933159304093bf1
  2. Author: Alejandro Prado Perez <apradop@indra.es>
  3. Date: Tue Dec 29 18:15:15 2015 +0100
  4.  
  5. Logout and retrievePassword fixes
  6.  
  7. commit 001469e560b8dc00f64f8fa898fa9018fb64ab3f
  8. Merge: ca9b0fa 0405bb2
  9. Author: Alejandro Prado Perez <apradop@indra.es>
  10. Date: Tue Dec 29 15:10:24 2015 +0100
  11.  
  12. Merge branch 'develop' into develop-alex
  13.  
  14. commit ca9b0fa4c9f8b6cbd04020d2de59d523e0b38741
  15. Author: Alejandro Prado Perez <apradop@indra.es>
  16. Date: Tue Dec 29 15:08:06 2015 +0100
  17.  
  18. Fix url error login, fix logout in spanish
  19.  
  20. commit 7e9cf8da3fd61f6e2e2cdfa2bd619f514a910c80
  21. Author: Alejandro Prado Perez <apradop@indra.es>
  22. Date: Fri Dec 4 14:52:18 2015 +0100
  23.  
  24. Fix for login
  25.  
  26. commit b1d2e60c29525310c70b33c8991fcab4ee29b7b7
  27. Author: Alejandro Prado Perez <apradop@indra.es>
  28. Date: Fri Dec 4 14:18:40 2015 +0100
  29.  
  30. Fixes for urls
  31.  
  32. commit 695c3933e5c26d5970c32a1eef0e11be7fdb544e
  33. Author: Alejandro Prado Perez <apradop@indra.es>
  34. Date: Fri Dec 4 13:04:16 2015 +0100
  35.  
  36. Fix login/logout/retrievepassword for spanish
  37.  
  38. commit 4f83433d7c988cd06b8f0f964fd69304cacef90b
  39. Merge: 7bcd00b 57d9a81
  40. Author: Alejandro Prado Perez <apradop@indra.es>
  41. Date: Wed Dec 2 13:12:06 2015 +0100
  42.  
  43. Merge branch 'develop' into feature/mailRoute
  44.  
  45. Conflicts:
  46. etcdao-impl/src/main/java/com/tms/tms4web/etc/etcdao/adapter/MemberAdapter.java
  47. etcweb-web/src/main/java/com/tms/tms4web/etc/common/security/ConstantEtcUser.java
  48. etcweb-web/src/main/java/com/tms/tms4web/etc/common/security/EtcUserController.java
  49. etcweb-web/src/main/java/com/tms/tms4web/etc/common/security/EtcUserDaoImpl.java
  50.  
  51. commit 7bcd00bba13cefbb50553151c35da4231f41e745
  52. Author: Alejandro Prado Perez <apradop@indra.es>
  53. Date: Wed Dec 2 13:09:49 2015 +0100
  54.  
  55. Fixes after merge
  56.  
  57. commit f3379ff7c0f6c22230deaf3fe96ac54d2008bffa
  58. Author: Alejandro Prado Perez <apradop@indra.es>
  59. Date: Wed Dec 2 11:24:05 2015 +0100
  60.  
  61. Merge with develop
  62.  
  63. commit 3b3b02aff80f5c66a0d94c5d0e8e7b3c98108d44
  64. Author: Alejandro Prado Perez <apradop@indra.es>
  65. Date: Wed Dec 2 09:40:05 2015 +0100
  66.  
  67. Control de errores en recuperar contraseña; Mejoras en el tratamiento de excepciones para la recuperación de un usuario de BBDD.
  68.  
  69. commit d5e9d4536e7483306fde88ebbd93a331def72edb
  70. Author: Alejandro Prado Perez <apradop@indra.es>
  71. Date: Tue Dec 1 12:01:16 2015 +0100
  72.  
  73. Fixes for pull request
  74.  
  75. commit e56f26658f92295ed3a6d7d1d2faacde38a411d3
  76. Author: Alejandro Prado Perez <apradop@indra.es>
  77. Date: Tue Dec 1 10:26:55 2015 +0100
  78.  
  79. Removed unnecessary line
  80.  
  81. commit c1e4bfef9ba03cdd0f2c00f4e5e39fb01c9da000
  82. Author: Alejandro Prado Perez <apradop@indra.es>
  83. Date: Tue Dec 1 10:15:17 2015 +0100
  84.  
  85. Retrieve password error control
  86.  
  87. commit c477574276bafcc9c1d5948d79a1f12c346eef1d
  88. Author: Alejandro Prado Perez <apradop@indra.es>
  89. Date: Mon Nov 30 15:49:35 2015 +0100
  90.  
  91. no message
  92.  
  93. commit 29d995950e3f137ad82bac83bc52396da063a1f1
  94. Author: Alejandro Prado Perez <apradop@indra.es>
  95. Date: Mon Nov 30 15:46:16 2015 +0100
  96.  
  97. <scope>compile</scope> for ota-impl in etc-web/pom.xml
  98.  
  99. commit 691e9920e491787fcb9ba789c2144b07db9fb1c3
  100. Merge: 6f16cbe 31e0355
  101. Author: Alejandro Prado Perez <apradop@indra.es>
  102. Date: Mon Nov 30 14:06:56 2015 +0100
  103.  
  104. Merge branch 'develop' into feature/mailRoute
  105.  
  106. commit 6f16cbe0dfa5187b516b16c98e7e4556408038f7
  107. Author: Alejandro Prado Perez <apradop@indra.es>
  108. Date: Mon Nov 30 14:06:30 2015 +0100
  109.  
  110. Deleted dummy retrieve password mail
  111.  
  112. commit f515037ce72ee22460d8bf331d2fcba1ea477b62
  113. Author: Alejandro Prado Perez <apradop@indra.es>
  114. Date: Mon Nov 30 13:44:39 2015 +0100
  115.  
  116. Added log line
  117.  
  118. commit 78a857e77ddb90ffb06657ec720c326dc7aa9048
  119. Author: Alejandro Prado Perez <apradop@indra.es>
  120. Date: Mon Nov 30 12:06:00 2015 +0100
  121.  
  122. Dummy testing for mailing
  123.  
  124. commit f2b99a414635ca4110dcdb3a08d04e789913afa8
  125. Merge: e6e4682 b34c65a
  126. Author: Alejandro Prado Perez <apradop@indra.es>
  127. Date: Mon Nov 30 11:48:43 2015 +0100
  128.  
  129. Merge branch 'develop' into feature/mailRoute
  130.  
  131. commit e6e46820a4d76cd46177f1263bc43f319336c407
  132. Merge: 0b32719 a5eee34
  133. Author: Alejandro Prado Perez <apradop@indra.es>
  134. Date: Fri Nov 27 13:35:54 2015 +0100
  135.  
  136. Merge branch 'feature/mailRoute' of https://gitlab.tmsforweb.com/etc/etc-web into feature/mailRoute
  137.  
  138. commit 0b32719a1ea922846e44a814c3db9b60d82c33a8
  139. Author: Alejandro Prado Perez <apradop@indra.es>
  140. Date: Fri Nov 27 13:34:30 2015 +0100
  141.  
  142. Recovery password changes
  143.  
  144. commit a23768affe78ce864648f15278a753602b68a3ef
  145. Author: Alejandro Prado Perez <apradop@indra.es>
  146. Date: Fri Nov 27 13:01:09 2015 +0100
  147.  
  148. Recovery password changes
  149.  
  150. commit 87742e718d501c686ea99106cec2123bb70ee701
  151. Author: Alejandro Prado Perez <apradop@indra.es>
  152. Date: Thu Nov 26 19:09:40 2015 +0100
  153.  
  154. Retrieve password mail changes
  155.  
  156. commit 628d0481b77a4cc6639135fdc023eb925c1c8d4c
  157. Merge: 6c2bc73 e76b7a4
  158. Author: Alejandro Prado Perez <apradop@indra.es>
  159. Date: Thu Nov 26 17:20:37 2015 +0100
  160.  
  161. Merge branch 'develop' into feature/mailRoute
  162.  
  163. commit 2c06be5099d9d23971a5586fdffa2b0a4dbfb56f
  164. Author: Alejandro Prado Perez <apradop@indra.es>
  165. Date: Thu Nov 26 11:57:51 2015 +0100
  166.  
  167. Mail service refactoring
  168.  
  169. commit b9b283d6781755e2c3ec9102df1bd44e6c9b251e
  170. Author: Alejandro Prado Perez <apradop@indra.es>
  171. Date: Thu Nov 26 11:44:54 2015 +0100
  172.  
  173. Mail service refactoring
  174.  
  175. commit 215647ccc77a54b9d80ad72aeb3f901b9547dfe8
  176. Author: Alejandro Prado Perez <apradop@indra.es>
  177. Date: Wed Nov 25 18:04:59 2015 +0100
  178.  
  179. Mail service refactoring
  180.  
  181. commit b14c4b8c1c91d76c97b537d60e4864785d6e2bc2
  182. Author: Alejandro Prado Perez <apradop@indra.es>
  183. Date: Wed Nov 25 15:46:49 2015 +0100
  184.  
  185. Mail service refactoring
  186.  
  187. commit 3ce61b9cb98cbd2ba6e528b691d29631a84ef979
  188. Author: Alejandro Prado Perez <apradop@indra.es>
  189. Date: Wed Nov 25 15:13:24 2015 +0100
  190.  
  191. Mail service refactoring
  192.  
  193. commit e0b90e859c16b2e83034edf0361c55fbeae58485
  194. Author: Alejandro Prado Perez <apradop@indra.es>
  195. Date: Wed Nov 25 13:09:28 2015 +0100
  196.  
  197. Mail service refactoring
  198.  
  199. commit e910abe4304c4065ede13229a43265d224ead209
  200. Author: Alejandro Prado Perez <apradop@indra.es>
  201. Date: Tue Nov 24 10:42:58 2015 +0100
  202.  
  203. no message
  204.  
  205. commit be2125874a9654a7c92ed633bee223dcf38be16f
  206. Author: Alejandro Prado Perez <apradop@indra.es>
  207. Date: Mon Nov 23 16:19:22 2015 +0100
  208.  
  209. no message
  210.  
  211. commit 4f55370e258998aa55a805e74d55d0784d1d51d2
  212. Author: Alejandro Prado Perez <apradop@indra.es>
  213. Date: Mon Nov 23 16:15:39 2015 +0100
  214.  
  215. Mejoras en interceptor, creacion del package security.mail para el email de recuperar contraseña
  216.  
  217. commit 077625f8cbc85301e56fa343884064b2667e6a1b
  218. Author: Alejandro Prado Perez <apradop@indra.es>
  219. Date: Mon Nov 23 12:04:21 2015 +0100
  220.  
  221. Interceptor refactoring
  222.  
  223. commit 4f86064992f5edec97230974a8caac9b94738f30
  224. Author: Alejandro Prado Perez <apradop@indra.es>
  225. Date: Fri Nov 20 13:08:11 2015 +0100
  226.  
  227. Added configuration parameters for the interceptor in the security.properties file
  228.  
  229. commit eeae31a46d9dc9818badb53e6efcfef1266e8c8a
  230. Merge: 67d86d7 d0192df
  231. Author: Alejandro Prado Perez <apradop@indra.es>
  232. Date: Thu Nov 19 12:07:36 2015 +0100
  233.  
  234. Merge branch 'feature/login-product' of https://gitlab.tmsforweb.com/etc/etc-web into feature/login-product
  235.  
  236. commit 67d86d727ee1f99f5a3253c7191ae24ed5756d5e
  237. Author: Alejandro Prado Perez <apradop@indra.es>
  238. Date: Thu Nov 19 12:07:20 2015 +0100
  239.  
  240. Resultcode validation for the members Webservice on login action
  241.  
  242. commit 528dc629043993e876b96b522699c68e53899d1b
  243. Author: Alejandro Prado Perez <apradop@indra.es>
  244. Date: Wed Nov 18 17:13:57 2015 +0100
  245.  
  246. Fixed bug with loginError parameters
  247.  
  248. commit db72cf00ce52c6fe251191b70027e5a452d7ee78
  249. Author: Alejandro Prado Perez <apradop@indra.es>
  250. Date: Wed Nov 18 16:19:16 2015 +0100
  251.  
  252. no message
  253.  
  254. commit f306b796ab4656fd911541cb3b1b2ca8af562795
  255. Merge: e026d74 5006a21
  256. Author: Alejandro Prado Perez <apradop@indra.es>
  257. Date: Wed Nov 18 16:18:00 2015 +0100
  258.  
  259. Merge branch 'feature/login-product' of https://gitlab.tmsforweb.com/etc/etc-web into feature/login-product
  260.  
  261. commit e026d746194124ea6719af7149a5b05ccdf4ecee
  262. Author: Alejandro Prado Perez <apradop@indra.es>
  263. Date: Wed Nov 18 16:17:46 2015 +0100
  264.  
  265. Reestructuracion del interceptor
  266.  
  267. commit a26bde14db6052e38a38e7c105f0b4d1ea43d17a
  268. Author: Alejandro Prado Perez <apradop@indra.es>
  269. Date: Wed Nov 18 13:34:29 2015 +0100
  270.  
  271. Fixed issue with the /etcweb/ extra on URLs
  272.  
  273. commit 9c3d3d2f7364d99454a0ead8f2a4ad065cc556a8
  274. Merge: a1b16cb ea68504
  275. Author: Alejandro Prado Perez <apradop@indra.es>
  276. Date: Wed Nov 18 12:34:43 2015 +0100
  277.  
  278. Merge branch 'develop' into feature/login-product
  279.  
  280. Conflicts:
  281. pom.xml
  282.  
  283. commit a1b16cb8c515ae72c53cae642ff2086592486409
  284. Author: Alejandro Prado Perez <apradop@indra.es>
  285. Date: Wed Nov 18 12:31:52 2015 +0100
  286.  
  287. no message
  288.  
  289. commit c96f0f43302aa2781aad15e6884411ea8ba9d4f5
  290. Author: Alejandro Prado Perez <apradop@indra.es>
  291. Date: Wed Nov 18 12:06:36 2015 +0100
  292.  
  293. Stash 1
  294.  
  295. commit cba3acf88298dad498e74df99371095a4334bdfe
  296. Merge: ba4b3c8 d0534a1
  297. Author: Alejandro Prado Perez <apradop@indra.es>
  298. Date: Wed Nov 18 09:50:21 2015 +0100
  299.  
  300. Merge branch 'feature/login-product' of https://gitlab.tmsforweb.com/etc/etc-web into feature/login-product
  301.  
  302. commit ba4b3c84c963da9e7cc57945829304b96d0c6017
  303. Author: Alejandro Prado Perez <apradop@indra.es>
  304. Date: Wed Nov 18 09:49:57 2015 +0100
  305.  
  306. Member nights for BP
  307.  
  308. commit c9787729792e8bfa5b1837a283cd9576568acf58
  309. Author: Alejandro Prado Perez <apradop@indra.es>
  310. Date: Tue Nov 17 18:11:06 2015 +0100
  311.  
  312. TotalFreeNighs para BP
  313.  
  314. commit 4f8970b85dd6ddba80e8794b06accd85543505cb
  315. Author: Alejandro Prado Perez <apradop@indra.es>
  316. Date: Tue Nov 17 17:01:18 2015 +0100
  317.  
  318. Updated tms4web-membersmodel version on root pom.xml
  319.  
  320. commit 5effdc86377454b834bf3db5b494d1c4ff01efb4
  321. Author: Alejandro Prado Perez <apradop@indra.es>
  322. Date: Tue Nov 17 15:50:39 2015 +0100
  323.  
  324. Added attribute on MemberBookingSearchModel
  325.  
  326. commit a86171033e252527ac2bf0a7d487bc29559b01b9
  327. Author: Alejandro Prado Perez <apradop@indra.es>
  328. Date: Tue Nov 17 13:09:09 2015 +0100
  329.  
  330. Fixed bug in EtcUserDaoImpl
  331.  
  332. commit 0d9c0666e4b722d4038b795477b52db55ddb18bb
  333. Author: Alejandro Prado Perez <apradop@indra.es>
  334. Date: Tue Nov 17 12:43:44 2015 +0100
  335.  
  336. Interface for member area mailing service
  337.  
  338. commit 51b81f8b1356d6b9de5b63362e7e62847c2e0001
  339. Author: Alejandro Prado Perez <apradop@indra.es>
  340. Date: Tue Nov 17 11:19:46 2015 +0100
  341.  
  342. no message
  343.  
  344. commit ef6274a86d3fd95896d21828a9862330dce27f02
  345. Merge: b55b514 bf5031b
  346. Author: Alejandro Prado Perez <apradop@indra.es>
  347. Date: Mon Nov 16 18:46:23 2015 +0100
  348.  
  349. Merge branch 'feature/login-product' of https://gitlab.tmsforweb.com/etc/etc-web into feature/login-product
  350.  
  351. commit b55b5149660da2df5e5dc35a3ae0cac41bade6ef
  352. Author: Alejandro Prado Perez <apradop@indra.es>
  353. Date: Mon Nov 16 18:44:43 2015 +0100
  354.  
  355. Get contract backCode on login action
  356.  
  357. commit 8ffd48291619cf48238462b8d1a29f3da10fb7ba
  358. Author: Alejandro Prado Perez <apradop@indra.es>
  359. Date: Mon Nov 16 16:24:35 2015 +0100
  360.  
  361. no message
  362.  
  363. commit e0500a9166088df11b64cfbe816f7e557c05a722
  364. Merge: 459f7a2 891726f
  365. Author: Alejandro Prado Perez <apradop@indra.es>
  366. Date: Fri Nov 13 14:38:50 2015 +0100
  367.  
  368. Merge branch 'develop' into feature/login-product
  369.  
  370. commit 459f7a25dbb55c0f7534968def4d48dfebbc7eda
  371. Author: Alejandro Prado Perez <apradop@indra.es>
  372. Date: Fri Nov 13 14:17:15 2015 +0100
  373.  
  374. Controller for offerDetail now works with MemberSearchModel instead Request
  375.  
  376. commit 407ec858cb8ce8d93d7fdd1a4062b031993fd3ea
  377. Author: Alejandro Prado Perez <apradop@indra.es>
  378. Date: Thu Nov 12 16:59:07 2015 +0100
  379.  
  380. no message
  381.  
  382. commit 5cc98c875eb87bda10877454fb8fca2f2dcb1d42
  383. Merge: c336c5f ba896e0
  384. Author: Alejandro Prado Perez <apradop@indra.es>
  385. Date: Thu Nov 12 16:03:59 2015 +0100
  386.  
  387. Merge branch 'develop' into feature/login-product
  388.  
  389. commit c336c5fc132f69af90900a1981d617674538fc0f
  390. Author: Alejandro Prado Perez <apradop@indra.es>
  391. Date: Thu Nov 12 12:47:43 2015 +0100
  392.  
  393. Changes on private-area pages
  394.  
  395. commit 87d9d26f983feaa347d7dbe3483691c64ad6ae96
  396. Merge: 57165ac b4b8d5c
  397. Author: Alejandro Prado Perez <apradop@indra.es>
  398. Date: Wed Nov 11 18:05:59 2015 +0100
  399.  
  400. Merge branch 'develop-frontend' into feature/login-product
  401.  
  402. commit 57165accbd2d17f3df749b9f67e0bad1cfd1f583
  403. Author: Alejandro Prado Perez <apradop@indra.es>
  404. Date: Wed Nov 11 17:56:52 2015 +0100
  405.  
  406. no message
  407.  
  408. commit 05c869d52bc7a7fd8636595b295549fdb3e278bc
  409. Merge: 3c6f756 44de615
  410. Author: Alejandro Prado Perez <apradop@indra.es>
  411. Date: Wed Nov 11 16:18:30 2015 +0100
  412.  
  413. Merge branch 'develop-frontend' into feature/login-product
  414.  
  415. commit 3c6f756b518a7456608512cd0fc6b4766b6d37d4
  416. Merge: 2d4bcae 87e3c18
  417. Author: Alejandro Prado Perez <apradop@indra.es>
  418. Date: Wed Nov 11 15:40:56 2015 +0100
  419.  
  420. Merge branch 'develop' into feature/login-product
  421.  
  422. commit 2d4bcae66adf714a1bd4c40847c73f6f520eac52
  423. Author: Alejandro Prado Perez <apradop@indra.es>
  424. Date: Wed Nov 11 13:53:17 2015 +0100
  425.  
  426. no message
  427.  
  428. commit 88c123a2bdfd2d9ecc05d963075c622cb7d4ee9a
  429. Merge: 30e95e5 ee81ad3
  430. Author: Alejandro Prado Perez <apradop@indra.es>
  431. Date: Wed Nov 11 13:12:51 2015 +0100
  432.  
  433. Merge branch 'develop' into feature/login-product
  434.  
  435. commit 30e95e59559f14db67808cfc6fb1b52cf1b55725
  436. Author: Alejandro Prado Perez <apradop@indra.es>
  437. Date: Wed Nov 11 13:05:52 2015 +0100
  438.  
  439. no message
  440.  
  441. commit b627517c17471ed1ffd86049fd90a8e01c53b6cb
  442. Merge: 8043d59 8d0b020
  443. Author: Alejandro Prado Perez <apradop@indra.es>
  444. Date: Wed Nov 11 12:07:12 2015 +0100
  445.  
  446. Merge branch 'develop' into feature/login-product
  447.  
  448. Conflicts:
  449. pom.xml
  450.  
  451. commit 8043d59e415b2aa3715915bb4291bfde92949d48
  452. Author: Alejandro Prado Perez <apradop@indra.es>
  453. Date: Tue Nov 10 17:53:59 2015 +0100
  454.  
  455. Special offerts detail
  456.  
  457. commit 4493b6683b2de4c09b2d0d38f64af3d686083d05
  458. Author: Alejandro Prado Perez <apradop@indra.es>
  459. Date: Tue Nov 10 16:45:45 2015 +0100
  460.  
  461. tms4web-members version updated
  462.  
  463. commit f8f05c971efda59a5a46c75acede1e1245b9c5fb
  464. Author: Alejandro Prado Perez <apradop@indra.es>
  465. Date: Tue Nov 10 13:34:21 2015 +0100
  466.  
  467. Special offert pages
  468.  
  469. commit 0d38754053f0c1036668caea14472111300589df
  470. Author: Alejandro Prado Perez <apradop@indra.es>
  471. Date: Tue Nov 10 13:21:37 2015 +0100
  472.  
  473. Special Offerts Pages
  474.  
  475. commit 18b7ef8ae01458414b9eac570a1b00ea755b0f98
  476. Merge: 5d43106 88c4465
  477. Author: Alejandro Prado Perez <apradop@indra.es>
  478. Date: Mon Nov 9 15:42:24 2015 +0100
  479.  
  480. Merge branch 'develop' into feature/login-product
  481.  
  482. commit 5d43106c752271f71e53ef71e5fafe63ac32077d
  483. Merge: c4482d4 475648b
  484. Author: Alejandro Prado Perez <apradop@indra.es>
  485. Date: Mon Nov 9 13:13:16 2015 +0100
  486.  
  487. Merge branch 'develop' into feature/login-product
  488.  
  489. commit c4482d4e8c492b9518cbff2704e6ef38ee391264
  490. Author: Alejandro Prado Perez <apradop@indra.es>
  491. Date: Mon Nov 9 12:59:02 2015 +0100
  492.  
  493. no message
  494.  
  495. commit 7ad56079ad39f858ea67482ee2695b525351a29e
  496. Author: Alejandro Prado Perez <apradop@indra.es>
  497. Date: Fri Nov 6 14:25:51 2015 +0100
  498.  
  499. CreateMember now set user to Active by default
  500.  
  501. commit ad7c815e15ef01c7870b1945d58620e9330c7d1a
  502. Author: Alejandro Prado Perez <apradop@indra.es>
  503. Date: Fri Nov 6 14:20:28 2015 +0100
  504.  
  505. Interceptor for private-area. Membership Page
  506.  
  507. commit d3386643a9757b25c87664941edfe0293d4ed6a0
  508. Author: Alejandro Prado Perez <apradop@indra.es>
  509. Date: Thu Nov 5 11:28:54 2015 +0100
  510.  
  511. Implementation for BeneficiosExclusivePage
  512.  
  513. commit 385a93abc45a52372a747b5f7a53248d3e1ddfb5
  514. Author: Alejandro Prado Perez <apradop@indra.es>
  515. Date: Wed Nov 4 18:06:12 2015 +0100
  516.  
  517. Integracion de login-WS-MiCuentaPage
  518.  
  519. commit a1daf0125e69fe61b1b7e2a1c3476b495ce8bb17
  520. Author: Alejandro Prado Perez <apradop@indra.es>
  521. Date: Wed Nov 4 10:31:29 2015 +0100
  522.  
  523. My account page working with dummy data
  524.  
  525. commit 1060183da219569d66fec9459f584831b2fbefe3
  526. Author: Alejandro Prado Perez <apradop@indra.es>
  527. Date: Wed Nov 4 10:05:12 2015 +0100
  528.  
  529. Fixes after merge
  530.  
  531. commit 447d4a3f7c4b31e2d7bfd26c079e04185cfff147
  532. Merge: 81fe27b 366d094
  533. Author: Alejandro Prado Perez <apradop@indra.es>
  534. Date: Wed Nov 4 09:46:52 2015 +0100
  535.  
  536. Merge branch 'develop' into feature/login-product
  537.  
  538. Conflicts:
  539. etcweb-web/.project
  540. etcweb-web/src/main/java/com/tms/tms4web/etc/common/security/EtcUser.java
  541. etcweb-web/src/main/java/com/tms/tms4web/etc/common/security/EtcUserDaoImpl.java
  542. etcweb-web/src/main/resources/security.properties
  543. pom.xml
  544.  
  545. commit 81fe27b0490b6e2b9dd5a5e987a5493db463f708
  546. Author: Alejandro Prado Perez <apradop@indra.es>
  547. Date: Tue Nov 3 19:29:08 2015 +0100
  548.  
  549. no message
  550.  
  551. commit 06a1a1d7b05f39c39a9d731d226fe57299ebee68
  552. Merge: 0215d41 ad3c335
  553. Author: Alejandro Prado Perez <apradop@indra.es>
  554. Date: Tue Nov 3 13:43:24 2015 +0100
  555.  
  556. Merge branch 'feature/login-product' of https://gitlab.tmsforweb.com/etc/etc-web into feature/login-product
  557.  
  558. commit 0215d412a3b10c5ec4d811b75da9d04d9190937f
  559. Author: Alejandro Prado Perez <apradop@indra.es>
  560. Date: Tue Nov 3 13:43:00 2015 +0100
  561.  
  562. Mergeado con member-area-contract
  563.  
  564. commit 118decb9b4bcaadadb58d3f4d1624e32b16d3a03
  565. Merge: ed28fc2 f4c412b
  566. Author: Alejandro Prado Perez <apradop@indra.es>
  567. Date: Tue Nov 3 12:34:38 2015 +0100
  568.  
  569. Merge branch 'feature/member-area-contract' into feature/login-product
  570.  
  571. Conflicts:
  572. etc-services-impl/src/main/java/com/tms/tms4web/etc/services/impl/memberarea/MemberAreaServiceImpl.java
  573. etcweb-web/src/main/java/com/tms/tms4web/etc/web/memberarea/mvc/controllers/DeepLinkMemberController.java
  574.  
  575. commit ed28fc22e4fe18b90f48b7f3c562a5531f29cd73
  576. Author: Alejandro Prado Perez <apradop@indra.es>
  577. Date: Tue Nov 3 12:30:09 2015 +0100
  578.  
  579. BluePrintFacade
  580.  
  581. commit c04d8a3a54fec1e95548134f50db642ceebbe671
  582. Author: Alejandro Prado Perez <apradop@indra.es>
  583. Date: Tue Nov 3 11:16:51 2015 +0100
  584.  
  585. no message
  586.  
  587. commit fbf46fa303112f1bb8555a4bb38435dc3eb9674e
  588. Author: Alejandro Prado Perez <apradop@indra.es>
  589. Date: Mon Nov 2 17:43:41 2015 +0100
  590.  
  591. no message
  592.  
  593. commit d03022d1e9afbfe91aacd1d6d0cdb4691c1c2226
  594. Author: Alejandro Prado Perez <apradop@indra.es>
  595. Date: Mon Nov 2 17:03:59 2015 +0100
  596.  
  597. Changes for My Account page and Member/Contract WS
  598.  
  599. commit c7f5c4b09703c0008f4475ff69333c7e7a767e45
  600. Merge: 0f5f61a 83cb004
  601. Author: Alejandro Prado Perez <apradop@indra.es>
  602. Date: Fri Oct 30 14:28:53 2015 +0100
  603.  
  604. Merge branch 'feature/member-area-contract' into feature/login-product
  605.  
  606. Conflicts:
  607. etc-services-impl/src/main/java/com/tms/tms4web/etc/services/handlers/memberarea/RequestMemberInfoHandler.java
  608. etc-services-impl/src/main/java/com/tms/tms4web/etc/services/impl/memberarea/MemberAreaServiceImpl.java
  609. etcweb-web/src/main/java/com/tms/tms4web/etc/web/memberarea/mvc/controllers/DeepLinkMemberController.java
  610.  
  611. commit 0f5f61a59120c52ff04ef9966af0150cba5f02d8
  612. Merge: 629d932 4b5cb59
  613. Author: Alejandro Prado Perez <apradop@indra.es>
  614. Date: Fri Oct 30 13:39:17 2015 +0100
  615.  
  616. Merge branch 'develop-java' into feature/login-product
  617.  
  618. Conflicts:
  619. etc_format.xml
  620.  
  621. commit 629d932de83a4358da8d8152379ff208b4b5f782
  622. Author: Alejandro Prado Perez <apradop@indra.es>
  623. Date: Fri Oct 30 13:27:30 2015 +0100
  624.  
  625. Fix after merge with develop-frontend
  626.  
  627. commit fbf32f9f19c9ac19ff8afb76aac5a398d942a73a
  628. Merge: be2764d 174ae74
  629. Author: Alejandro Prado Perez <apradop@indra.es>
  630. Date: Fri Oct 30 12:39:54 2015 +0100
  631.  
  632. Merge branch 'develop-frontend' into feature/login-product
  633.  
  634. Conflicts:
  635. etc_format.xml
  636.  
  637. commit be2764d4f6e651b8868b6f262bbefa0aad34bbaf
  638. Author: Alejandro Prado Perez <apradop@indra.es>
  639. Date: Fri Oct 30 12:36:31 2015 +0100
  640.  
  641. Added PathInterceptor Class (still in developement)
  642.  
  643. commit ccfeb9e3f09a5016d94c098b7b5b71381957be3b
  644. Author: Alejandro Prado Perez <apradop@indra.es>
  645. Date: Fri Oct 30 09:52:32 2015 +0100
  646.  
  647. Last login implementation
  648.  
  649. commit 6c873a94477630309b1bc146e1fb40eb989945ad
  650. Author: Alejandro Prado Perez <apradop@indra.es>
  651. Date: Thu Oct 29 18:25:38 2015 +0100
  652.  
  653. Storing EtcUser on Spring Security Context. First steps of implementation of "My account" area.
  654.  
  655. commit 55626b51b25bd474e5c2aa45c7531d2982387cfe
  656. Author: Alejandro Prado Perez <apradop@indra.es>
  657. Date: Tue Oct 27 13:02:09 2015 +0100
  658.  
  659. Change on login failure path
  660.  
  661. commit ac2de424fe1ac870019ada345dced36eb7881766
  662. Merge: f6c9dfd e2eb43d
  663. Author: Alejandro Prado Perez <apradop@indra.es>
  664. Date: Mon Oct 26 18:49:37 2015 +0100
  665.  
  666. Merge branch 'develop-java' into feature/login-product
  667.  
  668. commit f6c9dfd9fa2d3ed109f11fecea1e1d92318e6842
  669. Merge: 1cde18e 2ffd8c2
  670. Author: Alejandro Prado Perez <apradop@indra.es>
  671. Date: Mon Oct 26 17:55:22 2015 +0100
  672.  
  673. Merge branch 'develop-frontend' into feature/login-product
  674.  
  675. commit 1cde18e2bf9d3aa3dc3d17572ba3eede38ce2bbe
  676. Author: Alejandro Prado Perez <apradop@indra.es>
  677. Date: Mon Oct 26 17:53:46 2015 +0100
  678.  
  679. Fixes after merge
  680.  
  681. commit 0277dfaebef5a10d66b13136650788e28bec5926
  682. Author: Alejandro Prado Perez <apradop@indra.es>
  683. Date: Mon Oct 26 10:30:42 2015 +0100
  684.  
  685. Fixes after merge
  686.  
  687. commit 027a1e340e5d725dd5c91556ed25b69ce3abf16f
  688. Merge: 374c8a9 04d5570
  689. Author: Alejandro Prado Perez <apradop@indra.es>
  690. Date: Mon Oct 26 10:18:11 2015 +0100
  691.  
  692. Merge branch 'develop-java' into feature/login-product
  693.  
  694. commit 374c8a9000c01161a796dce6d3f356913d6007be
  695. Author: Alejandro Prado Perez <apradop@indra.es>
  696. Date: Mon Oct 26 10:16:11 2015 +0100
  697.  
  698. Fixes after merge with develop-java
  699.  
  700. commit 138c513793eccf5bbe220214038aadb150dd601b
  701. Merge: 4c09de2 cd1b6c2
  702. Author: Alejandro Prado Perez <apradop@indra.es>
  703. Date: Fri Oct 23 14:50:29 2015 +0200
  704.  
  705. Merge branch 'develop-java' into feature/login-product
  706.  
  707. Conflicts:
  708. etcdao-impl/src/main/java/com/tms/tms4web/etc/etcdao/dao/impl/MemberDAOImpl.java
  709. etcweb-web/.gitignore
  710. etcweb-web/src/main/resources/security.properties
  711. etcweb-web/src/main/webapp/WEB-INF/dispatcherServlet-context.xml
  712. pom.xml
  713.  
  714. commit 4c09de2af611b725e71e439446352c52df80898e
  715. Author: Alejandro Prado Perez <apradop@indra.es>
  716. Date: Fri Oct 23 14:36:49 2015 +0200
  717.  
  718. Language control for login/logout
  719.  
  720. commit bbe1a87e386618087feb01e60b9f94bd9ed9a618
  721. Author: Alejandro Prado Perez <apradop@indra.es>
  722. Date: Thu Oct 22 09:53:07 2015 +0200
  723.  
  724. Revert "Base64 encryption for password in login"
  725.  
  726. This reverts commit c827e7b3811e28c9ea9c87f4e7ac9495e3bc9b4a.
  727.  
  728. commit c827e7b3811e28c9ea9c87f4e7ac9495e3bc9b4a
  729. Author: Alejandro Prado Perez <apradop@indra.es>
  730. Date: Thu Oct 22 09:52:23 2015 +0200
  731.  
  732. Base64 encryption for password in login
  733.  
  734. commit b3d9f55d2688edd3cf0670c3dd69bfc5e49199c6
  735. Author: Alejandro Prado Perez <apradop@indra.es>
  736. Date: Thu Oct 22 09:24:49 2015 +0200
  737.  
  738. Spring security config changes
  739.  
  740. commit 2a10bfaa6a4574c2fc25baeefbb9ccd2e7ca65bf
  741. Author: Alejandro Prado Perez <apradop@indra.es>
  742. Date: Wed Oct 21 17:12:46 2015 +0200
  743.  
  744. Config changes
  745.  
  746. commit 5dc2c70f1561a4ecada2b0aa4445498a9ef5ea4c
  747. Merge: b356204 5b2cadd
  748. Author: Alejandro Prado Perez <apradop@indra.es>
  749. Date: Wed Oct 21 16:59:53 2015 +0200
  750.  
  751. Merge branch 'develop' into feature/login-product
  752.  
  753. Conflicts:
  754. etcweb-web/src/main/resources/cd_link_conf.xml
  755. etcweb-web/src/main/resources/security.properties
  756. pom.xml
  757.  
  758. commit b356204c90c06613b13660ccc20e805442bafe3b
  759. Author: Alejandro Prado Perez <apradop@indra.es>
  760. Date: Wed Oct 21 16:51:50 2015 +0200
  761.  
  762. Changes for create new branch with security product
  763.  
  764. commit 2ec1a4d96c7684ad99bed2d58354c7e15e0310c4
  765. Author: Alejandro Prado Perez <apradop@indra.es>
  766. Date: Wed Oct 21 15:49:15 2015 +0200
  767.  
  768. Return to tms4web-security
  769.  
  770. commit 27c1c000b4b3cdfdbab694d6c78af1f9f285e97f
  771. Author: Alejandro Prado Perez <apradop@indra.es>
  772. Date: Wed Oct 21 10:33:22 2015 +0200
  773.  
  774. Add controller for testing
  775.  
  776. commit 1b4ded12e0118f8d0e7f4d88167de239837c77d7
  777. Author: Alejandro Prado Perez <apradop@indra.es>
  778. Date: Tue Oct 20 15:32:15 2015 +0200
  779.  
  780. Stash spring-security
  781.  
  782. commit d3217e10f1b7ece44102516199d512253516d3cb
  783. Author: Alejandro Prado Perez <apradop@indra.es>
  784. Date: Tue Oct 20 15:24:14 2015 +0200
  785.  
  786. Added view BP/MealPlanName to registerViewModels()
  787.  
  788. commit dc162adb4e5e564b2502aa7749c3189eeaf8856f
  789. Merge: a9a8169 bfb52e5
  790. Author: Alejandro Prado Perez <apradop@indra.es>
  791. Date: Tue Oct 20 13:46:25 2015 +0200
  792.  
  793. Merge branch 'feature/tridion-booking-process' of http://gitlab.tmsforweb.com/etc/etc-web into feature/tridion-booking-process
  794.  
  795. Conflicts:
  796. etcweb-web/src/main/java/com/tms/tms4web/etc/common/Tms4webModuleInitializer.java
  797.  
  798. commit a9a8169207ebf9a2e5e744581d4b60c3d5c72c23
  799. Author: Alejandro Prado Perez <apradop@indra.es>
  800. Date: Tue Oct 20 13:45:05 2015 +0200
  801.  
  802. Added to registerViewModels
  803.  
  804. commit 7fc35b909e605856360f7f08ca24a9217d147506
  805. Merge: c8bb573 22794ce
  806. Author: Alejandro Prado Perez <apradop@indra.es>
  807. Date: Thu Oct 15 18:26:08 2015 +0200
  808.  
  809. Merge branch 'develop-frontend' into feature/login
  810.  
  811. commit c8bb57341a3784217508c3175f1eb3098c25a103
  812. Merge: e057cd2 4524bc1
  813. Author: Alejandro Prado Perez <apradop@indra.es>
  814. Date: Thu Oct 15 17:37:56 2015 +0200
  815.  
  816. Merge branch 'develop-frontend' into feature/login
  817.  
  818. commit e057cd2eb5f67cd3c2782621e2bfd9749ebf9076
  819. Merge: e88c0d4 81cfbf3
  820. Author: Alejandro Prado Perez <apradop@indra.es>
  821. Date: Thu Oct 15 11:50:30 2015 +0200
  822.  
  823. Merge branch 'develop' into feature/login
  824.  
  825. commit e88c0d4f663499db27e5fce537d9563f640d6820
  826. Author: Alejandro Prado Perez <apradop@indra.es>
  827. Date: Tue Oct 13 16:56:44 2015 +0200
  828.  
  829. Added dependencies for Spring Security Tags; Changed password encode from MD5 to Base64
  830.  
  831. commit f99425c01cac8dd0f630ec9ad5fb0a95923777ef
  832. Author: Alejandro Prado Perez <apradop@indra.es>
  833. Date: Thu Oct 1 15:34:48 2015 +0200
  834.  
  835. Clases para Members
  836.  
  837. commit d0fc61f521740aaf4578cc18b82c9e0345342b58
  838. Author: Alejandro Prado Perez <apradop@indra.es>
  839. Date: Thu Oct 1 16:25:34 2015 +0200
  840.  
  841. Cambios en configuracion por defecto
  842.  
  843. commit 85f494c5867598df7732a3fd234759e1d2ad0d0f
  844. Author: Alejandro Prado Perez <apradop@indra.es>
  845. Date: Thu Oct 1 15:34:48 2015 +0200
  846.  
  847. Clases para Members
  848.  
  849. commit 0cd8393e8f734258b7e644a0a212f511bef18219
  850. Author: Alejandro Prado Perez <apradop@indra.es>
  851. Date: Tue Oct 13 09:34:02 2015 +0200
  852.  
  853. no message
  854.  
  855. commit b58e80595d4105607a3a86598f46bfa90cafe2b1
  856. Author: Alejandro Prado Perez <apradop@indra.es>
  857. Date: Fri Oct 9 13:19:14 2015 +0200
  858.  
  859. Integración de Spring Secutiry de producto con Etc
  860.  
  861. commit 5064dbd2cb8c4e6cad5cd423136b725de5da8c54
  862. Author: Alejandro Prado Perez <apradop@indra.es>
  863. Date: Thu Oct 8 18:47:45 2015 +0200
  864.  
  865. Fixed merge conflicts
  866.  
  867. commit ae23de5b1c0aec86b96e18893d7f0ca6f9ffee71
  868. Author: Alejandro Prado Perez <apradop@indra.es>
  869. Date: Thu Oct 1 16:25:34 2015 +0200
  870.  
  871. Cambios en configuracion por defecto
  872.  
  873. commit 766eb6295fcffef6e4afc27145b4da0b7b195f80
  874. Author: Alejandro Prado Perez <apradop@indra.es>
  875. Date: Thu Oct 8 18:33:09 2015 +0200
  876.  
  877. Applying stash after merge
  878.  
  879. commit 21428809373af8a855e251728a2b5197303b989c
  880. Author: Alejandro Prado Perez <apradop@indra.es>
  881. Date: Thu Oct 1 15:34:48 2015 +0200
  882.  
  883. Clases para Members
  884.  
  885. commit 3d6cfd107f364fbce10d48d433223abb4f366ae5
  886. Merge: 6ed8dd4 f888d01
  887. Author: Alejandro Prado Perez <apradop@indra.es>
  888. Date: Thu Oct 8 18:27:32 2015 +0200
  889.  
  890. Merge branch 'develop' into feature/login
  891.  
  892. Conflicts:
  893. etcweb-web/.project
  894. etcweb-web/src/main/resources/cd_dynamic_conf.xml
  895. etcweb-web/src/main/webapp/WEB-INF/dispatcherServlet-context.xml
  896.  
  897. commit 6ed8dd47a34e1912a9adfe715b44518ca0b503d4
  898. Author: Alejandro Prado Perez <apradop@indra.es>
  899. Date: Tue Oct 6 15:48:26 2015 +0200
  900.  
  901. Fixes after merge
  902.  
  903. commit 16a9fc0b1ecb7f325ca000134dc5af7d664c4276
  904. Merge: 883d46d 2dce0ec
  905. Author: Alejandro Prado Perez <apradop@indra.es>
  906. Date: Tue Oct 6 14:06:04 2015 +0200
  907.  
  908. Merge branch 'develop' into feature/login
  909.  
  910. commit 883d46d9f902510ff50ebf26813dc4fdfa0dc2e4
  911. Author: Alejandro Prado Perez <apradop@indra.es>
  912. Date: Tue Oct 6 14:00:42 2015 +0200
  913.  
  914. Testin spring security
  915.  
  916. commit 86344eaf9fb839deca4b5c4120aa06e917d85e7f
  917. Merge: 769a2f1 0bb87f6
  918. Author: Alejandro Prado Perez <apradop@indra.es>
  919. Date: Fri Oct 2 12:42:06 2015 +0200
  920.  
  921. Merge branch 'develop' into feature/login
  922.  
  923. commit 769a2f1f65cb4ae31113aea376ee1ccae5f978d1
  924. Author: Alejandro Prado Perez <apradop@indra.es>
  925. Date: Thu Oct 1 16:25:34 2015 +0200
  926.  
  927. Cambios en configuracion por defecto
  928.  
  929. commit e5815dff8fa24d99d4ef9df941daa596c40713cf
  930. Author: Alejandro Prado Perez <apradop@indra.es>
  931. Date: Thu Oct 1 15:34:48 2015 +0200
  932.  
  933. Clases para Members
  934.  
  935. commit d01e1ed10da2521a8500395a2aca3c6f1a3180eb
  936. Author: Alejandro Prado Perez <apradop@indra.es>
  937. Date: Wed Sep 23 09:32:36 2015 +0200
  938.  
  939. Licencia de Tridion añadida
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!