Commit Graph

1064 Commits

Author SHA1 Message Date
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
414f740ac2 translations 2013-08-21 13:08:21 +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
Andreas Stephanides
e4f45b3390 Merge branch 'master' of https://github.com/Inachos/fetsite 2013-08-20 13:58:36 +02:00
Andreas Stephanides
0a910386d7 Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-08-20 13:58:20 +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
Andreas Stephanides
401689d04c ignore tempfiles 2013-08-19 18:54:04 +02:00
HausdorffHimself
bb42e3b3a0 CHANGE: keine jQuery für gleiche Höhe mehr 2013-08-19 18:53:52 +02:00
HausdorffHimself
a5d694cc7e CHANGE: no link 2013-08-19 18:53:23 +02:00
HausdorffHimself
e7a7be8333 CHANGE: keine borders für Themen 2013-08-19 18:51:23 +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
5c83d36ea5 semester migration 2013-08-19 16:46:26 +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
Thomas Blazek
52f7e0b9ba designänderung 2013-08-19 15:43:30 +02:00
Andreas Stephanides
4c48a4b769 fetzneditions 2013-08-19 15:42:08 +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
a19d708134 fix translate_studien 2013-08-19 13:55:40 +02:00
Thomas Blazek
28d5f8b96a semester tweaks 2013-08-19 09:11:45 +02:00
Thomas Blazek
0b929613c0 Fix tipfehler 2013-08-19 08:57:59 +02:00
Andreas Stephanides
b826a5e69a add header to container 2013-08-18 22:12:39 +02:00
Andreas Stephanides
55b4102a68 try fix tabs rubriken/calendar 2013-08-18 22:12:28 +02:00
Andreas Stephanides
0b19583afb redirect für user admin 2013-08-18 22:12:06 +02:00
Andreas Stephanides
0294982bd2 Timezone ics 2013-08-18 21:51:13 +02:00
Andreas Stephanides
303e0ff98a fix 2013-08-18 21:24:21 +02:00
Andreas Stephanides
e77a0dd8f8 aendere translate themen 2013-08-18 21:20:04 +02:00