stubbfel
|
eb68b666f7
|
Merge branch 'develmaster' into develop
|
2013-07-16 13:48:11 +02:00 |
|
stubbfel
|
8a69101cbf
|
Merge branch 'hotfix/#72' into develmaster
Conflicts:
CampusAppWP8/CampusAppWP8/Resources/Constants.resx
|
2013-07-16 13:47:42 +02:00 |
|
stubbfel
|
d9a54b2b13
|
delete #72
|
2013-07-16 13:43:15 +02:00 |
|
Christian Fiedler
|
92d580f270
|
fixed constants
|
2013-07-16 13:42:45 +02:00 |
|
Christian Fiedler
|
8b4ee44520
|
Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop
|
2013-07-16 13:40:40 +02:00 |
|
Christian Fiedler
|
9c0415ddbb
|
fixed constants
|
2013-07-16 13:39:53 +02:00 |
|
stubbfel
|
52a3154caf
|
Merge branch 'develmaster' of 141.43.76.143:repos/bare/win8phoneApp into develmaster
|
2013-07-16 13:38:33 +02:00 |
|
stubbfel
|
18f72e6096
|
Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop
|
2013-07-16 13:38:23 +02:00 |
|
stubbfel
|
82625f7aa4
|
Merge branch 'hotfix/#73' into develop
|
2013-07-16 13:37:42 +02:00 |
|
stubbfel
|
0b82c3b18a
|
Merge branch 'hotfix/#73' into develmaster
|
2013-07-16 13:37:41 +02:00 |
|
Christian Fiedler
|
3616bd233f
|
Merge branch 'hotfix/#79' into develop
Conflicts:
CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
CampusAppWP8/CampusAppWP8/Resources/Constants.resx
|
2013-07-16 13:35:38 +02:00 |
|
Christian Fiedler
|
573a562e03
|
Merge branch 'hotfix/#79' into develmaster
Conflicts:
CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
CampusAppWP8/CampusAppWP8/Resources/Constants.resx
|
2013-07-16 13:33:10 +02:00 |
|
stubbfel
|
25d6217a9b
|
delete BaseModel
|
2013-07-16 13:29:33 +02:00 |
|
stubbfel
|
5fbd297af5
|
delete FileList
|
2013-07-16 13:26:09 +02:00 |
|
Christian Fiedler
|
f1e41b1fce
|
#79 #96
|
2013-07-16 13:22:04 +02:00 |
|
stubbfel
|
c0692dfca9
|
Merge branch 'release/r#112' into develmaster
|
2013-07-16 12:21:37 +02:00 |
|
stubbfel
|
cf4c5dc486
|
change to XMLModel
|
2013-07-16 12:20:16 +02:00 |
|
stubbfel
|
707e7c0761
|
Merge branch 'release/r#111' into develmaster
|
2013-07-16 12:00:19 +02:00 |
|
stubbfel
|
347e45f561
|
change to XMLModel
|
2013-07-16 11:59:38 +02:00 |
|
stubbfel
|
4395f4f6cd
|
Merge branch 'release/r#108' into develmaster
|
2013-07-16 11:43:05 +02:00 |
|
stubbfel
|
182b50eca2
|
Merge branch 'feature/#108' into develop
|
2013-07-16 11:42:00 +02:00 |
|
stubbfel
|
544ae68f2c
|
enable department
|
2013-07-16 11:41:32 +02:00 |
|
stubbfel
|
db15808e24
|
change to xmlmodel
|
2013-07-16 10:40:09 +02:00 |
|
stubbfel
|
7e99840b6c
|
rrefactor linkpage
|
2013-07-15 18:53:29 +02:00 |
|
Christian Fiedler
|
0f82e4512d
|
Merge branch 'release/new_file_system' into develmaster
|
2013-07-15 17:34:15 +02:00 |
|
Christian Fiedler
|
19e18a4daa
|
Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop
|
2013-07-15 17:30:43 +02:00 |
|
Christian Fiedler
|
2a24c01854
|
removed icon
|
2013-07-15 17:29:37 +02:00 |
|
Christian Fiedler
|
2ef3d053b1
|
mega merge
|
2013-07-15 17:28:36 +02:00 |
|
stubbfel
|
c0a880e771
|
Merge branch 'hotfix/#100' into develop
|
2013-07-15 17:22:00 +02:00 |
|
stubbfel
|
46cedaeeb4
|
Merge branch 'hotfix/#100' into develmaster
|
2013-07-15 17:21:59 +02:00 |
|
stubbfel
|
bda60de4f5
|
reafactor #100
|
2013-07-15 17:21:36 +02:00 |
|
Christian Fiedler
|
e70a6d36f1
|
Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop
Conflicts:
CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
|
2013-07-15 16:59:59 +02:00 |
|
Christian Fiedler
|
80d008a431
|
Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop
Conflicts:
CampusAppWP8/CampusAppWP8/Model/Events/RSSChannelModel.cs
CampusAppWP8/CampusAppWP8/Model/Events/RSSModel.cs
CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs
CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
CampusAppWP8/CampusAppWP8/Resources/Constants.resx
CampusAppWP8/CampusAppWP8/pages/StartPage.xaml
CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs
|
2013-07-15 16:58:31 +02:00 |
|
stubbfel
|
175765a3c0
|
Merge branch 'hotfix/#107' into develop
|
2013-07-15 15:17:30 +02:00 |
|
stubbfel
|
5a709e7445
|
Merge branch 'hotfix/#107' into develmaster
|
2013-07-15 15:17:30 +02:00 |
|
stubbfel
|
a2eeb54c55
|
finish #107
|
2013-07-15 15:17:21 +02:00 |
|
stubbfel
|
511e6640ba
|
Merge branch 'release/r#104' into develmaster
|
2013-07-15 15:09:33 +02:00 |
|
stubbfel
|
505b19e57d
|
Merge branch 'hotfix/#100' into develop
|
2013-07-15 15:02:31 +02:00 |
|
stubbfel
|
5d2614d59b
|
Merge branch 'hotfix/#100' into develmaster
|
2013-07-15 15:02:28 +02:00 |
|
stubbfel
|
5c8756ac21
|
finish #100
|
2013-07-15 15:02:13 +02:00 |
|
stubbfel
|
10018077fc
|
add style
|
2013-07-15 13:35:18 +02:00 |
|
stubbfel
|
ca13f3f581
|
finish #104
|
2013-07-15 13:26:47 +02:00 |
|
Christian Fiedler
|
6f1eae3ca8
|
no message
|
2013-07-12 18:25:17 +02:00 |
|
Christian Fiedler
|
8774683a80
|
Merge branch 'hotfix/#57' into develop
|
2013-07-12 18:12:48 +02:00 |
|
Christian Fiedler
|
8335c47b0f
|
#57 #90 #80
|
2013-07-12 18:08:17 +02:00 |
|
stubbfel
|
ceeaabac1c
|
Merge branch 'release/r#106' into develmaster
|
2013-07-11 16:45:41 +02:00 |
|
stubbfel
|
e1abe121bf
|
Merge branch 'feature/#106' into develop
|
2013-07-11 16:43:53 +02:00 |
|
stubbfel
|
ed891074e0
|
add listbuttonstyle to all pages
|
2013-07-11 16:43:39 +02:00 |
|
stubbfel
|
6dc522b6a8
|
add listButtonstyle
|
2013-07-11 15:31:02 +02:00 |
|
stubbfel
|
b54be92e3c
|
Merge branch 'release/#94' into develmaster
|
2013-07-09 10:21:00 +02:00 |
|