Commit Graph

32 Commits

Author SHA1 Message Date
502aae5c27 merge latest 2018-05-14 20:17:30 +02:00
9f1de3d9d0 diverse hot fixes von der productive Version auf fetruby 2018-05-14 17:56:17 +02:00
Pet
0fedeb2bde changed etherpad link 2018-03-27 22:03:17 +02:00
Pet
146885abae changed etherpad link 2018-03-27 22:01:20 +02:00
Andreas Stephanides
eccb090d5c AutoCommit Sam Sep 5 15:03:11 CEST 2015 2015-09-05 15:03:11 +02:00
Andreas Stephanides
c7d12e9a42 AutoCommit Fre Sep 4 14:03:04 CEST 2015 2015-09-04 14:03:04 +02:00
308b542caa Hot Fixes 2015-06-21 16:01:01 +02:00
Andreas Stephanides
090e2ad72a document search 2015-06-11 11:36:36 +02:00
Andreas Stephanides
34659014df AutoCommit Don Jun 11 11:03:02 CEST 2015 2015-06-11 11:03:02 +02:00
Andreas Stephanides
9aaacbbb63 AutoCommit Don Jun 11 09:03:21 CEST 2015 2015-06-11 09:03:21 +02:00
Andreas Stephanides
e425a015ba document toolbar 2015-05-13 11:22:10 +02:00
Andreas Stephanides
bac4c5f924 document toolbar sticky 2015-05-13 11:21:42 +02:00
Andreas Stephanides
0656e849bd toc raw 2015-05-05 11:04:40 +02:00
Andreas Stephanides
24ed5d29e3 toc added 2015-05-05 10:39:21 +02:00
Andreas Stephanides
a2491ee84d inline tinymce document 2015-05-04 13:40:27 +02:00
Andreas Stephanides
8a32bff399 sanitize document 2015-04-29 16:07:39 +02:00
Andreas Stephanides
19959b083e time zone 2015-04-29 15:25:10 +02:00
Andreas Stephanides
d56d77daef create_pdf 2015-04-26 18:08:46 +02:00
Andreas Stephanides
0df5e72e15 attachment new version 2015-04-07 23:21:33 +02:00
Andreas Stephanides
76c0565a7c documents show toolbar 2015-03-15 19:49:18 +01:00
Andreas Stephanides
27d478281e document styling print version 2015-03-15 13:10:37 +01:00
Andreas Stephanides
bd3c3a25e1 document versions 2015-03-06 16:40:47 +01:00
057a66966d fix document searchable 2015-01-17 12:04:10 +01:00
Andreas Stephanides
aa080a1eec Buttons doument show 2015-01-03 10:49:41 +01:00
Andreas Stephanides
0cca373f33 document views 2015-01-03 10:08:00 +01:00
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