andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
405 Commits 7 Branches 0 Tags
3c755d09db4963fc3f63c1ca3e9a5061e0252981
Commit Graph

250 Commits

Author SHA1 Message Date
Andreas Stephanides
3c755d09db datepicker tryout 2013-08-28 16:47:33 +02:00
Andreas Stephanides
23c1f50325 delete link rubrik moved 2013-08-27 22:17:28 +02:00
Andreas Stephanides
82422a9d3b Merge branch 'master' of github.com:fetsite/fetsite 2013-08-27 22:06:10 +02:00
Andreas Stephanides
00403de881 move "new Rubrik" 2013-08-27 22:05:39 +02:00
Andreas Stephanides
108a27e804 pretty toolbar Neuigkeiten 2013-08-27 22:03:05 +02:00
Andreas Stephanides
e6a1166a2d cleaning routes 2013-08-27 21:41:05 +02:00
Thomas Blazek
918a3c9360 Merge branch 'master' of github.com:fetsite/fetsite 
Conflicts:
	app/views/galleries/index.html.erb
 2013-08-27 21:27:05 +02:00
Andreas Stephanides
a38eec97a5 links überarbeitet 2013-08-27 20:44:03 +02:00
Thomas Blazek
8275313836 design 2013-08-27 19:54:21 +02:00
Thomas Blazek
bf1574d11b design 2013-08-27 19:54:01 +02:00
Thomas Blazek
f16b87fd2b design 2013-08-27 19:47:44 +02:00
Thomas Blazek
8dd2252954 design 2013-08-27 19:39:00 +02:00
HausdorffHimself
58a5802dac Merge branch 'master' of https://github.com/fetsite/fetsite 2013-08-27 18:37:09 +02:00
HausdorffHimself
338f3a0a06 CHANGE: Attachment-Einbindung in TinyMCE mit Thumbnails und eigenem Partial-View 2013-08-27 18:35:50 +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
5b316f8780 css fuer gallery viewer 2013-08-27 00:32:53 +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
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
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
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
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
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
d928330189 neuigeiten startseite 2013-08-23 18:28:38 +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
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
HausdorffHimself
adbbce5fc8 CHANGE: Layout auf CSS umgestellt 2013-08-23 13:41:09 +02:00
HausdorffHimself
7a18a53cc8 ADD: picture to themengruppe 2013-08-23 13:40:42 +02:00
Andreas Stephanides
2e808b8a54 Merge branch 'master' of https://github.com/fetsite/fetsite 2013-08-23 12:03:28 +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
Thomas Blazek
8f2da66215 Merge branch 'master' of https://github.com/andreassteph/fetsite 2013-08-22 23:49:18 +02:00
Andreas Stephanides
57b015a44e neuigkeit styling 2013-08-22 23:44:09 +02:00