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

96 Commits

Author SHA1 Message Date
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
Thomas Blazek
afd85d0bc0 Semesteransicht auf RESTful routes aufgebaut 2013-08-01 11:57:37 +02:00
Thomas Blazek
747ba5f91a Kosmetik 2013-07-29 17:46:10 +02:00
Thomas Blazek
8f24f773b4 Routes Änderung 2013-07-25 16:55:51 +02:00
Thomas Blazek
cc002d4291 Init 2013-07-22 15:49:19 +02:00
Andreas Stephanides
9e28678781 Home und Willkommenstext aktualisiert , Entwicklungsstatus eiungefügt 2013-03-18 14:39:59 +01:00
Andreas Stephanides
cdf7acd426 Wiki Erstentwurf, 
gollum installiert und Aktiviert,
noch nicht fertig!

Neuigkeiten / Rubriken Verwaltung verbessert
+ Neue Neuigkeiten einfügen,
+ Liste der Neuigkeiten einer Kategorie
+ html für Neuigkeiten
 2013-03-02 14:09:12 +01:00
Andreas Stephanides
748497ce98 Rubriken_verwalten hinzugefügt, kleine Änderung an Rubriken View 2013-02-21 09:52:53 +01:00
Andreas Stephanides
f444707908 layout in news und kleiner fix 2013-02-20 01:03:06 +01:00
Andreas Stephanides
f17b269458 Merge remote-tracking branch 'remotes/origin/master' 
Conflicts:
	app/controllers/config_controller.rb
	app/views/config/index.html.erb
	config/routes.rb
 2013-02-17 15:57:05 +01:00
Andreas Stephanides
5b8b419fa1 resolve config_url problems 2013-02-17 15:46:48 +01:00
Andreas Stephanides
3d60580332 remove GIT part 1 2013-02-17 12:16:44 +01:00
Andreas Stephanides
6acd562297 Link zum Update 2013-02-16 11:39:37 +01:00
Andreas Stephanides
bcc6de5349 Config Controller für Administration 2013-02-16 11:02:47 +01:00
Andreas Stephanides
19b4ed31f4 Beispiele hinzugefügt 2013-02-15 10:48:52 +01:00
Andreas Stephanides
232e6cefff scaffoldsgesäubert 2013-02-12 10:08:44 +01:00
Andreas Stephanides
3d11400d5e GitHub Account angelegt 2013-02-12 02:05:12 +01:00