Andreas Stephanides
|
79e4b71df3
|
membership form fix
|
2013-08-25 13:07:38 +02:00 |
|
Andreas Stephanides
|
892cf84593
|
FIX <> neuigkeit vertauscht
|
2013-08-24 06:33:56 +02:00 |
|
HausdorffHimself
|
d8d5bc3fe9
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2013-08-24 04:17:03 +02:00 |
|
HausdorffHimself
|
94614b1d5b
|
ADD: Dateieinbindung in TinyMCE für Attachments
|
2013-08-24 04:07:33 +02:00 |
|
Andreas Stephanides
|
2548ddb9ab
|
fix neuigkeit
|
2013-08-23 16:07:13 +02:00 |
|
Andreas Stephanides
|
032504d0e3
|
Merge branch 'master' of https://github.com/HausdorffHimself/fetsite
|
2013-08-23 14:30:31 +02:00 |
|
Andreas Stephanides
|
0ca18d1f84
|
add picture to neuigkeit
|
2013-08-23 14:30:01 +02:00 |
|
Andreas Stephanides
|
41433c20f9
|
public neuigkeit/rubrik -calentry link
|
2013-08-23 13:42:19 +02:00 |
|
HausdorffHimself
|
7a18a53cc8
|
ADD: picture to themengruppe
|
2013-08-23 13:40:42 +02:00 |
|
Andreas Stephanides
|
de4c84871c
|
Add object to calentries
|
2013-08-23 13:39:54 +02:00 |
|
Andreas Stephanides
|
fabf9d26a6
|
Merge branch 'master' of github.com:andreassteph/fetsite
Conflicts:
app/models/neuigkeit.rb
|
2013-08-23 12:02:45 +02:00 |
|
Andreas Stephanides
|
6d925b1b3d
|
annotations
|
2013-08-23 12:01:14 +02:00 |
|
|
|
57b015a44e
|
neuigkeit styling
|
2013-08-22 23:44:09 +02:00 |
|
Andreas Stephanides
|
cfcf0be4d5
|
Fetprofiles verbesserung Calentry upcoming
|
2013-08-22 16:38:33 +02:00 |
|
Thomas Blazek
|
cbe536a56b
|
bugfix multiple lines
|
2013-08-22 13:49:11 +02:00 |
|
Thomas Blazek
|
9b2db870bc
|
bugfix
|
2013-08-22 11:51:57 +02:00 |
|
Thomas Blazek
|
a2f3608d8f
|
Jquery-upload
|
2013-08-22 00:08:06 +02:00 |
|
Andreas Stephanides
|
6db4a40c59
|
Merge branch 'master' of https://github.com/Inachos/fetsite
|
2013-08-21 19:04:59 +02:00 |
|
Andreas Stephanides
|
a4538fa61a
|
Fetprofile, Gremien etc bearbeitet
|
2013-08-21 19:04:26 +02:00 |
|
Thomas Blazek
|
24d21df84b
|
minor changes
|
2013-08-21 14:11:53 +02:00 |
|
Thomas Blazek
|
04b91b9f33
|
Lecturer in Lva eingebunden, Image thumb integriert
|
2013-08-21 13:48:49 +02:00 |
|
Andreas Stephanides
|
0a910386d7
|
Merge branch 'master' of https://github.com/HausdorffHimself/fetsite
|
2013-08-20 13:58:20 +02:00 |
|
Andreas Stephanides
|
d96a694a73
|
fotogallery
|
2013-08-19 20:49:07 +02:00 |
|
HausdorffHimself
|
80fa19680b
|
NEW: Form für Fragen
|
2013-08-19 19:41:49 +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 |
|
Thomas Blazek
|
5c83d36ea5
|
semester migration
|
2013-08-19 16:46:26 +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
|
4c48a4b769
|
fetzneditions
|
2013-08-19 15:42:08 +02:00 |
|
Andreas Stephanides
|
34b602e126
|
a lot of new models ...
Fotogallary, gremien, fetprofil,
|
2013-08-19 15:39:56 +02:00 |
|
Andreas Stephanides
|
a19d708134
|
fix translate_studien
|
2013-08-19 13:55:40 +02:00 |
|
Andreas Stephanides
|
39b381f58e
|
optional git fuer globalize3 keine Auswirkung
|
2013-08-18 20:47:51 +02:00 |
|
Andreas Stephanides
|
b748382df4
|
Abilities für Rollenvergabe
|
2013-08-18 17:56:54 +02:00 |
|
Andreas Stephanides
|
5eb9e41c71
|
FIX Neuigkeiten New
|
2013-08-15 12:55:02 +02:00 |
|
Andreas Stephanides
|
b00e0709ca
|
einige updates ability
|
2013-08-15 11:47:23 +02:00 |
|
Andreas Stephanides
|
501554eee1
|
Kalender update - tabs...
|
2013-08-13 22:23:02 +02:00 |
|
Andreas Stephanides
|
81c46e28b9
|
Rechteverwaltung Start
|
2013-08-13 22:21:45 +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
|
e055b60a53
|
ADD: Informationsseite:
Models für Themengruppen/Themen/FAQs/Attachments
Views für Themengruppen/Themen
|
2013-08-13 18:31:22 +02:00 |
|
Andreas Stephanides
|
d988c22e29
|
Kleiner bugfix
|
2013-08-13 17:38:07 +02:00 |
|
Thomas Blazek
|
b1f9ec1c39
|
Abkürzungen zu Studien hinzugefügt
|
2013-08-13 17:22:29 +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
|
09dd4f65a0
|
Prüfungsinformationen und Typ zu lva hinzugefügt
|
2013-08-12 09:15:58 +02:00 |
|
Thomas Blazek
|
350dc6d8c2
|
Merge branch 'master' into calendar
|
2013-08-11 21:27:46 +02:00 |
|
Thomas Blazek
|
dfd99bec5f
|
Prüfungsinformation und Lernaufwand zu Lva hinzugefügt
|
2013-08-11 21:25:18 +02:00 |
|
Andreas Stephanides
|
ff31ba6bff
|
Kleine Anpassungen Calentry
|
2013-08-11 17:05:56 +02:00 |
|
