Thomas Blazek
|
93667d4cea
|
Beispiel überarbeitungen
|
2013-08-25 15:16:19 +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
|
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 |
|
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
|
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 |
|