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
|
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 |
|
stubbfel
|
52625e6bee
|
init #33
|
2013-06-17 11:25:08 +02:00 |
|
stubbfel
|
6da4552e79
|
Merge branch 'feature/#35' into develop
|
2013-06-17 11:21:26 +02:00 |
|
stubbfel
|
1c890fd43d
|
finish #35
|
2013-06-17 11:20:51 +02:00 |
|
stubbfel
|
f8f90ab247
|
init #35
|
2013-06-17 10:49:43 +02:00 |
|
stubbfel
|
0f6196a521
|
Merge branch 'release/#37' into develmaster
|
2013-06-17 10:45:51 +02:00 |
|
stubbfel
|
eac32fadd3
|
Merge branch 'feature/#37' into develop
|
2013-06-17 10:44:35 +02:00 |
|
stubbfel
|
3d3a0fa9e2
|
Merge branch 'release/release' into develmaster
vsrelease
|
2013-06-17 10:30:36 +02:00 |
|
stubbfel
|
a93ea28794
|
resolved #38
|
2013-06-17 10:28:05 +02:00 |
|
stubbfel
|
f49d1bba36
|
change LecturreActivity (add Feature #37)
|
2013-06-17 10:12:22 +02:00 |
|
stubbfel
|
db46c1a451
|
add methods #37
|
2013-06-17 10:09:39 +02:00 |
|
stubbfel
|
7068d54406
|
add doku
|
2013-06-13 13:32:21 +02:00 |
|
stubbfel
|
2f4034a4f2
|
Merge branch 'release/add#29' into develmaster
vsadd#29
|
2013-06-13 12:14:41 +02:00 |
|
stubbfel
|
ec3fd17234
|
Merge branch 'feature/#29' into develop
|
2013-06-13 12:13:17 +02:00 |
|
stubbfel
|
bff8eb07c8
|
add documention to the models
|
2013-06-13 12:11:56 +02:00 |
|
stubbfel
|
512d367a7e
|
add docmumentation to the pages
|
2013-06-13 10:50:37 +02:00 |
|
stubbfel
|
eb533e8008
|
update lecture
|
2013-06-12 15:21:16 +02:00 |
|
stubbfel
|
6071f96b3b
|
lecture sendrequest and shows result
|
2013-06-12 13:07:24 +02:00 |
|
stubbfel
|
72495a5bc5
|
Merge branch 'hotfix/#30' into develop
|
2013-06-12 10:57:20 +02:00 |
|
stubbfel
|
84266dfb59
|
Merge branch 'hotfix/#30' into develmaster
vs#30
|
2013-06-12 10:54:55 +02:00 |
|
stubbfel
|
9c973b2b8f
|
resoved issue #30
|
2013-06-12 10:54:20 +02:00 |
|
stubbfel
|
590cf43751
|
Merge branch 'pagesdraft' into devel
initgitflow
|
2013-06-11 16:45:04 +02:00 |
|
stubbfel
|
5b66041f81
|
chaneg using
|
2013-06-11 16:44:21 +02:00 |
|
stubbfel
|
9a81b166cd
|
Merge branch 'cf_departments' into pagesdraft
Conflicts:
CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
CampusAppWP8/CampusAppWP8/pages/news/RSSItem.cs
CampusAppWP8/CampusAppWP8/pages/news/RSSNewsTemplate.xaml
CampusAppWP8/CampusAppWP8/pages/news/RSSNewsTemplate.xaml.cs
CampusAppWP8/CampusAppWP8/utility/URLList.cs
|
2013-06-11 16:39:33 +02:00 |
|
stubbfel
|
70a8f7a266
|
commit department
|
2013-06-11 15:47:32 +02:00 |
|