Commit Graph

114 Commits

Author SHA1 Message Date
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
Andreas Stephanides
9ec7bdd6cb fotos - resized 2013-08-22 17:52:56 +02:00
Andreas Stephanides
cfcf0be4d5 Fetprofiles verbesserung Calentry upcoming 2013-08-22 16:38:33 +02:00
Andreas Stephanides
d031e7b855 Mitarbeiter Menueintrag 2013-08-22 15:46:18 +02:00
Thomas Blazek
09fc68eef0 uploader 2013-08-22 11:16:32 +02:00
Andreas Stephanides
6db4a40c59 Merge branch 'master' of https://github.com/Inachos/fetsite 2013-08-21 19:04:59 +02:00
Andreas Stephanides
a4538fa61a Fetprofile, Gremien etc bearbeitet 2013-08-21 19:04:26 +02:00
Thomas Blazek
24d21df84b minor changes 2013-08-21 14:11:53 +02:00
Thomas Blazek
414f740ac2 translations 2013-08-21 13:08:21 +02:00
Andreas Stephanides
0a910386d7 Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-08-20 13:58:20 +02:00
Andreas Stephanides
d96a694a73 fotogallery 2013-08-19 20:49:07 +02:00
Andreas Stephanides
7ab34fa845 Merge branch 'master' of https://github.com/Inachos/fetsite 2013-08-19 19:40:41 +02:00
HausdorffHimself
29388ddcac CHANGE: Beschreibungstext wird abgeschnitten auf Themengruppe::WORD_COUNT sowie
locales für Thema
2013-08-19 19:28:53 +02:00
Andreas Stephanides
401689d04c ignore tempfiles 2013-08-19 18:54:04 +02:00
Thomas Blazek
2e4f46fa84 Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-08-19 18:50:22 +02:00
HausdorffHimself
629a2d84c7 FIX: routes für Fragen 2013-08-19 18:46:04 +02:00
Thomas Blazek
9c1eff6bec Form kosmetik 2013-08-19 17:59:29 +02:00
Thomas Blazek
3043739a10 leerzeilen löschen 2013-08-19 15:49:04 +02:00
Thomas Blazek
1db27955de Merge branch 'master' of https://github.com/andreassteph/fetsite
Conflicts:
	config/routes.rb
2013-08-19 15:47:12 +02:00
Thomas Blazek
f58c359d36 Introducing Lecturers 2013-08-19 15:43:54 +02:00
Andreas Stephanides
ea0b245d54 fetzneditions 2013-08-19 15:41:52 +02:00
Andreas Stephanides
34b602e126 a lot of new models ...
Fotogallary, gremien, fetprofil,
2013-08-19 15:39:56 +02:00
Andreas Stephanides
d17b911809 fix inflections
irregular sollte bei inflections genutzt werden
2013-08-18 20:48:45 +02:00