andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
395 Commits 7 Branches 0 Tags
108a27e804282a69155b40e8bdfa6b9a3e6aa44c
Commit Graph

114 Commits

Author SHA1 Message Date
Andreas Stephanides
108a27e804 pretty toolbar Neuigkeiten 2013-08-27 22:03:05 +02:00
HausdorffHimself
348c81b856 NEW: Uploader 2013-08-27 18:34:55 +02:00
Andreas Stephanides
616de516db Merge branch 'master' of github.com:fetsite/fetsite 2013-08-25 17:45:48 +02:00
Andreas Stephanides
759632948e Views & Logik Membership, Fetprofile, Gremium 2013-08-25 17:44:42 +02:00
Andreas Stephanides
3bd04f9101 Gremien, Memberships Update 2013-08-25 16:37:59 +02:00
Thomas Blazek
3d81a7182f Merge branch 'master' of github.com:fetsite/fetsite 2013-08-25 15:43:13 +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
9854b99122 Merge branch 'master' of github.com:fetsite/fetsite 2013-08-25 13:55:41 +02:00
Andreas Stephanides
c592bf9d97 Omniauth + Omniauthfacebook 
für
 2013-08-25 13:08:39 +02:00
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
Andreas Stephanides
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