Commit Graph

136 Commits

Author SHA1 Message Date
Andreas Stephanides
e62f5a2600 mehrere Termine je neuigkeit 2013-11-13 12:50:04 +01:00
Andreas Stephanides
0b6ed94662 locales for fetprofile 2013-11-13 11:05:23 +01:00
Andreas Stephanides
658811903b Merge branch 'master' of github.com:fetsite/fetsite
Conflicts:
	Gemfile.lock
2013-11-12 20:25:48 +01:00
Andreas Stephanides
cbdc437c6c i18n fetprofile 2013-11-12 20:22:56 +01:00
Andreas Stephanides
ae99841306 Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
	Gemfile.lock
2013-11-11 20:04:08 +01:00
Andreas Stephanides
f3288d5b69 production environment compile online 2013-11-11 20:03:00 +01:00
Thomas Blazek
6509a51eb3 Modulgruppe->show fixed
Switched to pretty toolbar
2013-11-06 10:08:52 +01:00
Andreas Stephanides
80736026af kein h1 button für tinymce 2013-11-04 18:45:04 +01:00
Andreas Stephanides
635afb7815 tinymce heading plugin 2013-11-02 13:07:41 +01:00
Andreas Stephanides
ef7deacec7 disable whitelist protection + seeds 2013-10-28 12:37:34 +01:00
Andreas Stephanides
637fe7dc9f G 2013-10-28 11:25:29 +01:00
Andreas Stephanides
1058709b38 omniauth_secrets.example 2013-10-26 14:14:49 +02:00
Andreas Stephanides
37ee03676e add ldap support
Achtung dieses diff benötigt einen neuen Eintrag im secrets config file
2013-10-26 12:48:40 +02:00
Thomas Blazek
8b0186b4b4 Beispiele on startpage / beispiele kosmetik 2013-10-06 18:51:33 +02:00
Andreas Stephanides
5e06187a94 neuigkeiten small fix 2013-09-17 19:30:34 +02:00
HausdorffHimself
be55462e35 ADD: Rotate Image via EXIF Information 2013-09-13 01:44:07 +02:00
HausdorffHimself
ca6858c0a0 FIX: thumbnail size reduced by stripping all EXIF information 2013-09-13 01:36:04 +02:00
HausdorffHimself
e54c026fee FIX: Translations 2013-09-12 03:33:53 +02:00
HausdorffHimself
b363de9699 ADD: Translations for gallery 2013-09-12 03:22:52 +02:00
HausdorffHimself
d11b72b43b FIX: Insert common translations 2013-09-12 03:22:28 +02:00
HausdorffHimself
33a6e9cb81 FIX: Correct translation 2013-09-12 03:21:59 +02:00
HausdorffHimself
a2e1b9d55b ADD: quality-process added to FotoUploader 2013-09-12 03:07:52 +02:00
HausdorffHimself
3c96b23a82 Merge branch 'master' of https://github.com/fetsite/fetsite 2013-09-12 00:58:52 +02:00
HausdorffHimself
77ee994edb NEW: Pictures per Site Feature + Pagination + improved SQL query 2013-09-12 00:58:33 +02:00
HausdorffHimself
3e8950ba64 CHANGE: pretty_toolbar für Foto 2013-09-11 21:51:59 +02:00
Andreas Stephanides
4b484c8d76 gremien tabs 2013-09-10 22:14:29 +02:00
HausdorffHimself
0e12cec427 CHANGE: New visualisation of Gallery 2013-09-10 01:55:47 +02:00
Andreas Stephanides
a60bdf5149 design und struktur (container - unnötige entfernt) 2013-09-07 12:37:16 +02:00
Andreas Stephanides
ca60c3ef1b neuigkeit unpublish 2013-09-06 00:33:30 +02:00
HausdorffHimself
9c316f165c CHANGE: pretty_toolbar für Fragen und Themen 2013-09-01 23:56:04 +02:00
HausdorffHimself
94925e34ba ADD: eigene locales-yml für themen/themengruppen/attachment - Bereich 2013-09-01 21:08:03 +02:00
Andreas Stephanides
a3ca1f1f10 gremien + routes update 2013-09-01 10:45:31 +02:00
Andreas Stephanides
9f2c184e43 datepicker_input 2013-08-30 23:28:27 +02:00
Andreas Stephanides
276e00e5f7 routes indentions fixed 2013-08-30 23:27:57 +02:00
Andreas Stephanides
7b2c9545bb neuigkeit.publish local 2013-08-27 22:09:43 +02:00
Andreas Stephanides
e6a1166a2d cleaning routes 2013-08-27 21:41:05 +02:00
Andreas Stephanides
616de516db Merge branch 'master' of github.com:fetsite/fetsite 2013-08-25 17:45:48 +02:00
Thomas Blazek
772d5fe003 Merge branch 'master' of https://github.com/andreassteph/fetsite 2013-08-25 15:22:41 +02:00
Thomas Blazek
93667d4cea Beispiel überarbeitungen 2013-08-25 15:16:19 +02:00
Andreas Stephanides
3db5d65ad7 omniauth_secrets added 2013-08-25 13:53:31 +02:00
Andreas Stephanides
3fd47351d9 comment out dummy devise provider 2013-08-25 13:11:40 +02:00
Andreas Stephanides
1fb193ee2b ignore omniauth_secrets and dummy initialize in devise.rb 2013-08-25 13:11:06 +02:00
Andreas Stephanides
c592bf9d97 Omniauth + Omniauthfacebook
für
2013-08-25 13:08:39 +02:00
Andreas Stephanides
79e4b71df3 membership form fix 2013-08-25 13:07:38 +02:00
HausdorffHimself
d8d5bc3fe9 Merge branch 'master' of https://github.com/fetsite/fetsite 2013-08-24 04:17:03 +02:00
HausdorffHimself
94614b1d5b ADD: Dateieinbindung in TinyMCE für Attachments 2013-08-24 04:07:33 +02:00
Andreas Stephanides
d928330189 neuigeiten startseite 2013-08-23 18:28:38 +02:00
Thomas Blazek
069cd4b763 locale und design 2013-08-23 17:24:15 +02:00
HausdorffHimself
e87f108d8a Merge branch 'master' of https://github.com/andreassteph/fetsite 2013-08-23 12:04:57 +02:00
HausdorffHimself
f64079415a ressourcify attachment 2013-08-23 12:04:24 +02:00