Andreas Stephanides
|
34c0374877
|
meeting style
|
2015-03-15 13:09:05 +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
|
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
|
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 |
|