Andreas Stephanides 881df624b3 Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting ...

Conflicts:
	app/controllers/documents_controller.rb
	app/controllers/meetings_controller.rb
	app/models/ability.rb
	app/models/document.rb
	app/models/meeting.rb
	app/models/meetingtyp.rb
	app/views/documents/_document.html.erb
	app/views/documents/_nested_form.html.erb
	app/views/documents/edit.js.erb
	app/views/documents/new.js.erb
	app/views/meetings/_meeting.html.erb
	app/views/themen/_small.html.erb
	config/routes.rb

2014-12-16 09:00:43 +01:00

..

users

facebookpublish,themen fixes

2014-06-20 00:15:45 +05:30

application_controller.rb

Merge branch 'master' of github.com:fetsite/fetsite

2014-11-10 20:23:47 +01:00

attachments_controller.rb

themen ueberarbeitet attachments verwalten

2014-06-09 23:14:05 +05:30

beispiele_controller.rb

beispielcontroller fix :show_comments

2014-10-17 10:17:24 +02:00

calendars_controller.rb

calentry inline form

2014-10-28 08:43:44 +01:00

calentries_controller.rb

Fix SunSpot and minor fix in calentry

2014-12-02 12:03:14 +01:00

config_controller.rb

contact page new

2014-10-17 10:17:22 +02:00

documents_controller.rb

Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting

2014-12-16 09:00:43 +01:00

fetprofiles_controller.rb

fetprofiles

2014-10-17 10:17:23 +02:00

fetzneditions_controller.rb

Aktivere Rechtemanagement für einige Controller

2013-10-26 12:49:03 +02:00

fotos_controller.rb

themes fixes and versioning small fix

2014-01-22 12:33:45 +01:00

fragen_controller.rb

themengruppen verwalten form

2014-02-16 15:32:04 +01:00

galleries_controller.rb

Oberfläche aufräumen...

2014-06-24 13:53:38 +05:30

gremien_controller.rb

sort & paginate nlinks @ gremium

2014-10-19 21:04:38 +02:00

home_controller.rb

weitere classen durchsuchen

2014-11-28 14:27:44 +01:00

lecturers_controller.rb

Aktivere Rechtemanagement für einige Controller

2013-10-26 12:49:03 +02:00

lvas_controller.rb

contact page new

2014-10-17 10:17:22 +02:00

meetings_controller.rb

Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting

2014-12-16 09:00:43 +01:00

meetingtyps_controller.rb

meetings added, documents added

2014-12-08 22:58:21 +01:00

memberships_controller.rb

Aktivere Rechtemanagement für einige Controller

2013-10-26 12:49:03 +02:00

modulgruppen_controller.rb

studium info, modulgruppen

2014-11-08 10:38:22 +01:00

moduls_controller.rb

nlink-modul

2014-11-15 12:53:58 +01:00

neuigkeiten_controller.rb

meeting

2014-12-14 21:30:21 +01:00

rubriken_controller.rb

meeting

2014-12-14 21:30:21 +01:00

semesters_controller.rb

Aktivere Rechtemanagement für einige Controller

2013-10-26 12:49:03 +02:00

studien_controller.rb

studieninterface,title

2014-11-08 11:00:42 +01:00

themen_controller.rb

rechte für actions versions neuigkeiten

2014-10-19 19:49:33 +02:00

themengruppen_controller.rb

fix order 1

2014-12-05 15:04:18 +01:00

users_controller.rb

contact page new

2014-10-17 10:17:22 +02:00