stubbfel
|
cc4cfd9afd
|
Merge branch 'release/r#78' into develmaster
|
2013-07-04 14:11:26 +02:00 |
|
stubbfel
|
7053571f6c
|
Merge branch 'feature/#78' into develop
|
2013-07-04 14:10:08 +02:00 |
|
stubbfel
|
170067df02
|
finish #78
|
2013-07-04 13:52:07 +02:00 |
|
stubbfel
|
38becf5ae6
|
add emaibtn #78
|
2013-07-04 13:51:32 +02:00 |
|
stubbfel
|
0e90a7a03c
|
Merge branch 'release/r#74' into develmaster
|
2013-07-03 13:45:05 +02:00 |
|
stubbfel
|
7e65f09ca8
|
Merge branch 'release/r#74' into develop
|
2013-07-03 13:45:05 +02:00 |
|
stubbfel
|
7056650095
|
add #74 to startpage
|
2013-07-03 13:44:46 +02:00 |
|
stubbfel
|
5e5074a534
|
Merge branch 'feature/#74' into develop
|
2013-07-03 13:37:58 +02:00 |
|
stubbfel
|
f5ef147baa
|
finish #74
|
2013-07-03 13:37:12 +02:00 |
|
stubbfel
|
c9b3553d2a
|
add models and feed #74
|
2013-07-02 15:18:40 +02:00 |
|
stubbfel
|
f8280d1ce1
|
Merge branch 'release/r#71' into develmaster
|
2013-07-02 12:25:44 +02:00 |
|
stubbfel
|
448cfd5118
|
finish #71
|
2013-07-02 12:25:05 +02:00 |
|
stubbfel
|
655b4c0638
|
add Linkpage, Model and feeds
|
2013-07-02 12:17:15 +02:00 |
|
stubbfel
|
ff39d78658
|
Merge branch 'release/r#67' into develmaster
|
2013-07-01 13:20:12 +02:00 |
|
stubbfel
|
d8071e76eb
|
finish #67
|
2013-07-01 13:19:07 +02:00 |
|
stubbfel
|
2e883b1e98
|
Merge branch 'release/r#68' into develmaster
|
2013-07-01 11:45:16 +02:00 |
|
stubbfel
|
5a55355f98
|
finish #68
|
2013-07-01 11:43:56 +02:00 |
|
Christian Fiedler
|
22a0315fdd
|
Merge branch 'release/#55' into develmaster
vs#55
20130627
|
2013-06-25 14:10:40 +02:00 |
|
Christian Fiedler
|
fe46e28a26
|
Merge branch 'feature/#55' into develop
|
2013-06-25 14:08:48 +02:00 |
|
Christian Fiedler
|
31b4e4459e
|
#55
|
2013-06-25 14:06:27 +02:00 |
|
stubbfel
|
0991901c90
|
Merge branch 'release/#51' into develmaster
|
2013-06-24 13:51:04 +02:00 |
|
stubbfel
|
94a12f2a77
|
change icon source of lecture and map
|
2013-06-24 13:50:24 +02:00 |
|
stubbfel
|
2b96528c7d
|
Merge branch 'feature/#51' into develop
|
2013-06-24 13:33:39 +02:00 |
|
stubbfel
|
7ee3fa5535
|
finish testmap
|
2013-06-24 13:27:16 +02:00 |
|
Christian Fiedler
|
a8d93ee943
|
Merge branch 'develop' into develmaster
|
2013-06-24 12:56:49 +02:00 |
|
Christian Fiedler
|
2a8d321a64
|
fixed a wrong merged line
|
2013-06-24 12:54:12 +02:00 |
|
Christian Fiedler
|
4b5587770c
|
Merge branch 'feature/#44' into develop
Conflicts:
CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs
|
2013-06-24 12:44:16 +02:00 |
|
Christian Fiedler
|
a750b5e1a2
|
#44 themerized icons
|
2013-06-21 16:25:13 +02:00 |
|
stubbfel
|
709f7fc289
|
end of day2 #51
|
2013-06-21 13:02:13 +02:00 |
|
stubbfel
|
811ad35fa9
|
add mapmodel
|
2013-06-21 12:37:17 +02:00 |
|
stubbfel
|
ab0ba5ac6b
|
Merge branch 'release/r#45' into develmaster
|
2013-06-21 11:25:37 +02:00 |
|
stubbfel
|
bb3de8beec
|
add links to the startpage and doku
|
2013-06-21 11:22:33 +02:00 |
|
stubbfel
|
c5ea535489
|
finish day
|
2013-06-20 15:56:13 +02:00 |
|
stubbfel
|
bbc6269ed1
|
add search icon #51
|
2013-06-20 13:11:27 +02:00 |
|
stubbfel
|
d8b3848086
|
Merge branch 'release/r#52' into develmaster
|
2013-06-20 12:35:13 +02:00 |
|
stubbfel
|
775533ec32
|
Merge branch 'feature/#52' into develop
|
2013-06-20 12:32:49 +02:00 |
|
stubbfel
|
eb91cbae44
|
change namespace
|
2013-06-20 12:32:32 +02:00 |
|
stubbfel
|
b52c0c8625
|
add and mv #52
|
2013-06-20 12:31:30 +02:00 |
|
stubbfel
|
52872b108b
|
Merge branch 'release/r#48' into develop
|
2013-06-19 10:37:42 +02:00 |
|
stubbfel
|
d06b86bc41
|
Merge branch 'release/r#48' into develmaster
|
2013-06-19 10:37:41 +02:00 |
|
stubbfel
|
c293c331fb
|
change nav to startpage
|
2013-06-19 10:37:16 +02:00 |
|
stubbfel
|
e044450f1d
|
Merge branch 'feature/#48' into develop
|
2013-06-19 10:35:02 +02:00 |
|
stubbfel
|
ce6358b9f7
|
clear stylecop warning #48
|
2013-06-19 10:32:55 +02:00 |
|
stubbfel
|
e27a8bb989
|
add api class
|
2013-06-19 10:30:51 +02:00 |
|
stubbfel
|
c666a526f0
|
Merge branch 'hotfix/#47' into develop
|
2013-06-19 10:09:01 +02:00 |
|
stubbfel
|
6fed7482ca
|
Merge branch 'hotfix/#47' into develmaster
|
2013-06-19 10:09:00 +02:00 |
|
stubbfel
|
4d79854ee7
|
rename RestApa to HttpRequst
|
2013-06-19 10:08:28 +02:00 |
|
stubbfel
|
57da34fc6b
|
Merge branch 'release/#46' into develmaster
|
2013-06-19 09:57:02 +02:00 |
|
stubbfel
|
518bbc00ce
|
finish #46
|
2013-06-18 15:22:50 +02:00 |
|
stubbfel
|
38b379c6d6
|
Merge branch 'hotfix/#32' into develop
|
2013-06-18 15:07:18 +02:00 |
|