Thomas Blazek
|
0df72b9df1
|
Merge branch 'master' of https://github.com/andreassteph/fetsite
|
2013-08-19 20:58:39 +02:00 |
|
Thomas Blazek
|
e50deccf7f
|
Merge branch 'master' of https://github.com/HausdorffHimself/fetsite
|
2013-08-19 20:57:48 +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 |
|
HausdorffHimself
|
29388ddcac
|
CHANGE: Beschreibungstext wird abgeschnitten auf Themengruppe::WORD_COUNT sowie
locales für Thema
|
2013-08-19 19:28:53 +02:00 |
|
Andreas Stephanides
|
401689d04c
|
ignore tempfiles
|
2013-08-19 18:54:04 +02:00 |
|
Thomas Blazek
|
2e4f46fa84
|
Merge branch 'master' of https://github.com/HausdorffHimself/fetsite
|
2013-08-19 18:50:22 +02:00 |
|
HausdorffHimself
|
629a2d84c7
|
FIX: routes für Fragen
|
2013-08-19 18:46:04 +02:00 |
|
Thomas Blazek
|
9c1eff6bec
|
Form kosmetik
|
2013-08-19 17:59:29 +02:00 |
|
Thomas Blazek
|
3043739a10
|
leerzeilen löschen
|
2013-08-19 15:49:04 +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
|
ea0b245d54
|
fetzneditions
|
2013-08-19 15:41:52 +02:00 |
|
Andreas Stephanides
|
34b602e126
|
a lot of new models ...
Fotogallary, gremien, fetprofil,
|
2013-08-19 15:39:56 +02:00 |
|
Andreas Stephanides
|
d17b911809
|
fix inflections
irregular sollte bei inflections genutzt werden
|
2013-08-18 20:48:45 +02:00 |
|
Andreas Stephanides
|
c2d292946a
|
route für getting started
|
2013-08-18 17:25:37 +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 |
|
Andreas Stephanides
|
5c14fdadaf
|
Verwaltungsrouten eingefügt
|
2013-08-13 22:22:37 +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
|
273078d006
|
ADD: Nested Ressources für Themengruppen und Themen
|
2013-08-13 18:32:45 +02:00 |
|
HausdorffHimself
|
098f6b0a55
|
FIX: Fallback für Lokalisation + Fallback-Ordnung
|
2013-08-13 18:32:09 +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 |
|
Andreas Stephanides
|
ff31ba6bff
|
Kleine Anpassungen Calentry
|
2013-08-11 17:05:56 +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
|
78f7a685b1
|
Verwaltung
|
2013-08-07 16:24:19 +02:00 |
|
Thomas Blazek
|
4ffc8fbea1
|
Studienverwaltung
|
2013-08-07 12:17:05 +02:00 |
|
HausdorffHimself
|
3be95d2ede
|
FIXES:
* Inflections für Thema/Themen etc.
* Korrigierte Views
|
2013-08-06 02:06:48 +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 |
|
HausdorffHimself
|
ac4cb5d0fe
|
New Feature: Themen/Informationen
|
2013-08-05 18:31:04 +02:00 |
|
Thomas Blazek
|
abf367b8e4
|
Studienansicht neu
|
2013-08-05 18:24:34 +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
|
afd85d0bc0
|
Semesteransicht auf RESTful routes aufgebaut
|
2013-08-01 11:57:37 +02:00 |
|
Thomas Blazek
|
747ba5f91a
|
Kosmetik
|
2013-07-29 17:46:10 +02:00 |
|
Thomas Blazek
|
0e4574603d
|
Localization
|
2013-07-25 16:59:01 +02:00 |
|
