stubbfel
|
bcceaaaa53
|
Merge branch 'release/r' into develmaster
|
2013-07-25 11:08:52 +02:00 |
|
stubbfel
|
6f5496a006
|
Merge branch 'feature/#refactor' into develop
|
2013-07-25 11:08:22 +02:00 |
|
stubbfel
|
a366d0e949
|
formated classes
|
2013-07-25 11:08:08 +02:00 |
|
stubbfel
|
759f0a8859
|
Merge branch 'hotfix/#137' into develop
|
2013-07-24 12:18:41 +02:00 |
|
stubbfel
|
bf9a612de5
|
Merge branch 'hotfix/#137' into develmaster
|
2013-07-24 12:18:14 +02:00 |
|
stubbfel
|
00fb9ca637
|
update gitzignore
|
2013-07-24 12:17:58 +02:00 |
|
stubbfel
|
49151c0714
|
add arrayindex assert
|
2013-07-24 12:16:48 +02:00 |
|
stubbfel
|
5eedf70604
|
update gitzignore
|
2013-07-24 12:12:44 +02:00 |
|
Christian Fiedler
|
9abb7de1ec
|
Merge branch 'hotfix/#129' into develop
Conflicts:
CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs
|
2013-07-23 16:03:06 +02:00 |
|
Christian Fiedler
|
854dc8b46e
|
Merge branch 'hotfix/#129' into develmaster
|
2013-07-23 16:02:03 +02:00 |
|
Christian Fiedler
|
96cd4bccb4
|
#129
|
2013-07-23 16:01:40 +02:00 |
|
Christian Fiedler
|
3874f2ef06
|
Merge branch 'hotfix/#123' into develop
Conflicts:
CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs
|
2013-07-23 12:39:15 +02:00 |
|
Christian Fiedler
|
c12c76c5ae
|
Merge branch 'hotfix/#123' into develmaster
Conflicts:
CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs
|
2013-07-23 12:38:00 +02:00 |
|
Christian Fiedler
|
a3c8f3b9fc
|
#123
|
2013-07-23 12:35:22 +02:00 |
|
stubbfel
|
dadcc2e965
|
Merge branch 'release/#r128#130#131' into develmaster
|
2013-07-23 11:55:23 +02:00 |
|
stubbfel
|
175b871005
|
Merge branch 'feature/#132' into develop
|
2013-07-23 11:53:44 +02:00 |
|
stubbfel
|
af57bad869
|
rm api und xmlapi
|
2013-07-23 11:53:31 +02:00 |
|
stubbfel
|
932842aebb
|
change to XMLModel
|
2013-07-23 11:40:59 +02:00 |
|
stubbfel
|
125587f99c
|
Merge branch 'hotfix/#131' into develop
|
2013-07-23 10:57:19 +02:00 |
|
stubbfel
|
1b52f87950
|
Merge branch 'hotfix/#131' into develmaster
|
2013-07-23 10:57:18 +02:00 |
|
stubbfel
|
6b8ec1e8b0
|
fix #131
|
2013-07-23 10:57:01 +02:00 |
|
stubbfel
|
5788889ae7
|
add ifnoimmage
|
2013-07-23 10:32:57 +02:00 |
|
stubbfel
|
6b5341d1ac
|
finish #128
|
2013-07-23 10:20:10 +02:00 |
|
stubbfel
|
900cb9111a
|
Merge branch 'release/R#125#127' into develmaster
vsR#125#127
|
2013-07-22 18:47:22 +02:00 |
|
stubbfel
|
0df8f72c53
|
finish #127
|
2013-07-22 18:45:41 +02:00 |
|
stubbfel
|
970c6ce8e8
|
finish #125
|
2013-07-22 18:32:01 +02:00 |
|
stubbfel
|
9662be5632
|
add updatebutton
|
2013-07-22 17:18:59 +02:00 |
|
stubbfel
|
6a69aec6eb
|
Merge branch 'feature/#121' into develop
|
2013-07-22 16:30:39 +02:00 |
|
stubbfel
|
dd7ef6e82e
|
rmfile onsaved
|
2013-07-22 16:26:03 +02:00 |
|
Christian Fiedler
|
3e3b082463
|
Merge branch 'hotfix/#122' into develmaster
|
2013-07-22 16:09:15 +02:00 |
|
Christian Fiedler
|
4a5253c25c
|
Merge branch 'hotfix/#122' into develop
|
2013-07-22 16:09:15 +02:00 |
|
Christian Fiedler
|
a375fe9008
|
#122
|
2013-07-22 16:08:52 +02:00 |
|
stubbfel
|
1d434a394f
|
finish #121
|
2013-07-22 16:01:25 +02:00 |
|
Christian Fiedler
|
5aee5e266a
|
Merge branch 'release/#109' into develmaster
|
2013-07-22 15:29:58 +02:00 |
|
Christian Fiedler
|
666b6c9730
|
Merge branch 'feature/#109' into develop
|
2013-07-22 15:29:30 +02:00 |
|
Christian Fiedler
|
59503f2d23
|
#109
|
2013-07-22 15:27:58 +02:00 |
|
stubbfel
|
43cfeea2d7
|
Merge branch 'release/r#119' into develmaster
vsr#119
|
2013-07-22 15:09:11 +02:00 |
|
stubbfel
|
d17b4b7e33
|
Merge branch 'feature/#119' into develop
|
2013-07-22 15:08:41 +02:00 |
|
stubbfel
|
b78250401c
|
finish #119
|
2013-07-22 14:46:44 +02:00 |
|
Christian Fiedler
|
d167dbfb9e
|
Merge branch 'release/#120' into develmaster
|
2013-07-22 13:48:53 +02:00 |
|
Christian Fiedler
|
0072df1186
|
#120
|
2013-07-22 13:48:05 +02:00 |
|
Christian Fiedler
|
218353393e
|
Merge branch 'hotfix/#118' into develop
|
2013-07-22 11:46:46 +02:00 |
|
Christian Fiedler
|
de91ac2d76
|
Merge branch 'hotfix/#118' into develmaster
|
2013-07-22 11:46:45 +02:00 |
|
Christian Fiedler
|
74224a4fc5
|
#118
|
2013-07-22 11:46:22 +02:00 |
|
Christian Fiedler
|
0ceb0584d1
|
#115
|
2013-07-19 17:45:16 +02:00 |
|
Christian Fiedler
|
88b664284f
|
#115
|
2013-07-19 17:42:55 +02:00 |
|
Christian Fiedler
|
92614e7128
|
Merge branch 'release/#103' into develmaster
|
2013-07-19 17:18:45 +02:00 |
|
Christian Fiedler
|
9eff5be228
|
Merge branch 'feature/#103' into develop
|
2013-07-19 17:17:12 +02:00 |
|
Christian Fiedler
|
9ebeaa8147
|
const
|
2013-07-19 17:16:36 +02:00 |
|
Christian Fiedler
|
b9f268d594
|
#103 and fixes in events and news
|
2013-07-19 17:15:47 +02:00 |
|