Commit Graph

632 Commits

Author SHA1 Message Date
Andreas Stephanides
ba6d83937f startseite . farbe 2013-09-09 12:24:59 +02:00
Andreas Stephanides
5cdc99d498 versionen wiederherstellen 2013-09-09 12:24:49 +02:00
Andreas Stephanides
0b42db42e8 Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-09-07 12:38:02 +02:00
Andreas Stephanides
a60bdf5149 design und struktur (container - unnötige entfernt) 2013-09-07 12:37:16 +02:00
HausdorffHimself
30056a0d9f FIX: Redirect- und Destroy-Pfad 2013-09-06 20:46:07 +02:00
Andreas Stephanides
1c44ddc2ba Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-09-06 18:26:58 +02:00
HausdorffHimself
de48cccdbc CHANGE: Mouseover für Themengruppe 2013-09-06 18:26:33 +02:00
HausdorffHimself
c9f0314c29 Merge branch 'master' of https://github.com/fetsite/fetsite 2013-09-06 18:19:07 +02:00
HausdorffHimself
8d9fe3904e ADD: Tag für Themengruppe 2013-09-06 18:18:02 +02:00
Andreas Stephanides
bb4b24d9cb styling zeugs 2013-09-06 18:04:57 +02:00
Andreas Stephanides
41e54281bd infotext 2013-09-06 00:33:46 +02:00
Andreas Stephanides
ca60c3ef1b neuigkeit unpublish 2013-09-06 00:33:30 +02:00
Andreas Stephanides
12f426235f design-tests1 2013-09-06 00:33:12 +02:00
HausdorffHimself
9c316f165c CHANGE: pretty_toolbar für Fragen und Themen 2013-09-01 23:56:04 +02:00
HausdorffHimself
94925e34ba ADD: eigene locales-yml für themen/themengruppen/attachment - Bereich 2013-09-01 21:08:03 +02:00
HausdorffHimself
65b287d613 CHANGE: Themengruppe verwenden pretty_toolbar 2013-09-01 21:07:09 +02:00
HausdorffHimself
489dc933a2 CHANGE: Link über gesamtes div 2013-09-01 19:55:02 +02:00
Andreas Stephanides
1f906cfbfc formtastic gem 2013-09-01 15:13:09 +02:00
Andreas Stephanides
15aa7ec58b neuigkeiten fix 2013-09-01 14:50:10 +02:00
Andreas Stephanides
9b16843d83 verwaltung, formulare... 2013-09-01 11:40:45 +02:00
Andreas Stephanides
f37d8d442d Merge branch 'master' of https://github.com/Inachos/fetsite 2013-09-01 11:39:34 +02:00
Andreas Stephanides
a3ca1f1f10 gremien + routes update 2013-09-01 10:45:31 +02:00
Andreas Stephanides
4dbe3f90b4 Neugkeiten Verwalten.. 2013-09-01 10:44:27 +02:00
Andreas Stephanides
9f2c184e43 datepicker_input 2013-08-30 23:28:27 +02:00
Andreas Stephanides
276e00e5f7 routes indentions fixed 2013-08-30 23:27:57 +02:00
Thomas Blazek
52ce51ab92 Merge branch 'master' of https://github.com/andreassteph/fetsite 2013-08-28 18:35:20 +02:00
Thomas Blazek
e155a8e419 sollt nix sein 2013-08-28 18:35:03 +02:00
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
7b2c9545bb neuigkeit.publish local 2013-08-27 22:09:43 +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
49af655f62 Merge branch 'ldap' 2013-08-27 21:02:15 +02:00
Andreas Stephanides
a38eec97a5 links überarbeitet 2013-08-27 20:44:03 +02:00
Andreas Stephanides
45908e6013 links überarbeitet 2013-08-27 20:43:16 +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
HausdorffHimself
348c81b856 NEW: Uploader 2013-08-27 18:34:55 +02:00
HausdorffHimself
b42e490f7f FIX: downcase in JS 2013-08-27 18:34:02 +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