andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
1,230 Commits 7 Branches 0 Tags
044d7fc5551a7cb45a869d29bd3b14c967cf3a79
Commit Graph

111 Commits

Author SHA1 Message Date
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
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
Andreas Stephanides
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
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
b4f9e793c3 fix link dialog #181 2014-10-26 13:14:37 +01:00
Andreas Stephanides
5b81cbcdad blue1 startpage 2014-10-19 20:39:21 +02:00
Andreas Stephanides
7d56d10431 comments 2014-10-17 10:17:23 +02:00
Thomas Blazek
bb3229e826 Merge branch 'master' of https://github.com/thisisaname/fetsite 
Conflicts:
	app/controllers/neuigkeiten_controller.rb
	config/routes.rb
 2014-08-27 15:31:52 +02:00
Sai
585b386e7c change meetings 2014-08-27 15:22:47 +02:00
Andreas Stephanides
44a0dc2f98 voteable 2014-07-21 23:41:44 +05:30
Andreas Stephanides
d823dea5c2 error fixes 2014-07-14 17:09:26 +02:00
Andreas Stephanides
4bc7c4b001 Interface fixes icons,colors 2014-07-09 22:44:42 +05:30
Andreas Stephanides
9bd786d053 design neue Farben & icons 2014-07-05 19:20:47 +05:30
Andreas Stephanides
527743c4c1 tinmce update 2014-07-03 21:31:27 +05:30
Andreas Stephanides
ee8f2d0076 themessticker, cleanup routes 2014-06-25 23:09:05 +05:30
Andreas Stephanides
6c9a1b51c4 themen interface cleanup1 2014-06-21 14:53:16 +05:30
Andreas Stephanides
4aafbd1831 fonts darkblue theme 2014-04-18 11:29:24 +02:00
Andreas Stephanides
78197f54b8 verschiedene Schriftarten css 2014-04-17 15:17:31 +02:00
Andreas Stephanides
341f6db268 themengruppen show small fix 2014-03-29 14:06:44 +01:00
Andreas Stephanides
5a083cf30a awesome font icons added 2014-03-29 12:43:37 +01:00
Andreas Stephanides
088492652e blue1css 2014-01-27 21:09:58 +01:00
Andreas Stephanides
f53ff1ab62 adding darkblue theme 2014-01-24 11:14:15 +01:00
Andreas Stephanides
40d7b6ab08 fixing 2003 theme 2014-01-24 11:13:24 +01:00
Andreas Stephanides
eadc5d26b4 themes fixes and versioning small fix 2014-01-22 12:33:45 +01:00
Andreas Stephanides
1f345ad46e calendar layout fix 2014-01-15 16:01:05 +01:00
Andreas Stephanides
9e26c49f0e theme_anpassung 2014-01-15 13:47:35 +01:00
Andreas Stephanides
b86d3aca23 Themen und themes_for_rails neues design 
Neues design mit theme=2003 ansehen
 2014-01-08 20:23:58 +01:00
Andreas Stephanides
578b716275 style anpassung calendar 2013-12-18 09:35:27 +01:00
Andreas Stephanides
b779701ffe header mit bild 2013-11-28 15:17:27 +01:00
Andreas Stephanides
0a507502ba Kalender überarbeitet Issue 91 2013-11-28 10:14:36 +01:00
Andreas Stephanides
6fa208dcbe calender formatierung moved 2013-11-28 10:07:18 +01:00
Andreas Stephanides
ed1e13ac62 calenderformatierung 2013-11-27 15:54:15 +01:00
Andreas Stephanides
8ece6d4d1c header farbe 2013-11-04 18:45:30 +01:00
Andreas Stephanides
00d6fe0e21 small design changes 2013-11-01 23:09:48 +01:00
Thomas Blazek
0fe92a4b48 css contentbox 2013-10-02 10:03:28 +02:00
Thomas Blazek
81fdda6248 Global Stylesheet contentbox 2013-10-01 12:33:25 +02:00
Andreas Stephanides
1f3be74256 Merge branch 'master' of github.com:fetsite/fetsite 2013-09-26 10:29:18 +02:00
Andreas Stephanides
1daf392997 font fix 2013-09-26 10:30:56 +02:00