Commit Graph

  • 2eea814558 Merge branch 'feature/#133' into develop stubbfel 2013-08-05 12:40:14 +02:00
  • 121c728df7 fixes stubbfel 2013-08-05 11:58:19 +02:00
  • 9a84f847d1 add list to lecture stubbfel 2013-08-05 11:56:45 +02:00
  • fa7a84661e finish profilsite stubbfel 2013-08-05 11:18:32 +02:00
  • 75b6b4501f update20130725 stubbfel 2013-07-25 15:24:24 +02:00
  • a3014d04c8 add settings to appload stubbfel 2013-07-25 12:45:56 +02:00
  • bcceaaaa53 Merge branch 'release/r' into develmaster stubbfel 2013-07-25 11:08:52 +02:00
  • 6f5496a006 Merge branch 'feature/#refactor' into develop stubbfel 2013-07-25 11:08:22 +02:00
  • a366d0e949 formated classes stubbfel 2013-07-25 11:08:08 +02:00
  • 88320657e9 delete default role and degrre stubbfel 2013-07-25 10:20:40 +02:00
  • 1136e29034 update gitzignore stubbfel 2013-07-24 14:00:59 +02:00
  • 759f0a8859 Merge branch 'hotfix/#137' into develop stubbfel 2013-07-24 12:18:41 +02:00
  • bf9a612de5 Merge branch 'hotfix/#137' into develmaster stubbfel 2013-07-24 12:18:14 +02:00
  • 00fb9ca637 update gitzignore stubbfel 2013-07-24 12:17:58 +02:00
  • 49151c0714 add arrayindex assert stubbfel 2013-07-24 12:16:48 +02:00
  • 5eedf70604 update gitzignore stubbfel 2013-07-24 12:12:44 +02:00
  • c2871bb3d1 add validation userprofile stubbfel 2013-07-24 11:00:55 +02:00
  • 9abb7de1ec Merge branch 'hotfix/#129' into develop Christian Fiedler 2013-07-23 16:03:06 +02:00
  • 854dc8b46e Merge branch 'hotfix/#129' into develmaster Christian Fiedler 2013-07-23 16:02:03 +02:00
  • 96cd4bccb4 #129 Christian Fiedler 2013-07-23 16:01:40 +02:00
  • 6338caea9c add userprofil stubbfel 2013-07-23 15:35:41 +02:00
  • 3874f2ef06 Merge branch 'hotfix/#123' into develop Christian Fiedler 2013-07-23 12:39:15 +02:00
  • c12c76c5ae Merge branch 'hotfix/#123' into develmaster Christian Fiedler 2013-07-23 12:38:00 +02:00
  • a3c8f3b9fc #123 Christian Fiedler 2013-07-23 12:35:22 +02:00
  • dadcc2e965 Merge branch 'release/#r128#130#131' into develmaster stubbfel 2013-07-23 11:55:23 +02:00
  • 175b871005 Merge branch 'feature/#132' into develop stubbfel 2013-07-23 11:53:44 +02:00
  • af57bad869 rm api und xmlapi stubbfel 2013-07-23 11:53:31 +02:00
  • 932842aebb change to XMLModel stubbfel 2013-07-23 11:40:59 +02:00
  • 125587f99c Merge branch 'hotfix/#131' into develop stubbfel 2013-07-23 10:57:19 +02:00
  • 1b52f87950 Merge branch 'hotfix/#131' into develmaster stubbfel 2013-07-23 10:57:18 +02:00
  • 6b8ec1e8b0 fix #131 stubbfel 2013-07-23 10:57:01 +02:00
  • 5788889ae7 add ifnoimmage stubbfel 2013-07-23 10:32:57 +02:00
  • 6b5341d1ac finish #128 stubbfel 2013-07-23 10:20:10 +02:00
  • 900cb9111a Merge branch 'release/R#125#127' into develmaster vsR#125#127 stubbfel 2013-07-22 18:47:22 +02:00
  • 0df8f72c53 finish #127 stubbfel 2013-07-22 18:45:41 +02:00
  • 970c6ce8e8 finish #125 stubbfel 2013-07-22 18:32:01 +02:00
  • 9662be5632 add updatebutton stubbfel 2013-07-22 17:18:59 +02:00
  • 6a69aec6eb Merge branch 'feature/#121' into develop stubbfel 2013-07-22 16:30:39 +02:00
  • dd7ef6e82e rmfile onsaved stubbfel 2013-07-22 16:26:03 +02:00
  • 3e3b082463 Merge branch 'hotfix/#122' into develmaster Christian Fiedler 2013-07-22 16:09:15 +02:00
  • 4a5253c25c Merge branch 'hotfix/#122' into develop Christian Fiedler 2013-07-22 16:09:15 +02:00
  • a375fe9008 #122 Christian Fiedler 2013-07-22 16:08:52 +02:00
  • 1d434a394f finish #121 stubbfel 2013-07-22 16:01:25 +02:00
  • 5aee5e266a Merge branch 'release/#109' into develmaster Christian Fiedler 2013-07-22 15:29:58 +02:00
  • 666b6c9730 Merge branch 'feature/#109' into develop Christian Fiedler 2013-07-22 15:29:30 +02:00
  • 59503f2d23 #109 Christian Fiedler 2013-07-22 15:27:58 +02:00
  • 43cfeea2d7 Merge branch 'release/r#119' into develmaster vsr#119 stubbfel 2013-07-22 15:09:11 +02:00
  • d17b4b7e33 Merge branch 'feature/#119' into develop stubbfel 2013-07-22 15:08:41 +02:00
  • b78250401c finish #119 stubbfel 2013-07-22 14:46:44 +02:00
  • d167dbfb9e Merge branch 'release/#120' into develmaster Christian Fiedler 2013-07-22 13:48:53 +02:00
  • 0072df1186 #120 Christian Fiedler 2013-07-22 13:48:05 +02:00
  • 218353393e Merge branch 'hotfix/#118' into develop Christian Fiedler 2013-07-22 11:46:46 +02:00
  • de91ac2d76 Merge branch 'hotfix/#118' into develmaster Christian Fiedler 2013-07-22 11:46:45 +02:00
  • 74224a4fc5 #118 Christian Fiedler 2013-07-22 11:46:22 +02:00
  • 0ceb0584d1 #115 Christian Fiedler 2013-07-19 17:45:16 +02:00
  • 88b664284f #115 Christian Fiedler 2013-07-19 17:42:55 +02:00
  • 92614e7128 Merge branch 'release/#103' into develmaster Christian Fiedler 2013-07-19 17:18:45 +02:00
  • 9eff5be228 Merge branch 'feature/#103' into develop Christian Fiedler 2013-07-19 17:17:12 +02:00
  • 9ebeaa8147 const Christian Fiedler 2013-07-19 17:16:36 +02:00
  • b9f268d594 #103 and fixes in events and news Christian Fiedler 2013-07-19 17:15:47 +02:00
  • 7978e27049 Merge branch 'develmaster' 20130717 stubbfel 2013-07-17 14:00:15 +02:00
  • be65f4056b addd stubbfel 2013-07-17 13:55:02 +02:00
  • 73a186cf28 Merge branch 'release/r114' into develmaster stubbfel 2013-07-17 13:51:16 +02:00
  • 7a7c478277 Merge branch 'feature/#114' into develop stubbfel 2013-07-17 13:47:17 +02:00
  • c886b3e573 finish #114 stubbfel 2013-07-17 13:47:02 +02:00
  • 98a51bce24 change tilestyle stubbfel 2013-07-17 12:22:32 +02:00
  • a7769184d5 Merge branch 'hotfix/#87' into develop stubbfel 2013-07-17 11:53:16 +02:00
  • 40145c727e Merge branch 'hotfix/#87' into develmaster vs#87 stubbfel 2013-07-17 11:53:13 +02:00
  • 6ead6414e6 third patch stubbfel 2013-07-17 11:40:17 +02:00
  • 03789a9a38 add all stubbfel 2013-07-17 11:33:11 +02:00
  • 92db7d16f3 clear git stubbfel 2013-07-17 11:31:47 +02:00
  • 9454a764d6 patch two stubbfel 2013-07-17 10:49:34 +02:00
  • a433d47583 fist patch to prj file stubbfel 2013-07-17 10:07:37 +02:00
  • 486058687d Merge branch 'hotfix/#113' into develop stubbfel 2013-07-16 15:09:44 +02:00
  • ce3c953b64 Merge branch 'hotfix/#113' into develmaster stubbfel 2013-07-16 15:09:43 +02:00
  • e2ee1aad9f fix #113 stubbfel 2013-07-16 15:09:17 +02:00
  • 281cd06bab Merge branch 'release/rdel' into develmaster stubbfel 2013-07-16 14:00:15 +02:00
  • d71f6db920 deletion stubbfel 2013-07-16 13:59:42 +02:00
  • eb68b666f7 Merge branch 'develmaster' into develop stubbfel 2013-07-16 13:48:11 +02:00
  • 8a69101cbf Merge branch 'hotfix/#72' into develmaster stubbfel 2013-07-16 13:47:42 +02:00
  • d9a54b2b13 delete #72 stubbfel 2013-07-16 13:43:15 +02:00
  • 92d580f270 fixed constants Christian Fiedler 2013-07-16 13:42:45 +02:00
  • 8b4ee44520 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop Christian Fiedler 2013-07-16 13:40:40 +02:00
  • 9c0415ddbb fixed constants Christian Fiedler 2013-07-16 13:39:53 +02:00
  • 52a3154caf Merge branch 'develmaster' of 141.43.76.143:repos/bare/win8phoneApp into develmaster stubbfel 2013-07-16 13:38:33 +02:00
  • 18f72e6096 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop stubbfel 2013-07-16 13:38:23 +02:00
  • 82625f7aa4 Merge branch 'hotfix/#73' into develop stubbfel 2013-07-16 13:37:42 +02:00
  • 0b82c3b18a Merge branch 'hotfix/#73' into develmaster stubbfel 2013-07-16 13:37:41 +02:00
  • 3616bd233f Merge branch 'hotfix/#79' into develop Christian Fiedler 2013-07-16 13:35:38 +02:00
  • 573a562e03 Merge branch 'hotfix/#79' into develmaster Christian Fiedler 2013-07-16 13:33:10 +02:00
  • 25d6217a9b delete BaseModel stubbfel 2013-07-16 13:29:33 +02:00
  • 5fbd297af5 delete FileList stubbfel 2013-07-16 13:26:09 +02:00
  • f1e41b1fce #79 #96 Christian Fiedler 2013-07-16 13:22:04 +02:00
  • c0692dfca9 Merge branch 'release/r#112' into develmaster stubbfel 2013-07-16 12:21:37 +02:00
  • cf4c5dc486 change to XMLModel stubbfel 2013-07-16 12:20:16 +02:00
  • 707e7c0761 Merge branch 'release/r#111' into develmaster stubbfel 2013-07-16 12:00:19 +02:00
  • 347e45f561 change to XMLModel stubbfel 2013-07-16 11:59:38 +02:00
  • 4395f4f6cd Merge branch 'release/r#108' into develmaster stubbfel 2013-07-16 11:43:05 +02:00
  • 182b50eca2 Merge branch 'feature/#108' into develop stubbfel 2013-07-16 11:42:00 +02:00
  • 544ae68f2c enable department stubbfel 2013-07-16 11:41:32 +02:00