Commit Graph

162 Commits

Author SHA1 Message Date
Pet
2afbd0fa45 Added the verleihkalender view 2018-05-15 20:15:01 +02:00
Pet
ef1135962e Implemented Lackis infoscreen layout 2018-04-12 20:33:09 +02:00
ee451cdd9b some changes 2017-03-30 23:11:57 +02:00
Andreas Stephanides
d85a01c810 AutoCommit Son Sep 13 11:03:05 CEST 2015 2015-09-13 11:03:05 +02:00
Andreas Stephanides
97d5427f6d AutoCommit Son Sep 13 00:03:01 CEST 2015 2015-09-13 00:03:01 +02:00
Andreas Stephanides
92667b92e9 AutoCommit Sam Sep 12 22:03:04 CEST 2015 2015-09-12 22:03:04 +02:00
Andreas Stephanides
4835155d06 AutoCommit Don Sep 3 11:03:01 CEST 2015 2015-09-03 11:03:01 +02:00
Andreas Stephanides
e7c21ad95b AutoCommit Don Sep 3 10:03:06 CEST 2015 2015-09-03 10:03:06 +02:00
Andreas Stephanides
889d7ac3d0 AutoCommit Mit Sep 2 23:03:01 CEST 2015 2015-09-02 23:03:01 +02:00
Andreas Stephanides
c8e8a0d229 AutoCommit Fre Aug 21 22:03:01 CEST 2015 2015-08-21 22:03:01 +02:00
Andreas Stephanides
bfe65e14e3 AutoCommit Fre Aug 21 21:03:01 CEST 2015 2015-08-21 21:03:01 +02:00
Andreas Stephanides
c396c7410e AutoCommit Fre Aug 21 20:03:03 CEST 2015 2015-08-21 20:03:03 +02:00
Andreas Stephanides
73f364e620 AutoCommit Don Aug 6 23:03:01 CEST 2015 2015-08-06 23:03:01 +02:00
Andreas Stephanides
f71171f509 css & destroy 2015-08-01 23:38:06 +02:00
Andreas Stephanides
8a867b72a3 AutoCommit Fre Jul 31 18:03:05 CEST 2015 2015-07-31 18:03:05 +02:00
Andreas Stephanides
02b3a651ca AutoCommit Fre Jul 31 17:03:12 CEST 2015 2015-07-31 17:03:12 +02:00
Andreas Stephanides
b450757e47 AutoCommit Fre Jul 31 10:03:05 CEST 2015 2015-07-31 10:03:05 +02:00
Andreas Stephanides
97df081b33 AutoCommit Don Jul 30 00:03:02 CEST 2015 2015-07-30 00:03:02 +02:00
Andreas Stephanides
068c2a2e55 AutoCommit Fre Jul 17 14:03:07 CEST 2015 2015-07-17 14:03:07 +02:00
Andreas Stephanides
0e9525af81 AutoCommit Fre Jul 17 13:03:05 CEST 2015 2015-07-17 13:03:05 +02:00
Andreas Stephanides
ef4bfa4012 AutoCommit Son Jun 21 01:03:01 CEST 2015 2015-06-21 01:03:01 +02:00
Andreas Stephanides
c62b3b34dd AutoCommit Son Jun 21 00:03:01 CEST 2015 2015-06-21 00:03:01 +02:00
Andreas Stephanides
3618db1376 AutoCommit Mon Jun 15 17:03:08 CEST 2015 2015-06-15 17:03:08 +02:00
Andreas Stephanides
18021fb502 AutoCommit Mon Jun 8 18:03:05 CEST 2015 2015-06-08 18:03:05 +02:00
Andreas Stephanides
45b5798e7d AutoCommit Mon Jun 8 17:03:02 CEST 2015 2015-06-08 17:03:02 +02:00
Andreas Stephanides
6c8e30b701 gitignore 2015-06-04 12:47:52 +02:00
Andreas Stephanides
6c2238e740 blue2 update 2015-06-01 17:21:47 +02:00
Andreas Stephanides
5a7eb23a1f studium form update 2015-05-28 20:17:36 +02:00
Andreas Stephanides
bac4c5f924 document toolbar sticky 2015-05-13 11:21:42 +02:00
Andreas Stephanides
a2491ee84d inline tinymce document 2015-05-04 13:40:27 +02:00
Andreas Stephanides
caaea67994 style update 2015-04-27 17:23:25 +02:00
Andreas Stephanides
2e9910b4ea style box 2015-03-15 19:50:52 +01:00
Andreas Stephanides
8718a77e4f neuigkeit update 2015-03-02 19:12:07 +01:00
Thomas Blazek
710ef968dc Merge branch 'master' of https://github.com/andreassteph/fetsite into andi_spinnt 2015-02-25 10:37:12 +01:00
Andreas Stephanides
f1a149908d meetingtyp management 2015-02-09 15:38:21 +01:00
Thomas Blazek
d91a150d51 addendum 2015-01-27 10:59:09 +01:00
Thomas Blazek
deb8ccf47d started working on menu 2015-01-27 10:58:45 +01:00
Andreas Stephanides
e93b9b7342 Merge branch 'testgallery' 2015-01-17 12:18:14 +01:00
Andreas Stephanides
3c2250b4fc Revert "change meetings"
This reverts commit 585b386e7c.

Conflicts:
	app/controllers/neuigkeiten_controller.rb
2015-01-17 12:16:37 +01:00
edc8f6c2e3 small fixes 2015-01-17 12:04:53 +01:00
Thomas Blazek
75667ae6ce work in progress 2015-01-16 00:03:09 +01:00
Andreas Stephanides
978d923082 fix blueimp gallery 2015-01-15 16:38:16 +01:00
Andreas Stephanides
fe4d72dcb3 application css scss 2015-01-15 15:57:00 +01:00
Andreas Stephanides
43a551fc28 Merge branch 'master' of https://github.com/Inachos/fetsite into testgallery
Conflicts:
	app/views/layouts/application.html.erb
2015-01-15 15:40:36 +01:00
Thomas Blazek
3dff2d2bbe Fix: Bildergallerie
Bildergallerie läuft jetzt auf Blueimp-gallery.
Viel spaß
2015-01-15 15:36:20 +01:00
Andreas Stephanides
565024c282 blue2 2015-01-15 15:20:19 +01:00
Thomas Blazek
79ba089b70 Merge branch 'master' of https://github.com/Inachos/fetsite
Conflicts:
	Gemfile.lock
	config/routes.rb
2015-01-11 22:18:05 +01:00
Andreas Stephanides
87dd70ea44 meetings added, documents added 2014-12-08 22:58:21 +01:00
Andreas Stephanides
2688bca831 calentry inline form 2014-10-28 08:43:44 +01:00
Andreas Stephanides
58417fd59f try to fix gallery 2014-10-27 13:00:03 +01:00