stubbfel
|
7396edc095
|
Merge branch 'hotfix/#93' into develmaster
|
2013-07-09 10:14:08 +02:00 |
|
stubbfel
|
b6b003315f
|
Merge branch 'hotfix/#93' into develop
|
2013-07-09 10:14:08 +02:00 |
|
stubbfel
|
e1ea814861
|
change homeworkicon at startpage (fix #93)
|
2013-07-09 10:13:50 +02:00 |
|
stubbfel
|
579217ec1c
|
Merge branch 'release/r#92' into develmaster
|
2013-07-08 18:47:53 +02:00 |
|
stubbfel
|
2f247e29b4
|
add toogleButton and in import in Studentcouncil
|
2013-07-08 18:46:31 +02:00 |
|
stubbfel
|
3003508139
|
Merge branch 'release/r#91#83#84#86#85' into develmaster
|
2013-07-08 15:34:57 +02:00 |
|
stubbfel
|
cb242fc2fd
|
Merge branch 'feature/#85' into develop
|
2013-07-08 15:32:19 +02:00 |
|
stubbfel
|
4f10725531
|
finisch #85
|
2013-07-08 15:31:56 +02:00 |
|
stubbfel
|
c3a572c6f6
|
add Qurreystring to navbtn #85
|
2013-07-08 15:29:01 +02:00 |
|
stubbfel
|
e60bfae1a8
|
add Navbutton anud add Constatn.rex to global
|
2013-07-08 14:12:45 +02:00 |
|
stubbfel
|
731e3305b9
|
finish #86
|
2013-07-08 12:33:01 +02:00 |
|
stubbfel
|
bc77d076c9
|
add Phonebotton and import them to openinghours
|
2013-07-08 12:31:53 +02:00 |
|
stubbfel
|
b3ef2ab81f
|
Merge branch 'feature/#84' into develop
|
2013-07-08 12:15:08 +02:00 |
|
stubbfel
|
ea54e23d56
|
finish #84
|
2013-07-08 12:14:41 +02:00 |
|
stubbfel
|
0f64e15c3f
|
add GoToMapButton aund add them to Openinghours + change Mailbutton
|
2013-07-08 12:13:20 +02:00 |
|
stubbfel
|
476a626de4
|
Merge branch 'feature/#83' into develop
|
2013-07-08 11:37:43 +02:00 |
|
stubbfel
|
2b4b980883
|
finish #83
|
2013-07-08 11:37:28 +02:00 |
|
stubbfel
|
086317fef5
|
add linkbutto and import button in linkpage und studentcouncil
|
2013-07-08 11:35:19 +02:00 |
|
stubbfel
|
3755348854
|
add btuLogo #91
|
2013-07-08 11:15:48 +02:00 |
|
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 |
|
stubbfel
|
cfb7b74610
|
add doku
|
2013-06-27 14:27:52 +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 |
|