andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
1,016 Commits 7 Branches 0 Tags
ad6fc7430341bd3cdb8f01e68c3fca2ee2a1ea5c
Commit Graph

1016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
b0c3c5a08c Merge branch 'master' of github.com:fetsite/fetsite into fetsite 2013-08-25 13:54:50 +02:00
Andreas Stephanides
3db5d65ad7 omniauth_secrets added 2013-08-25 13:53:31 +02:00