Andreas Stephanides
|
d72f78488d
|
document/meeting updates
|
2015-01-03 10:06:58 +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
|
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
|
c2ea1782ff
|
documents
|
2014-12-08 22:58:21 +01:00 |
|
Andreas Stephanides
|
741a3abb6d
|
meetings added, documents added
|
2014-11-26 20:36:04 +01:00 |
|
Andreas Stephanides
|
65cb400126
|
documents
|
2014-11-20 11:40:49 +01:00 |
|