Thomas Blazek
2d82aa79f6
Merge branch 'master' into calendar
2013-08-12 13:31:47 +02:00
Thomas Blazek
7a452fa9c1
Formtastic css, Lva-typ änderungen
2013-08-12 11:58:27 +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
7bdd3b1959
Bootstrap wieder zurück korrigiert
2013-08-11 17:06:22 +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
90b8aff78d
lva view tweaks
2013-08-11 11:34:20 +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
Andreas Stephanides
a5a02e065a
Calendar Klasse überarbeitet Views,gefixt, Pictures hinzugefügt
2013-08-11 01:17:37 +02:00
Thomas Blazek
8229570ec7
css änderungen
2013-08-11 00:34:49 +02:00
Thomas Blazek
57a7e49a34
CSS changes
2013-08-10 22:47:32 +02:00
Thomas Blazek
a6b4501d2d
Form designs
...
Conflicts:
app/assets/stylesheets/formtastic-changes.css.scss
2013-08-10 14:26:44 +02:00
Thomas Blazek
86913257af
Layout changes
2013-08-10 02:03:45 +02:00
Thomas Blazek
9bf4768e09
Form designs
2013-08-09 18:49:56 +02:00
Thomas Blazek
61fc09bcf0
Formatierungen
2013-08-09 16:17:51 +02:00
Thomas Blazek
585af6f162
Lva form verbessert
2013-08-09 14:15:02 +02:00
Andreas Stephanides
6bb35c110a
calendar feature generiert
2013-08-06 00:48:45 +02:00
HausdorffHimself
ac4cb5d0fe
New Feature: Themen/Informationen
2013-08-05 18:31:04 +02:00
Thomas Blazek
cc002d4291
Init
2013-07-22 15:49:19 +02: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
f444707908
layout in news und kleiner fix
2013-02-20 01:03:06 +01:00
Andreas Stephanides
19b4ed31f4
Beispiele hinzugefügt
2013-02-15 10:48:52 +01:00
Andreas Stephanides
247c9c675a
anderes Farbschema
2013-02-14 00:41:16 +01:00
Andreas Stephanides
e56a20bfec
oranges Logo
2013-02-14 00:30:26 +01:00
Andreas Stephanides
3d11400d5e
GitHub Account angelegt
2013-02-12 02:05:12 +01:00
