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

..

themes

fix link dialog #181

2014-10-26 13:14:37 +01:00

application.css.scss

tinmce update

2014-07-03 21:31:27 +05:30

attachments.css.scss

New Feature: Themen/Informationen

2013-08-05 18:31:04 +02:00

beispiele.css.scss

Init

2013-07-22 15:49:19 +02:00

bootstrap-responsive.scss

Responsive Menubar springt direkt auf 100% Kopfzeile um

2013-08-13 00:07:29 +02:00

calendars.css.scss

Themen und themes_for_rails neues design

2014-01-08 20:23:58 +01:00

calentries.css.scss

calendar feature generiert

2013-08-06 00:48:45 +02:00

fetlogo.css.scss

fonts darkblue theme

2014-04-18 11:29:24 +02:00

fetmeetings.css.scss

change meetings

2014-08-27 15:22:47 +02:00

fetmeetingtops.css.scss

change meetings

2014-08-27 15:22:47 +02:00

fetprofiles.css.scss

Farbanpassungen & Linkbox

2013-09-26 10:10:46 +02:00

fetzneditions.css.scss

fetzneditions

2013-08-19 15:42:08 +02:00

flatfeticon1.css.scss

Interface fixes icons,colors

2014-07-09 22:44:42 +05:30

formtastic-changes.css.scss

Beispiel überarbeitungen

2013-08-25 15:16:19 +02:00

fotos.css.scss

a lot of new models ...

2013-08-19 15:39:56 +02:00

fragen.css.scss

New Feature: Themen/Informationen

2013-08-05 18:31:04 +02:00

galleries.css.scss

CHANGE: New visualisation of Gallery

2013-09-10 01:55:47 +02:00

gremien.css.scss

a lot of new models ...

2013-08-19 15:39:56 +02:00

layout.css.scss

calentry inline form

2014-10-28 08:43:44 +01:00

lecturers.css.scss

Introducing Lecturers

2013-08-19 15:43:54 +02:00

lvas.css.scss

Beispiel überarbeitungen

2013-08-25 15:16:19 +02:00

meetings.css.scss

meetings added, documents added

2014-12-08 22:58:21 +01:00

meetingtyps.css.scss

meetings added, documents added

2014-12-08 22:58:21 +01:00

memberships.css.scss

a lot of new models ...

2013-08-19 15:39:56 +02:00

modulgruppen.css.scss

Init

2013-07-22 15:49:19 +02:00

moduls.css.scss

Init

2013-07-22 15:49:19 +02:00

neuigkeiten.css.scss

neuigkeitem block shadow

2013-09-10 22:14:17 +02:00

rubriken.css.scss

Kalender überarbeitet Issue 91

2013-11-28 10:14:36 +01:00

scaffolds.css.scss

styling zeugs

2013-09-06 18:04:57 +02:00

semesters.css.scss

Init

2013-07-22 15:49:19 +02:00

studien.css.scss

Global Stylesheet contentbox

2013-10-01 12:33:25 +02:00

test.css.scss

Themen und themes_for_rails neues design

2014-01-08 20:23:58 +01:00

themen.css.scss

New Feature: Themen/Informationen

2013-08-05 18:31:04 +02:00

themengruppen.css.scss

themessticker, cleanup routes

2014-06-25 23:09:05 +05:30

tinymce.css.scss

Interface fixes icons,colors

2014-07-09 22:44:42 +05:30