Andreas Stephanides
|
2548ddb9ab
|
fix neuigkeit
|
2013-08-23 16:07:13 +02:00 |
|
Thomas Blazek
|
cbe536a56b
|
bugfix multiple lines
|
2013-08-22 13:49:11 +02:00 |
|
Thomas Blazek
|
60d86d9cb1
|
fix multiple
|
2013-08-22 12:04:44 +02:00 |
|
Thomas Blazek
|
9b2db870bc
|
bugfix
|
2013-08-22 11:51:57 +02:00 |
|
Thomas Blazek
|
09fc68eef0
|
uploader
|
2013-08-22 11:16:32 +02:00 |
|
Thomas Blazek
|
a2f3608d8f
|
Jquery-upload
|
2013-08-22 00:08:06 +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
|
162781ac04
|
Bugfix in studien/verwalten
|
2013-08-21 12:12:34 +02:00 |
|
Andreas Stephanides
|
0a910386d7
|
Merge branch 'master' of https://github.com/HausdorffHimself/fetsite
|
2013-08-20 13:58:20 +02:00 |
|
HausdorffHimself
|
65b0ad8c19
|
NEW: FAQs in Themen eingefügt
|
2013-08-19 21:05:46 +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 |
|
Thomas Blazek
|
9c1eff6bec
|
Form kosmetik
|
2013-08-19 17:59:29 +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
|
4c48a4b769
|
fetzneditions
|
2013-08-19 15:42:08 +02:00 |
|
Andreas Stephanides
|
34b602e126
|
a lot of new models ...
Fotogallary, gremien, fetprofil,
|
2013-08-19 15:39:56 +02:00 |
|
Andreas Stephanides
|
0b19583afb
|
redirect für user admin
|
2013-08-18 22:12:06 +02:00 |
|
Andreas Stephanides
|
b748382df4
|
Abilities für Rollenvergabe
|
2013-08-18 17:56:54 +02:00 |
|
Andreas Stephanides
|
35b4f3998a
|
getting_startet hinzugefügt
Home Controller geändert und View hinzugefügt - Beinhaltet eine
Beschreibung wie Rails installiert werden muss um zu entwickeln
|
2013-08-18 17:24:55 +02:00 |
|
Andreas Stephanides
|
5eb9e41c71
|
FIX Neuigkeiten New
|
2013-08-15 12:55:02 +02:00 |
|
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 |
|
|
|
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 |
|
