Andreas Stephanides
|
e4a3828d74
|
fetprofile users link migration
|
2013-12-16 10:28:32 +01:00 |
|
Andreas Stephanides
|
3d6a4f48e7
|
priority for themen migration
|
2013-12-16 10:28:20 +01:00 |
|
Andreas Stephanides
|
ef7deacec7
|
disable whitelist protection + seeds
|
2013-10-28 12:37:34 +01:00 |
|
Andreas Stephanides
|
2e01fd574b
|
calentries -neuigkeiten calender fix
|
2013-10-04 16:11:36 +02:00 |
|
Andreas Stephanides
|
ae2741ecb0
|
studium + picture
|
2013-09-30 21:18:42 +02:00 |
|
Andreas Stephanides
|
616de516db
|
Merge branch 'master' of github.com:fetsite/fetsite
|
2013-08-25 17:45:48 +02:00 |
|
Andreas Stephanides
|
f0c577ef58
|
Add Link to Neuigkeit
|
2013-08-25 17:44:54 +02:00 |
|
Andreas Stephanides
|
3bd04f9101
|
Gremien, Memberships Update
|
2013-08-25 16:37:59 +02:00 |
|
Thomas Blazek
|
772d5fe003
|
Merge branch 'master' of https://github.com/andreassteph/fetsite
|
2013-08-25 15:22:41 +02:00 |
|
Thomas Blazek
|
93667d4cea
|
Beispiel überarbeitungen
|
2013-08-25 15:16:19 +02:00 |
|
Andreas Stephanides
|
c592bf9d97
|
Omniauth + Omniauthfacebook
für
|
2013-08-25 13:08:39 +02:00 |
|
HausdorffHimself
|
d8d5bc3fe9
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2013-08-24 04:17:03 +02:00 |
|
HausdorffHimself
|
546aecb7d6
|
MIGRATE attachments
|
2013-08-24 04:08:53 +02:00 |
|
Andreas Stephanides
|
5a29fdc891
|
addpicture neuigkeit
|
2013-08-23 14:38:24 +02:00 |
|
Andreas Stephanides
|
032504d0e3
|
Merge branch 'master' of https://github.com/HausdorffHimself/fetsite
|
2013-08-23 14:30:31 +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
|
abc5ce04a3
|
public to rubrik and object to calentries addecd
|
2013-08-23 12:07:04 +02:00 |
|
Thomas Blazek
|
04b91b9f33
|
Lecturer in Lva eingebunden, Image thumb integriert
|
2013-08-21 13:48:49 +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 |
|
Thomas Blazek
|
0b929613c0
|
Fix tipfehler
|
2013-08-19 08:57:59 +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 |
|
Andreas Stephanides
|
36a4f282c8
|
fix fix transtables
|
2013-08-18 21:15:48 +02:00 |
|
Andreas Stephanides
|
9c99b84da5
|
fix fix translationtanles
fix
|
2013-08-18 21:13:11 +02:00 |
|
Andreas Stephanides
|
d17b911809
|
fix inflections
irregular sollte bei inflections genutzt werden
|
2013-08-18 20:48:45 +02:00 |
|
Andreas Stephanides
|
39b381f58e
|
optional git fuer globalize3 keine Auswirkung
|
2013-08-18 20:47:51 +02:00 |
|
Andreas Stephanides
|
1adf781282
|
Commit summaryname von Modulgruppe nicht mehr übersetzen
Modulgruppe name nicht übersetzen
|
2013-08-18 16:34:28 +02:00 |
|
Andreas Stephanides
|
2f2d35e278
|
add author_id to neuigkeit
|
2013-08-15 12:58:28 +02:00 |
|
Andreas Stephanides
|
97b28fdc65
|
rm schema
|
2013-08-15 12:44:22 +02:00 |
|
Andreas Stephanides
|
8b33dd27a4
|
auth
|
2013-08-15 12:44:04 +02:00 |
|
Thomas Blazek
|
e7974ea693
|
blub
|
2013-08-14 22:07:37 +02:00 |
|
Andreas Stephanides
|
20f2a15932
|
unnötige Migration entfernt
|
2013-08-13 19:33:54 +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 |
|
Andreas Stephanides
|
b326e00193
|
Menu Admin Link Fix
|
2013-08-12 17:00:25 +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 |
|
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 |
|