Commit Graph

40 Commits

Author SHA1 Message Date
Thomas Blazek
deb8ccf47d started working on menu 2015-01-27 10:58:45 +01:00
Andreas Stephanides
3c2250b4fc Revert "change meetings"
This reverts commit 585b386e7c.

Conflicts:
	app/controllers/neuigkeiten_controller.rb
2015-01-17 12:16:37 +01:00
Andreas Stephanides
978d923082 fix blueimp gallery 2015-01-15 16:38:16 +01:00
Andreas Stephanides
43a551fc28 Merge branch 'master' of https://github.com/Inachos/fetsite into testgallery
Conflicts:
	app/views/layouts/application.html.erb
2015-01-15 15:40:36 +01:00
Thomas Blazek
3dff2d2bbe Fix: Bildergallerie
Bildergallerie läuft jetzt auf Blueimp-gallery.
Viel spaß
2015-01-15 15:36:20 +01:00
Andreas Stephanides
565024c282 blue2 2015-01-15 15:20:19 +01:00
Thomas Blazek
79ba089b70 Merge branch 'master' of https://github.com/Inachos/fetsite
Conflicts:
	Gemfile.lock
	config/routes.rb
2015-01-11 22:18:05 +01:00
Andreas Stephanides
87dd70ea44 meetings added, documents added 2014-12-08 22:58:21 +01:00
Andreas Stephanides
58417fd59f try to fix gallery 2014-10-27 13:00:03 +01:00
Andreas Stephanides
a8dd419f9e pagination update 2014-10-17 10:17:24 +02:00
Andreas Stephanides
30a80edb3d datetimepicker fix 2014-10-17 10:17:23 +02:00
Andreas Stephanides
7a7128aa32 Pagination fix 2014-10-17 10:17:23 +02:00
1d00b07719 pagination bootstrap update layout 2014-10-17 10:17:23 +02:00
7d56d10431 comments 2014-10-17 10:17:23 +02:00
Thomas Blazek
bb3229e826 Merge branch 'master' of https://github.com/thisisaname/fetsite
Conflicts:
	app/controllers/neuigkeiten_controller.rb
	config/routes.rb
2014-08-27 15:31:52 +02:00
Sai
585b386e7c change meetings 2014-08-27 15:22:47 +02:00
4bc7c4b001 Interface fixes icons,colors 2014-07-09 22:44:42 +05:30
6fdee8a7d6 datetimepicker 2014-06-21 14:52:45 +05:30
Andreas Stephanides
0959cb067d fixed insert issue 2014-03-16 14:15:06 +01:00
Andreas Stephanides
e62416dde4 remotipart fix 2014-03-16 11:19:18 +01:00
Andreas Stephanides
032d7913e8 testing remotipart 2014-02-20 10:49:11 +01:00
Andreas Stephanides
f504077f55 javascript jquery ui fix 2014-02-09 21:22:32 +01:00
HausdorffHimself
b42e490f7f FIX: downcase in JS 2013-08-27 18:34:02 +02:00
HausdorffHimself
b92cbfab8a CHANGE: Attachment in TinyMCE: Default ist Link 2013-08-24 17:16:55 +02:00
HausdorffHimself
94614b1d5b ADD: Dateieinbindung in TinyMCE für Attachments 2013-08-24 04:07:33 +02:00
Thomas Blazek
a2f3608d8f Jquery-upload 2013-08-22 00:08:06 +02:00
Thomas Blazek
c2647a1d08 broken gallery 2013-08-21 18:27:47 +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
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
c73984e81d ADD: JavaScript zur Angleichung der Höhe innerhalb einer "row-fluid" 2013-08-13 18:34:05 +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
HausdorffHimself
a2b35d3d60 ADD: jquery-ui 2013-08-13 18:29:06 +02:00
Andreas Stephanides
6bb35c110a calendar feature generiert 2013-08-06 00:48:45 +02:00
HausdorffHimself
ac4cb5d0fe New Feature: Themen/Informationen 2013-08-05 18:31:04 +02:00
Thomas Blazek
cc002d4291 Init 2013-07-22 15:49:19 +02:00
Andreas Stephanides
19b4ed31f4 Beispiele hinzugefügt 2013-02-15 10:48:52 +01:00
Andreas Stephanides
3d11400d5e GitHub Account angelegt 2013-02-12 02:05:12 +01:00