Andreas Stephanides
|
5c91a746e3
|
neuigkeit fix2
|
2013-08-23 14:41:35 +02:00 |
|
Andreas Stephanides
|
1721dabe19
|
neuigkeit FIX
|
2013-08-23 14:37:57 +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
|
adbbce5fc8
|
CHANGE: Layout auf CSS umgestellt
|
2013-08-23 13:41:09 +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
|
2e808b8a54
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2013-08-23 12:03:28 +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 |
|
Thomas Blazek
|
8f2da66215
|
Merge branch 'master' of https://github.com/andreassteph/fetsite
|
2013-08-22 23:49:18 +02:00 |
|
|
|
57b015a44e
|
neuigkeit styling
|
2013-08-22 23:44:09 +02:00 |
|
Thomas Blazek
|
e5bc1683c2
|
Merge branch 'master' of github.com:fetsite/fetsite
|
2013-08-22 19:23:17 +02:00 |
|
Thomas Blazek
|
12b453fdc8
|
gallery now default on fullscreen
|
2013-08-22 19:00:39 +02:00 |
|
Thomas Blazek
|
cd3f3c2b89
|
fix upload & gallery
|
2013-08-22 18:45:08 +02:00 |
|
Andreas Stephanides
|
9ec7bdd6cb
|
fotos - resized
|
2013-08-22 17:52:56 +02:00 |
|
Andreas Stephanides
|
cfcf0be4d5
|
Fetprofiles verbesserung Calentry upcoming
|
2013-08-22 16:38:33 +02:00 |
|
Andreas Stephanides
|
d031e7b855
|
Mitarbeiter Menueintrag
|
2013-08-22 15:46:18 +02:00 |
|
Andreas Stephanides
|
ab4c80104f
|
Merge branch 'master' of https://github.com/Inachos/fetsite
|
2013-08-22 15:42:51 +02:00 |
|
Thomas Blazek
|
cbe536a56b
|
bugfix multiple lines
|
2013-08-22 13:49:11 +02:00 |
|
Andreas Stephanides
|
292dec672c
|
Merge branch 'master' of https://github.com/Inachos/fetsite
|
2013-08-22 12:08:57 +02:00 |
|
Andreas Stephanides
|
1289045e06
|
FETPROFIL
|
2013-08-22 12:08:27 +02:00 |
|
Thomas Blazek
|
60d86d9cb1
|
fix multiple
|
2013-08-22 12:04:44 +02:00 |
|
Thomas Blazek
|
9b2db870bc
|
bugfix
|
2013-08-22 11:51:57 +02:00 |
|
Thomas Blazek
|
5aca5eca1c
|
bulk_upload_problematic
|
2013-08-22 11:24:34 +02:00 |
|
Thomas Blazek
|
09fc68eef0
|
uploader
|
2013-08-22 11:16:32 +02:00 |
|
Thomas Blazek
|
a2f3608d8f
|
Jquery-upload
|
2013-08-22 00:08:06 +02:00 |
|
Thomas Blazek
|
f0349f9909
|
Merge branch 'master' of https://github.com/andreassteph/fetsite
|
2013-08-21 21:58:44 +02:00 |
|
Thomas Blazek
|
0911981987
|
fix gallery
|
2013-08-21 21:22:03 +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
|
c2647a1d08
|
broken gallery
|
2013-08-21 18:27:47 +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 |
|
Thomas Blazek
|
ff4a14a350
|
show changes
|
2013-08-21 13:08:36 +02:00 |
|
Thomas Blazek
|
162781ac04
|
Bugfix in studien/verwalten
|
2013-08-21 12:12:34 +02:00 |
|
Andreas Stephanides
|
faf977e651
|
foto uploader
|
2013-08-20 18:11:04 +02:00 |
|
Thomas Blazek
|
18dfe60309
|
Designänderungen
|
2013-08-19 23:38:34 +02:00 |
|
Thomas Blazek
|
dd659cc8bf
|
Merge branch 'master' of https://github.com/HausdorffHimself/fetsite
|
2013-08-19 23:20:56 +02:00 |
|
HausdorffHimself
|
65b0ad8c19
|
NEW: FAQs in Themen eingefügt
|
2013-08-19 21:05:46 +02:00 |
|
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 |
|
HausdorffHimself
|
80fa19680b
|
NEW: Form für Fragen
|
2013-08-19 19:41:49 +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 |
|
Thomas Blazek
|
4e7c7c23dd
|
Lecturer in verwalten eingefügt
|
2013-08-19 19:17:27 +02:00 |
|
Thomas Blazek
|
cb44e90d1c
|
Rubriken tab fix
|
2013-08-19 19:16:48 +02:00 |
|
Andreas Stephanides
|
7ea6766391
|
notimplemented home site
|
2013-08-19 18:54:31 +02:00 |
|
