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 |
|
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
|
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
|
9d8b8ad3d6
|
kleiner bugfix, layout
|
2013-08-10 00:58:09 +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
|
05ed9da9c4
|
List views
|
2013-08-04 15:20:20 +02:00 |
|
Thomas Blazek
|
c03ecd3076
|
Einbindung Beispieluploader
|
2013-07-29 21:10:15 +02:00 |
|
Thomas Blazek
|
cc002d4291
|
Init
|
2013-07-22 15:49:19 +02:00 |
|
Andreas Stephanides
|
19b4ed31f4
|
Beispiele hinzugefügt
|
2013-02-15 10:48:52 +01:00 |
|