Commit Graph

19 Commits

Author SHA1 Message Date
Andreas Stephanides
12a82f519c dependent and calendar 2015-06-11 15:47:26 +02:00
Andreas Stephanides
03c81104b2 sort meetings 2015-05-13 11:21:16 +02:00
Andreas Stephanides
9a9cee5768 view neuigekit meeting 2015-04-29 16:07:54 +02:00
Andreas Stephanides
6bb7cb917c fix meeting translation 2015-04-14 18:26:03 +02:00
Andreas Stephanides
4f8dd29240 translation meeting 2015-04-09 16:45:54 +02:00
Andreas Stephanides
5dd021d385 #245 fixed - direkt veröffentlichung von Ankündigungen 2015-03-30 11:19:19 +02:00
Andreas Stephanides
34c0374877 meeting style 2015-03-15 13:09:05 +01:00
Andreas Stephanides
8bf5583e00 caching fuer neuigkeiten and bsp 2015-03-06 16:41:08 +01:00
Andreas Stephanides
14ebb13bc1 meeting fixes 2015-02-14 17:25:51 +01:00
Andreas Stephanides
f1a149908d meetingtyp management 2015-02-09 15:38:21 +01:00
Andreas Stephanides
b46e19b466 integrate calendar with meetings 2015-01-18 14:32:20 +01:00
Andreas Stephanides
d72f78488d document/meeting updates 2015-01-03 10:06:58 +01:00
Andreas Stephanides
d26ab277af merge errors 2014-12-16 09:23:47 +01:00
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
Andreas Stephanides
07944bce89 meeting 2014-12-14 21:30:21 +01:00
Andreas Stephanides
a9ef5c14ba meeting ix 2014-12-12 15:24:20 +01:00
Andreas Stephanides
ab396c002e meeting views 2014-12-08 22:58:21 +01:00
Andreas Stephanides
87dd70ea44 meetings added, documents added 2014-12-08 22:58:21 +01:00
Andreas Stephanides
741a3abb6d meetings added, documents added 2014-11-26 20:36:04 +01:00