Christian Fiedler
|
0bc533353f
|
Merge branch 'hotfix/#117' into develmaster
|
2013-08-12 16:52:57 +02:00 |
|
Christian Fiedler
|
98fba92a17
|
#117 fixed tiles
|
2013-08-12 16:52:28 +02:00 |
|
stubbfel
|
ab58fabc6e
|
Merge branch 'release/r#146' into develmaster
|
2013-08-08 15:55:30 +02:00 |
|
stubbfel
|
2f99cfd21a
|
# add camupslist
|
2013-08-08 15:54:33 +02:00 |
|
stubbfel
|
8fc22539be
|
mv userprofil to isalated storage
|
2013-08-08 15:15:15 +02:00 |
|
stubbfel
|
4a309ad980
|
Merge branch 'release/r#141' into develmaster
r#141
|
2013-08-08 13:56:34 +02:00 |
|
stubbfel
|
c301f908ad
|
Merge branch 'feature/#141' into develop
|
2013-08-08 13:55:03 +02:00 |
|
stubbfel
|
6ce158dc41
|
add optin and doku
|
2013-08-08 13:51:20 +02:00 |
|
stubbfel
|
e8fe0bb041
|
new gitignore
|
2013-08-07 15:17:36 +02:00 |
|
stubbfel
|
b337eefc8c
|
add geowatcher
|
2013-08-07 15:16:13 +02:00 |
|
stubbfel
|
70d92c7a3b
|
add test access
|
2013-08-07 11:38:02 +02:00 |
|
stubbfel
|
363baad60c
|
add spsapi
|
2013-08-06 16:13:29 +02:00 |
|
stubbfel
|
2606e089df
|
Merge branch 'release/r#138#139' into develmaster
r#138#139
|
2013-08-06 14:53:31 +02:00 |
|
stubbfel
|
a99ff5526c
|
Merge branch 'feature/#138' into develop
|
2013-08-06 14:11:18 +02:00 |
|
stubbfel
|
64fc09f622
|
finish 138
|
2013-08-06 14:11:01 +02:00 |
|
stubbfel
|
a9a96b6ffc
|
instert new mensapp
|
2013-08-06 14:07:43 +02:00 |
|
stubbfel
|
f79cd5836e
|
add mealmodel
|
2013-08-06 11:04:43 +02:00 |
|
stubbfel
|
d414e4df47
|
add fullheaders
|
2013-08-06 09:46:50 +02:00 |
|
stubbfel
|
4652b82885
|
Merge branch 'release/#r133' into develmaster
|
2013-08-05 13:02:56 +02:00 |
|
stubbfel
|
7637b62271
|
Merge branch 'release/#r133' into develop
|
2013-08-05 13:02:56 +02:00 |
|
stubbfel
|
55e426f6c2
|
release fixes
|
2013-08-05 13:02:39 +02:00 |
|
stubbfel
|
2eea814558
|
Merge branch 'feature/#133' into develop
Conflicts:
CampusAppWP8/CampusAppWP8/App.xaml.cs
CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs
|
2013-08-05 12:40:14 +02:00 |
|
stubbfel
|
121c728df7
|
fixes
|
2013-08-05 11:58:19 +02:00 |
|
stubbfel
|
9a84f847d1
|
add list to lecture
|
2013-08-05 11:56:45 +02:00 |
|
stubbfel
|
fa7a84661e
|
finish profilsite
|
2013-08-05 11:18:32 +02:00 |
|
stubbfel
|
75b6b4501f
|
update20130725
|
2013-07-25 15:24:24 +02:00 |
|
stubbfel
|
a3014d04c8
|
add settings to appload
|
2013-07-25 12:45:56 +02:00 |
|
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
|
88320657e9
|
delete default role and degrre
|
2013-07-25 10:20:40 +02:00 |
|
stubbfel
|
1136e29034
|
update gitzignore
|
2013-07-24 14:00:59 +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 |
|
stubbfel
|
c2871bb3d1
|
add validation userprofile
|
2013-07-24 11:00:55 +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 |
|
stubbfel
|
6338caea9c
|
add userprofil
|
2013-07-23 15:35:41 +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 |
|