0000000000000000000000000000000000000000 9da5bd94a84fb0f423f66964a755bb2682fc0f4a Thomas Bocek <tom@tomp2p.net> 1402063377 +0200	branch: Created from branch refs/remotes/origin/testserver
9da5bd94a84fb0f423f66964a755bb2682fc0f4a 5db1c5cce15a473eb3d0e3985ac2a88dabe9650d Thomas Bocek <tom@tomp2p.net> 1402072129 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
5db1c5cce15a473eb3d0e3985ac2a88dabe9650d 59efd9401002ef853384d1b99bbf14c37368d0e2 Thomas Bocek <tom@tomp2p.net> 1402401905 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
59efd9401002ef853384d1b99bbf14c37368d0e2 b09a8a1cc22fd8b046c95c9f5aa4d60b6fdf57e9 Thomas Bocek <tom@tomp2p.net> 1402482644 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
b09a8a1cc22fd8b046c95c9f5aa4d60b6fdf57e9 2479c57cda0180816332b3558149b61bb068faa6 Thomas Bocek <tom@tomp2p.net> 1402903881 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
2479c57cda0180816332b3558149b61bb068faa6 99fb45ad8b4e71e2b54f8c1a10b1d75f5b30f36f Thomas Bocek <tom@tomp2p.net> 1404651040 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
99fb45ad8b4e71e2b54f8c1a10b1d75f5b30f36f a061244f0fd7c53acf2296870bea9c31752805e0 Thomas Bocek <tom@tomp2p.net> 1405342112 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
a061244f0fd7c53acf2296870bea9c31752805e0 b4fbfa8b8b44edf6a4c8628de1b495553ac29943 Thomas Bocek <tom@tomp2p.net> 1408005124 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
b4fbfa8b8b44edf6a4c8628de1b495553ac29943 c748550831fd17c9371f40984f900863fdd6e2c7 Thomas Bocek <tom@tomp2p.net> 1408559542 +0200	commit: Rewrote DAO layer and DB layer, used properly @Autowired and other stuff
c748550831fd17c9371f40984f900863fdd6e2c7 110e6285dce3b24d6a4d83868b70dc4edac6970d Thomas Bocek <tom@tomp2p.net> 1408965064 +0200	commit: working version
110e6285dce3b24d6a4d83868b70dc4edac6970d 7b933c09caef336d944b16a6efb5346d3cb83a74 Thomas Bocek <tom@tomp2p.net> 1408965099 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Merge made by recursive.
7b933c09caef336d944b16a6efb5346d3cb83a74 1eef14ac3b83017d0544fe5d32d6b5a9e84c48c9 Thomas Bocek <tom@tomp2p.net> 1408965153 +0200	commit: new json mapper
1eef14ac3b83017d0544fe5d32d6b5a9e84c48c9 d4935585865c132921e51e202af7d6369ad89d34 Thomas Bocek <tom@tomp2p.net> 1408980739 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
d4935585865c132921e51e202af7d6369ad89d34 159324a2e153680922eee31e227b46c6364502a9 Thomas Bocek <tom@tomp2p.net> 1408980761 +0200	commit: fixed signature
159324a2e153680922eee31e227b46c6364502a9 c4be3351d463d997c7af8cf76b6fc53d27c6ee42 Thomas Bocek <tom@tomp2p.net> 1409049252 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
c4be3351d463d997c7af8cf76b6fc53d27c6ee42 9eb95028f7967f7bfd17b0db0c3c8dde7924f453 Thomas Bocek <tom@tomp2p.net> 1409051104 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
9eb95028f7967f7bfd17b0db0c3c8dde7924f453 4df2b6aa930e8d14844713333d3b9363b8d3a85f Thomas Bocek <tom@tomp2p.net> 1409051158 +0200	commit: Added enviroment for local testing
4df2b6aa930e8d14844713333d3b9363b8d3a85f 74f8778aaaf201364ec4fc23c9c6d3c787a20f63 Thomas Bocek <tom@tomp2p.net> 1409062690 +0200	commit: fixed test data for local testing
74f8778aaaf201364ec4fc23c9c6d3c787a20f63 961b666a0b0918283a20611454ec8cda5bc1990d Thomas Bocek <tom@tomp2p.net> 1409065756 +0200	commit: removed comments
961b666a0b0918283a20611454ec8cda5bc1990d 5d1428845418f88916da2264f0ef54e83909169f Thomas Bocek <tom@tomp2p.net> 1409071313 +0200	commit: changed env variable
5d1428845418f88916da2264f0ef54e83909169f b313de30c9c9132687577354f4d125fb3988855f Thomas Bocek <tom@tomp2p.net> 1409071935 +0200	commit: added comment
b313de30c9c9132687577354f4d125fb3988855f 10d8cf34cc76e52a8caba650ed797ea5879f4e35 Thomas Bocek <tom@tomp2p.net> 1409160434 +0200	commit: split deployment config
10d8cf34cc76e52a8caba650ed797ea5879f4e35 d2f02a84bb26f6fc6020d9e0d22e5edf05114a89 Thomas Bocek <tom@tomp2p.net> 1409245673 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
d2f02a84bb26f6fc6020d9e0d22e5edf05114a89 9b625afe780f464c95c82695c164efcbe4c1c6f0 Thomas Bocek <tom@tomp2p.net> 1409263087 +0200	commit: deployment updates
9b625afe780f464c95c82695c164efcbe4c1c6f0 97474b2fbb64eb8852856cab89e8ef7fdec10217 Thomas Bocek <tom@tomp2p.net> 1409263315 +0200	commit: ignore password properties
97474b2fbb64eb8852856cab89e8ef7fdec10217 e9be912efd39a1c785db64e047b3c0481f9a4e93 Thomas Bocek <tom@tomp2p.net> 1409263378 +0200	commit: fixed typo
e9be912efd39a1c785db64e047b3c0481f9a4e93 03bfe5cca37248c39a8f93e0102ae73260e90932 Thomas Bocek <tom@tomp2p.net> 1409317694 +0200	commit: requrie channel needs https for production
03bfe5cca37248c39a8f93e0102ae73260e90932 bbe101caa56d38485374445d3448111989021472 Thomas Bocek <tom@tomp2p.net> 1409318312 +0200	commit: removed requiered, as redirection is done by apache
bbe101caa56d38485374445d3448111989021472 78c622277a1093b21d0fbd44cb6a885fee2d8269 Thomas Bocek <tom@tomp2p.net> 1409329881 +0200	commit: fixes in hedging and security logout changes
78c622277a1093b21d0fbd44cb6a885fee2d8269 a2dcba6723b71c4f94a0e24e1b4a56d7c3b1084f Thomas Bocek <tom@tomp2p.net> 1409393940 +0200	commit: undo hack, and make proper configuration
a2dcba6723b71c4f94a0e24e1b4a56d7c3b1084f 7440ed77a46d3c69fac34c88749da42f42087841 Thomas Bocek <tom@tomp2p.net> 1409399833 +0200	commit: proper indexing support
7440ed77a46d3c69fac34c88749da42f42087841 788725816adc10d8efb581e28b046af138a3f8de Thomas Bocek <tom@tomp2p.net> 1409410042 +0200	commit: removed hibernate exception
788725816adc10d8efb581e28b046af138a3f8de e7e095d960452039abc4348866dcf8d832197a3a Thomas Bocek <tom@tomp2p.net> 1409410060 +0200	commit: proper shutdown if reloading tomcat
e7e095d960452039abc4348866dcf8d832197a3a e65452e73f90756550c1a1700252c4d9ce5e1079 Thomas Bocek <tom@tomp2p.net> 1409488009 +0200	commit: added support for unverified transactions
e65452e73f90756550c1a1700252c4d9ce5e1079 1c63c4bfa590aefcdcd3cfd61157e0059e5c5f7c Thomas Bocek <tom@tomp2p.net> 1409488045 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Merge made by recursive.
1c63c4bfa590aefcdcd3cfd61157e0059e5c5f7c a38d52f7bf4915d013ec80e47bb0da643c778942 Thomas Bocek <tom@tomp2p.net> 1409488281 +0200	commit: autowired only works with interfaces
a38d52f7bf4915d013ec80e47bb0da643c778942 e23b87b925320538f46555c9678d6549a706e7df Thomas Bocek <tom@tomp2p.net> 1409488624 +0200	commit: fixed annotation for unverified transaction
e23b87b925320538f46555c9678d6549a706e7df 0d93569d165502f926fe0fa85e6b11740aba2ce2 Thomas Bocek <tom@tomp2p.net> 1409491700 +0200	commit: added type for unconfirmed transactions
0d93569d165502f926fe0fa85e6b11740aba2ce2 0e78909e5fb8f5aae72495fe6cfdf3629b53ccd3 Thomas Bocek <tom@tomp2p.net> 1409491708 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Merge made by recursive.
0e78909e5fb8f5aae72495fe6cfdf3629b53ccd3 ec6d4543cba778cd6be73564443bc92566a4edca Thomas Bocek <tom@tomp2p.net> 1409496601 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
ec6d4543cba778cd6be73564443bc92566a4edca 5f179b00a34876cdab02879f25ec979f024e3ecc Thomas Bocek <tom@tomp2p.net> 1409499358 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
5f179b00a34876cdab02879f25ec979f024e3ecc 696260bedb1906989a8b571683562cb2c3782042 Thomas Bocek <tom@tomp2p.net> 1409500293 +0200	commit: added Mensa xls mailer
696260bedb1906989a8b571683562cb2c3782042 c1609e2220d15580d743bf62468b5a350ffdebef Thomas Bocek <tom@tomp2p.net> 1409567723 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
c1609e2220d15580d743bf62468b5a350ffdebef c0f4e345de8ff9261003a5bc64ea95b66c98766e Thomas Bocek <tom@tomp2p.net> 1410198891 +0200	commit: set min confirmation
c0f4e345de8ff9261003a5bc64ea95b66c98766e 68bd6afd9717ac7fa961dfecd45f5bd9fccdfce6 Thomas Bocek <tom@tomp2p.net> 1410198903 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Merge made by recursive.
68bd6afd9717ac7fa961dfecd45f5bd9fccdfce6 d6f6bf45b00f55781c7ab14e15fb735dd1f40baf Thomas Bocek <tom@tomp2p.net> 1410600621 +0200	commit: added stacktrace
d6f6bf45b00f55781c7ab14e15fb735dd1f40baf 9e8ad3db9d27627f6a11fc93d1c9b598fccff63a Thomas Bocek <tom@tomp2p.net> 1410607480 +0200	commit: changed logging from syserr to logger
9e8ad3db9d27627f6a11fc93d1c9b598fccff63a d91309506c1933da004e4c6298ef6386cf0a9d84 Thomas Bocek <tom@tomp2p.net> 1410613654 +0200	commit: added logging
d91309506c1933da004e4c6298ef6386cf0a9d84 4bcbe08a7802cdc5a4a2630d9a48f8a0655bbc57 Thomas Bocek <tom@tomp2p.net> 1410726313 +0200	commit: changed logger to info, to see something in the output
4bcbe08a7802cdc5a4a2630d9a48f8a0655bbc57 3350566ec5d5ab64d96bb500b8e28308c726f2b0 Thomas Bocek <tom@tomp2p.net> 1412072427 +0200	merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git: Fast-forward
