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 |
|
stubbfel
|
24f7607f84
|
Merge branch 'hotfix/#32' into develmaster
|
2013-06-18 15:07:15 +02:00 |
|
stubbfel
|
55d55c64e0
|
finisch #32
|
2013-06-18 15:06:30 +02:00 |
|
stubbfel
|
8f472d7662
|
add LecturepageModel
|
2013-06-18 10:34:09 +02:00 |
|
Christian Fiedler
|
919c1f8d08
|
Merge branch 'release/#43' into develmaster
|
2013-06-17 15:27:05 +02:00 |
|
Christian Fiedler
|
ff81278aba
|
embedded webbrowser in events and news
|
2013-06-17 15:24:43 +02:00 |
|
Christian Fiedler
|
0b71ef13fe
|
Merge branch 'hotfix/#28' into develop
|
2013-06-17 14:51:37 +02:00 |
|
Christian Fiedler
|
e180ca3a45
|
Merge branch 'hotfix/#28' into develmaster
|
2013-06-17 14:51:36 +02:00 |
|
Christian Fiedler
|
978fb9b83b
|
#28
|
2013-06-17 14:49:00 +02:00 |
|
stubbfel
|
fcd674aa4e
|
Merge branch 'release/r#33' into develmaster
|
2013-06-17 14:04:43 +02:00 |
|
stubbfel
|
7e2552a8e3
|
add search button to lecturepage
|
2013-06-17 14:03:29 +02:00 |
|
stubbfel
|
ffc902c78f
|
Merge branch 'feature/#33' into develop
|
2013-06-17 13:50:07 +02:00 |
|
stubbfel
|
5dbcc01dd2
|
add doku + refactor to lectur and api #33
|
2013-06-17 13:48:10 +02:00 |
|
stubbfel
|
a2463795f9
|
add Api to LecturePage
|
2013-06-17 12:39:05 +02:00 |
|
Christian Fiedler
|
53d5fa413e
|
Merge branch 'release/icons' into develmaster
|
2013-06-17 12:21:03 +02:00 |
|
Christian Fiedler
|
5c3a8a3432
|
#34 and changed background opacity of other images
|
2013-06-17 12:15:09 +02:00 |
|
stubbfel
|
e451f7ff89
|
add CreateGetUrl #33
|
2013-06-17 12:14:02 +02:00 |
|
stubbfel
|
25b05855a2
|
finish xmlApi
|
2013-06-17 11:50:01 +02:00 |
|