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 |
|
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
|
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 |
|
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
|
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 |
|
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
|
39b381f58e
|
optional git fuer globalize3 keine Auswirkung
|
2013-08-18 20:47:51 +02:00 |
|
Andreas Stephanides
|
eb13e18fb3
|
bedingter link für ics
|
2013-08-18 17:57:12 +02:00 |
|
Andreas Stephanides
|
b748382df4
|
Abilities für Rollenvergabe
|
2013-08-18 17:56:54 +02:00 |
|
Andreas Stephanides
|
6f6486c7ae
|
calendar show fixed
tabs fixed + ICS Link hinzugefügt
|
2013-08-18 17:47:44 +02:00 |
|
Andreas Stephanides
|
c01df9148b
|
calender ics format hinzugefügt
|
2013-08-18 17:25:21 +02:00 |
|
Andreas Stephanides
|
35b4f3998a
|
getting_startet hinzugefügt
Home Controller geändert und View hinzugefügt - Beinhaltet eine
Beschreibung wie Rails installiert werden muss um zu entwickeln
|
2013-08-18 17:24:55 +02:00 |
|
Andreas Stephanides
|
5eb9e41c71
|
FIX Neuigkeiten New
|
2013-08-15 12:55:02 +02:00 |
|
Andreas Stephanides
|
8b33dd27a4
|
auth
|
2013-08-15 12:44:04 +02:00 |
|
Andreas
|
9509c163b7
|
Länderflaggen
|
2013-08-15 12:14:24 +02:00 |
|
Andreas Stephanides
|
3da4e632c5
|
UserAction Button
|
2013-08-15 11:57:52 +02:00 |
|
Andreas Stephanides
|
7313b50696
|
Login auf Startseite verschoben
|
2013-08-15 11:57:41 +02:00 |
|
Andreas Stephanides
|
b9206ed091
|
Merge branch 'master' of https://github.com/Inachos/fetsite
|
2013-08-15 11:47:57 +02:00 |
|
Andreas Stephanides
|
b00e0709ca
|
einige updates ability
|
2013-08-15 11:47:23 +02:00 |
|
Andreas Stephanides
|
83f33483d9
|
kleines update userverwaltung
|
2013-08-15 11:46:57 +02:00 |
|
Andreas Stephanides
|
0f6559bce6
|
Rechtemanagement integriert in views
|
2013-08-15 11:46:41 +02:00 |
|
Thomas Blazek
|
ecb0275c44
|
nav divider css eingebaut
|
2013-08-14 22:37:53 +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 |
|
Andreas Stephanides
|
746aff8fa4
|
Tabs eingefügt bei Rubriken
|
2013-08-13 22:20:35 +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
|
c73984e81d
|
ADD: JavaScript zur Angleichung der Höhe innerhalb einer "row-fluid"
|
2013-08-13 18:34:05 +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 |
|
HausdorffHimself
|
a2b35d3d60
|
ADD: jquery-ui
|
2013-08-13 18:29:06 +02:00 |
|