Thomas Blazek
|
e50deccf7f
|
Merge branch 'master' of https://github.com/HausdorffHimself/fetsite
|
2013-08-19 20:57:48 +02:00 |
|
HausdorffHimself
|
29388ddcac
|
CHANGE: Beschreibungstext wird abgeschnitten auf Themengruppe::WORD_COUNT sowie
locales für Thema
|
2013-08-19 19:28:53 +02:00 |
|
Thomas Blazek
|
9c1eff6bec
|
Form kosmetik
|
2013-08-19 17:59:29 +02:00 |
|
Andreas Stephanides
|
de83a40683
|
Translations aufgeteilt auf mehrere files
|
2013-08-15 11:45:33 +02:00 |
|
Andreas Stephanides
|
501554eee1
|
Kalender update - tabs...
|
2013-08-13 22:23:02 +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 |
|
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 |
|
Andreas Stephanides
|
c31c530e62
|
Datumsformat - Time.short angepasst
|
2013-08-10 14:28:17 +02:00 |
|
Thomas Blazek
|
585af6f162
|
Lva form verbessert
|
2013-08-09 14:15:02 +02:00 |
|
|
|
8ec00d6a56
|
Lokalisierung date,time
|
2013-08-08 09:09:55 +02:00 |
|
Thomas Blazek
|
5c36eb55a3
|
Verwaltungsübersicht
|
2013-08-07 22:07:20 +02:00 |
|
Thomas Blazek
|
005c28a273
|
Toolbar und kopfzeileneinbindung
|
2013-08-02 15:00:58 +02:00 |
|
Thomas Blazek
|
9f8d83a0b5
|
Translations
|
2013-08-02 12:45:46 +02:00 |
|
Thomas Blazek
|
8562cdd997
|
Übersetzungen
|
2013-08-02 10:40:11 +02:00 |
|
Thomas Blazek
|
6b6a8657be
|
Übersetzungen
|
2013-08-01 17:43:55 +02:00 |
|
Thomas Blazek
|
0e4574603d
|
Localization
|
2013-07-25 16:59:01 +02:00 |
|
Thomas Blazek
|
369056a117
|
Lokalisierungen
|
2013-07-24 22:52:19 +02:00 |
|
Thomas Blazek
|
e695eb4f47
|
Mehr locales
|
2013-07-24 21:20:34 +02:00 |
|
Thomas Blazek
|
821878b04f
|
Weitere Übersetzungen
|
2013-07-23 23:25:54 +02:00 |
|
Thomas Blazek
|
d8dab1d51a
|
Translations for Rubriken
|
2013-07-22 16:17:30 +02:00 |
|
Thomas Blazek
|
870964bf4b
|
Corrected locale: Löschen
|
2013-07-22 15:54:39 +02:00 |
|
Thomas Blazek
|
cc002d4291
|
Init
|
2013-07-22 15:49:19 +02:00 |
|
Andreas Stephanides
|
7494e76701
|
Controller Update
|
2013-03-21 20:17:30 +01:00 |
|
Andreas Stephanides
|
9e28678781
|
Home und Willkommenstext aktualisiert , Entwicklungsstatus eiungefügt
|
2013-03-18 14:39:59 +01:00 |
|
Andreas Stephanides
|
f444707908
|
layout in news und kleiner fix
|
2013-02-20 01:03:06 +01:00 |
|
Andreas Stephanides
|
f2e2b1203f
|
studien,modul views: internationalisierung und Navigation
|
2013-02-13 00:47:24 +01:00 |
|
Andreas Stephanides
|
cf33706320
|
fixed studien Ansicht und Modulgruppen
|
2013-02-12 23:51:43 +01:00 |
|
Andreas Stephanides
|
642ca81cc8
|
kleine Korrektur im Ribrik Controller
|
2013-02-12 11:18:52 +01:00 |
|
Andreas Stephanides
|
232e6cefff
|
scaffoldsgesäubert
|
2013-02-12 10:08:44 +01:00 |
|
Andreas Stephanides
|
3d11400d5e
|
GitHub Account angelegt
|
2013-02-12 02:05:12 +01:00 |
|
