Andreas Stephanides 658811903b Merge branch 'master' of github.com:fetsite/fetsite ...

Conflicts:
	Gemfile.lock

2013-11-12 20:25:48 +01:00

..

attachments

CHANGE: Attachment-Einbindung in TinyMCE mit Thumbnails und eigenem Partial-View

2013-08-27 18:35:50 +02:00

beispiele

Beispiele on startpage / beispiele kosmetik

2013-10-06 18:51:33 +02:00

calendars

calentries -neuigkeiten calender fix

2013-10-04 16:11:36 +02:00

calentries

Merge branch 'master' of https://github.com/Inachos/fetsite

2013-09-01 11:39:34 +02:00

config

config-index fixed

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

devise

remove debug from sessopnm

2013-10-28 14:35:50 +01:00

fetprofiles

i18n fetprofile

2013-11-12 20:22:56 +01:00

fetzneditions

fetzneditions

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

fotos

FIX: Translation

2013-09-12 03:33:39 +02:00

fragen

CHANGE: pretty_toolbar für Fragen und Themen

2013-09-01 23:56:04 +02:00

galleries

FIX: Margins and spacings

2013-09-12 01:34:37 +02:00

gremien

fixed fetprofiles

2013-09-24 10:00:13 +02:00

home

introduced lva.full_name and rewrote displays

2013-11-07 09:52:45 +01:00

layouts

Placed Login under Sidebar (permanent and easy to see

2013-11-05 09:24:17 +01:00

lecturers

Lecturer in Lva eingebunden, Image thumb integriert

2013-08-21 13:48:49 +02:00

lvas

introduced lva.full_name and rewrote displays

2013-11-07 09:52:45 +01:00

memberships

Views & Logik Membership, Fetprofile, Gremium

2013-08-25 17:44:42 +02:00

modulgruppen

Modulgruppe->show fixed

2013-11-06 10:08:52 +01:00

moduls

locale und design

2013-08-23 17:24:15 +02:00

neuigkeiten

calentries -neuigkeiten calender fix

2013-10-04 16:11:36 +02:00

rubriken

neuigkeiten ->linkbox

2013-09-26 10:11:30 +02:00

semesters

Semesters edit überarbeitet

2013-08-11 00:35:23 +02:00

studien

i18n fetprofile

2013-11-12 20:22:56 +01:00

themen

FIX: Redirect- und Destroy-Pfad

2013-09-06 20:46:07 +02:00

themengruppen

themen sortieren

2013-11-11 20:00:52 +01:00

users

fix Useradmin Liste

2013-10-26 12:49:47 +02:00