andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
1,023 Commits 7 Branches 0 Tags
60d8c6754c0ffd9ed8f95fd9fde2fda5c7b7555a
Commit Graph

286 Commits

Author SHA1 Message Date
Andreas Stephanides
0f6559bce6 Rechtemanagement integriert in views 2013-08-15 11:46:41 +02:00
Andreas Stephanides
501554eee1 Kalender update - tabs... 2013-08-13 22:23:02 +02:00
Andreas Stephanides
81c46e28b9 Rechteverwaltung Start 2013-08-13 22:21:45 +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
e055b60a53 ADD: Informationsseite: 
Models für Themengruppen/Themen/FAQs/Attachments
Views für Themengruppen/Themen
 2013-08-13 18:31:22 +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
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
Thomas Blazek
af2406b4a1 Merge branch 'master' into calendar 
Conflicts:
	app/views/lvas/show.html.erb
	db/schema.rb
 2013-08-11 11:44:58 +02:00
Thomas Blazek
4f95770fa7 Lva-show überarbeitet 2013-08-11 11:27:37 +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
Andreas Stephanides
a5a02e065a Calendar Klasse überarbeitet Views,gefixt, Pictures hinzugefügt 2013-08-11 01:17:37 +02:00
Thomas Blazek
1bddc125eb Semesters edit überarbeitet 2013-08-11 00:35:23 +02:00
Thomas Blazek
9d8b8ad3d6 kleiner bugfix, layout 2013-08-10 00:58:09 +02:00
Thomas Blazek
b6671879fc Bug fix 
Die persistent variables waren schlecht benannt. hab sie eindeutig
benannt
 2013-08-09 18:49:30 +02:00
Thomas Blazek
61fc09bcf0 Formatierungen 2013-08-09 16:17:51 +02:00
Andreas Stephanides
b329fa4896 simple_calendar, calender_show_view 
Kalender in Tabellenansicht
 2013-08-08 09:09:34 +02:00
Thomas Blazek
5c36eb55a3 Verwaltungsübersicht 2013-08-07 22:07:20 +02:00
Thomas Blazek
a92ff60718 Verwaltung erste interessante version 2013-08-07 17:51:48 +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
Andreas Stephanides
b990151bde Merge branch 'master' of https://github.com/andreassteph/fetsite 
Beispiel.lva bei neues Beispiel resolved
Conflicts:
	app/controllers/beispiele_controller.rb
 2013-08-05 14:55:55 +02:00
Andreas Stephanides
988efd9e6a Neues Beispiel Button 2013-08-05 14:54:31 +02:00
Thomas Blazek
eb2f14f18b div-layouts+bugfixes 2013-08-05 09:57:44 +02:00
Thomas Blazek
ef81b61260 Topbar inclusions 2013-08-04 18:37:34 +02:00
Thomas Blazek
c72c186d62 Topbar layouts 2013-08-04 18:04:27 +02:00
Thomas Blazek
05ed9da9c4 List views 2013-08-04 15:20:20 +02:00
Thomas Blazek
2b5a6edb3b Bugfixes 2013-08-02 19:08:35 +02:00
Thomas Blazek
3114d9fa52 Bugfix 2013-08-02 18:06:06 +02:00
Thomas Blazek
c4a27d17f2 Kleinigkeiten 2013-08-02 16:54:55 +02:00
Thomas Blazek
005c28a273 Toolbar und kopfzeileneinbindung 2013-08-02 15:00:58 +02:00
Thomas Blazek
1c1b0cfe91 Einbau Toolbar 2013-08-02 12:46:18 +02:00
Thomas Blazek
0053a4de0c Einrückungen 2013-08-02 10:39:58 +02:00
Thomas Blazek
348037036a Weitere korrekturen Semester 2013-08-01 17:46:04 +02:00
Thomas Blazek
42f6ee9a49 Einrückungen 2013-08-01 17:45:31 +02:00
Thomas Blazek
afd85d0bc0 Semesteransicht auf RESTful routes aufgebaut 2013-08-01 11:57:37 +02:00
Thomas Blazek
bbaa9b89dd Kosmetik 2013-07-30 14:42:37 +02:00
Thomas Blazek
e686a21c9f Kleine Korrekturen 2013-07-30 09:42:13 +02:00
Thomas Blazek
15f5b599ff Kosmetik 2013-07-29 21:10:40 +02:00
Thomas Blazek
c03ecd3076 Einbindung Beispieluploader 2013-07-29 21:10:15 +02:00
Thomas Blazek
cacee4aa60 Zusatz LVa-automatismus 2013-07-29 20:17:00 +02:00
Thomas Blazek
733080c093 automatik lvas 
LVas die kein Semester anhängen haben, werden automatisch Zu Ungeordnet
hinzugefügt
 2013-07-29 19:47:29 +02:00
Thomas Blazek
7405a2a229 Versuch automatische zuordnung 2013-07-29 18:42:59 +02:00