Commit Graph

19 Commits

Author SHA1 Message Date
397721f89e Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
	app/views/themen/_form.html.erb
2014-07-09 20:18:07 +02:00
4bc7c4b001 Interface fixes icons,colors 2014-07-09 22:44:42 +05:30
6a730c7411 for error 2014-07-04 06:44:48 +02:00
520ce0c6ed Form themen fix1 2014-07-04 06:37:43 +02:00
ee8f2d0076 themessticker, cleanup routes 2014-06-25 23:09:05 +05:30
2ba920331a profile form fixed, themen isdraft 2014-06-24 16:32:00 +05:30
a87990c338 Zeit formatiert
Datetimepicker fixed, Speichern und weiter
2014-06-21 16:36:30 +05:30
6c9a1b51c4 themen interface cleanup1 2014-06-21 14:53:16 +05:30
6451c0f175 themen ueberarbeitet attachments verwalten 2014-06-09 23:14:05 +05:30
Andreas Stephanides
ad704aacd5 größerer Editor 2014-05-02 18:55:26 +02:00
73bba9bc6f faqs oberfläche 2014-04-11 13:01:17 +02:00
Andreas Stephanides
ddb230604c small fixes
removed beispiel show action
beautified search url
anchors for faqs fixed
2014-03-29 14:05:33 +01:00
Andreas Stephanides
87d7cc247a themengruppen verwalten form 2014-02-16 15:32:04 +01:00
HausdorffHimself
338f3a0a06 CHANGE: Attachment-Einbindung in TinyMCE mit Thumbnails und eigenem Partial-View 2013-08-27 18:35:50 +02:00
HausdorffHimself
e7eabbe6aa FIX: no picture in themen 2013-08-24 17:16:10 +02:00
HausdorffHimself
94614b1d5b ADD: Dateieinbindung in TinyMCE für Attachments 2013-08-24 04:07:33 +02:00
HausdorffHimself
7a18a53cc8 ADD: picture to themengruppe 2013-08-23 13:40:42 +02:00
HausdorffHimself
e055b60a53 ADD: Informationsseite:
Models für Themengruppen/Themen/FAQs/Attachments
Views für Themengruppen/Themen
2013-08-13 18:31:22 +02:00
HausdorffHimself
ac4cb5d0fe New Feature: Themen/Informationen 2013-08-05 18:31:04 +02:00