Commit Graph

388 Commits

Author SHA1 Message Date
Thomas Blazek
f16b87fd2b design 2013-08-27 19:47:44 +02:00
Thomas Blazek
8dd2252954 design 2013-08-27 19:39:00 +02:00
Thomas Blazek
b92be5b141 fix calendar index show 2013-08-27 16:44:17 +02:00
Thomas Blazek
18d8eabd30 Merge branch 'master' of github.com:fetsite/fetsite 2013-08-27 08:43:20 +02:00
Thomas Blazek
ac254ffbc2 Show CSS verändert 2013-08-27 08:42:12 +02:00
Andreas Stephanides
c3b35d2c1a 0Merge branch 'master' of https://github.com/Inachos/fetsite 2013-08-27 08:06:13 +02:00
Thomas Blazek
a106a278c3 umbenennung 2013-08-27 00:33:53 +02:00
Thomas Blazek
5b316f8780 css fuer gallery viewer 2013-08-27 00:32:53 +02:00
Andreas Stephanides
6dbbaf588b fetprofile order 2013-08-25 20:08:11 +02:00
Andreas Stephanides
065389dfa4 datepicker 2013-08-25 20:07:57 +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
759632948e Views & Logik Membership, Fetprofile, Gremium 2013-08-25 17:44:42 +02:00
Andreas Stephanides
bc8942a6ab gitupdate - config controller? 2013-08-25 17:44:13 +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
76d115ee4f Abwesenheitswarnung Thomas 2013-08-25 15:32:21 +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
ad6e387635 Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-08-25 13:56:16 +02:00
Andreas Stephanides
9854b99122 Merge branch 'master' of github.com:fetsite/fetsite 2013-08-25 13:55:41 +02:00
Andreas Stephanides
3db5d65ad7 omniauth_secrets added 2013-08-25 13:53:31 +02:00
Andreas Stephanides
3fd47351d9 comment out dummy devise provider 2013-08-25 13:11:40 +02:00
Andreas Stephanides
1fb193ee2b ignore omniauth_secrets and dummy initialize in devise.rb 2013-08-25 13:11:06 +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
Thomas Blazek
76e03212c8 Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-08-24 20:48:32 +02:00
HausdorffHimself
b92cbfab8a CHANGE: Attachment in TinyMCE: Default ist Link 2013-08-24 17:16:55 +02:00
HausdorffHimself
e7eabbe6aa FIX: no picture in themen 2013-08-24 17:16:10 +02:00
Andreas Stephanides
953c330f2f max-width neuigkeiten startseite 2013-08-24 11:17:29 +02:00
Andreas Stephanides
892cf84593 FIX <> neuigkeit vertauscht 2013-08-24 06:33:56 +02:00
andreassteph
00ba285497 Merge pull request #24 from HausdorffHimself/master
Attachments plus erste Version einer Dateineinbindung in TinyMCE
2013-08-23 21:17:24 -07:00
HausdorffHimself
d8d5bc3fe9 Merge branch 'master' of https://github.com/fetsite/fetsite 2013-08-24 04:17:03 +02:00
HausdorffHimself
77e3b81d67 ADD: TinyMCE-Plugin ADVImage 2013-08-24 04:13:52 +02:00
HausdorffHimself
546aecb7d6 MIGRATE attachments 2013-08-24 04:08:53 +02:00
HausdorffHimself
94614b1d5b ADD: Dateieinbindung in TinyMCE für Attachments 2013-08-24 04:07:33 +02:00
Andreas Stephanides
d928330189 neuigeiten startseite 2013-08-23 18:28:38 +02:00
Andreas Stephanides
5f9c7776e8 delete button neuigkeit 2013-08-23 18:13:10 +02:00
Andreas Stephanides
a807922c1d Merge branch 'master' of https://github.com/fetsite/fetsite 2013-08-23 17:57:47 +02:00
Andreas Stephanides
7a8ca34a31 neuigkeit tweak 2013-08-23 17:56:56 +02:00
Thomas Blazek
069cd4b763 locale und design 2013-08-23 17:24:15 +02:00
Andreas Stephanides
2548ddb9ab fix neuigkeit 2013-08-23 16:07:13 +02:00
Andreas Stephanides
ee7f06cb23 tipfehler 2013-08-23 14:48:48 +02:00
Andreas Stephanides
5c91a746e3 neuigkeit fix2 2013-08-23 14:41:35 +02:00
Andreas Stephanides
5a29fdc891 addpicture neuigkeit 2013-08-23 14:38:24 +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