bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
632 Commits 5 Branches 3 Tags
f13a59b64ee4affcac3f668da815cd6bee01f36a
Commit Graph

66 Commits

Author SHA1 Message Date
Andreas Stephanides
87d7cc247a themengruppen verwalten form 2014-02-16 15:32:04 +01:00
Andreas Stephanides
61f78c4e17 Gemfile ui fix 
Gemfile + routes für themen gruppen
 2014-02-09 21:23:35 +01:00
Andreas Stephanides
20d97d1b4d search route fix 2014-02-08 16:40:20 +01:00
Andreas Stephanides
783b9f41c9 changes in lva und beispiele 
change
 2014-01-22 12:33:07 +01:00
Andreas Stephanides
723182c69f tiss interface alpha 2014-01-17 12:16:37 +01:00
Andreas Stephanides
b86d3aca23 Themen und themes_for_rails neues design 
Neues design mit theme=2003 ansehen
 2014-01-08 20:23:58 +01:00
Andreas Stephanides
e57a3290cf fix users routes 2013-12-16 10:26:08 +01:00
Andreas Stephanides
e62f5a2600 mehrere Termine je neuigkeit 2013-11-13 12:50:04 +01: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
Andreas Stephanides
5e06187a94 neuigkeiten small fix 2013-09-17 19:30:34 +02:00
Andreas Stephanides
4b484c8d76 gremien tabs 2013-09-10 22:14:29 +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
Andreas Stephanides
a3ca1f1f10 gremien + routes update 2013-09-01 10:45:31 +02:00
Andreas Stephanides
276e00e5f7 routes indentions fixed 2013-08-30 23:27:57 +02:00
Andreas Stephanides
e6a1166a2d cleaning routes 2013-08-27 21:41:05 +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
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
Thomas Blazek
09fc68eef0 uploader 2013-08-22 11:16:32 +02:00
Andreas Stephanides
a4538fa61a Fetprofile, Gremien etc bearbeitet 2013-08-21 19:04:26 +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
Andreas Stephanides
401689d04c ignore tempfiles 2013-08-19 18:54:04 +02:00
HausdorffHimself
629a2d84c7 FIX: routes für Fragen 2013-08-19 18:46:04 +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
c2d292946a route für getting started 2013-08-18 17:25:37 +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
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
Andreas Stephanides
4aca98c0f5 Merge remote-tracking branch 'thomasb/master' 
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 11:11:59 +02:00
Andreas Stephanides
ff31ba6bff Kleine Anpassungen Calentry 2013-08-11 17:05:56 +02:00
Thomas Blazek
fd4cd17b53 merge conflict behoben 2013-08-11 10:50:33 +02:00
Thomas Blazek
88ba8fa1c2 Merge branch 'kalender' of https://github.com/andreassteph/fetsite into calendar 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
 2013-08-11 10:34:03 +02:00
Thomas Blazek
78f7a685b1 Verwaltung 2013-08-07 16:24:19 +02:00
Thomas Blazek
4ffc8fbea1 Studienverwaltung 2013-08-07 12:17:05 +02:00
Andreas Stephanides
6bb35c110a calendar feature generiert 2013-08-06 00:48:45 +02:00
HausdorffHimself
b560940a70 Merge branch 'master' of https://github.com/fetsite/fetsite into Infobranch 2013-08-05 18:32:23 +02:00
HausdorffHimself
ac4cb5d0fe New Feature: Themen/Informationen 2013-08-05 18:31:04 +02:00
Thomas Blazek
abf367b8e4 Studienansicht neu 2013-08-05 18:24:34 +02:00