andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
405 Commits 7 Branches 0 Tags
3c755d09db4963fc3f63c1ca3e9a5061e0252981
Commit Graph

102 Commits

Author SHA1 Message Date
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
Andreas Stephanides
c2d292946a route für getting started 2013-08-18 17:25:37 +02:00
Andreas Stephanides
de83a40683 Translations aufgeteilt auf mehrere files 2013-08-15 11:45:33 +02:00
Andreas Stephanides
501554eee1 Kalender update - tabs... 2013-08-13 22:23:02 +02:00
Andreas Stephanides
5c14fdadaf Verwaltungsrouten eingefügt 2013-08-13 22:22:37 +02:00
Andreas Stephanides
235cc4094e Merge remote-tracking branch 'hausdorff/master' 2013-08-13 19:25:26 +02:00
Andreas Stephanides
ea967240a5 User Rollenhinzufügen - erster Versuch 2013-08-13 19:22:53 +02:00
HausdorffHimself
c7d63c4c19 Merge branch 'master' of https://github.com/fetsite/fetsite 
Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb
 2013-08-13 19:05:26 +02:00
HausdorffHimself
273078d006 ADD: Nested Ressources für Themengruppen und Themen 2013-08-13 18:32:45 +02:00
HausdorffHimself
098f6b0a55 FIX: Fallback für Lokalisation + Fallback-Ordnung 2013-08-13 18:32:09 +02:00
Thomas Blazek
96753c3fef Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
 2013-08-12 13:44:47 +02:00
Thomas Blazek
2d82aa79f6 Merge branch 'master' into calendar 2013-08-12 13:31:47 +02:00
Thomas Blazek
501a4f3903 Views überarbeitet 2013-08-12 12:49:10 +02:00