andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
1,549 Commits 7 Branches 0 Tags
b073a1a0987c939e9ba989e24852b0569f9697a7
Commit Graph

138 Commits

Author SHA1 Message Date
Andreas Stephanides
b073a1a098 AutoCommit Son Sep 13 12:03:20 CEST 2015 2015-09-13 12:03:21 +02:00
Andreas Stephanides
92667b92e9 AutoCommit Sam Sep 12 22:03:04 CEST 2015 2015-09-12 22:03:04 +02:00
Andreas Stephanides
984e5f4b56 AutoCommit Don Sep 3 12:03:05 CEST 2015 2015-09-03 12:03:05 +02:00
Andreas Stephanides
c1a7d9b7c2 AutoCommit Die Sep 1 10:03:01 CEST 2015 2015-09-01 10:03:01 +02:00
Andreas Stephanides
8e1e19d3ab AutoCommit Don Aug 27 16:03:04 CEST 2015 2015-08-27 16:03:04 +02:00
Andreas Stephanides
7c2f1f9753 AutoCommit Don Aug 27 15:03:02 CEST 2015 2015-08-27 15:03:02 +02:00
Andreas Stephanides
13283e0e65 AutoCommit Fre Aug 7 01:03:02 CEST 2015 2015-08-07 01:03:02 +02:00
Andreas Stephanides
3a4888c9a4 AutoCommit Mit Aug 5 09:03:03 CEST 2015 2015-08-05 09:03:03 +02:00
Andreas Stephanides
e7a328737c AutoCommit Mon Aug 3 08:03:01 CEST 2015 2015-08-03 08:03:01 +02:00
Andreas Stephanides
bbb924fcfb AutoCommit Son Aug 2 16:03:01 CEST 2015 2015-08-02 16:03:01 +02:00
Andreas Stephanides
234880d90e AutoCommit Sam Aug 1 12:03:01 CEST 2015 2015-08-01 12:03:01 +02:00
Andreas Stephanides
ca903cf84b AutoCommit Fre Jul 31 21:03:04 CEST 2015 2015-07-31 21:03:04 +02:00
Andreas Stephanides
8a4a168fe4 AutoCommit Fre Jul 31 11:03:07 CEST 2015 2015-07-31 11:03:07 +02:00
Andreas Stephanides
f161d15174 AutoCommit Don Jul 30 01:03:05 CEST 2015 2015-07-30 01:03:05 +02:00
Andreas Stephanides
97df081b33 AutoCommit Don Jul 30 00:03:02 CEST 2015 2015-07-30 00:03:02 +02:00
Andreas Stephanides
5d9571b03a AutoCommit Fre Jul 10 11:03:02 CEST 2015 2015-07-10 11:03:02 +02:00
Andreas Stephanides
fe32c2102b AutoCommit Don Jul 9 16:03:02 CEST 2015 2015-07-09 16:03:02 +02:00
Andreas Stephanides
88877ccab0 AutoCommit Don Jun 25 16:03:19 CEST 2015 2015-06-25 16:03:20 +02:00
Andreas Stephanides
6e05c3d589 AutoCommit Sam Jun 20 12:03:03 CEST 2015 2015-06-20 12:03:03 +02:00
Andreas Stephanides
efe17c681f AutoCommit Die Jun 16 16:03:07 CEST 2015 2015-06-16 16:03:07 +02:00
Andreas Stephanides
3618db1376 AutoCommit Mon Jun 15 17:03:08 CEST 2015 2015-06-15 17:03:08 +02:00
Andreas Stephanides
9aaacbbb63 AutoCommit Don Jun 11 09:03:21 CEST 2015 2015-06-11 09:03:21 +02:00
Andreas Stephanides
852a893a32 AutoCommit Die Jun 9 18:03:02 CEST 2015 2015-06-09 18:03:02 +02:00
Andreas Stephanides
8a32bff399 sanitize document 2015-04-29 16:07:39 +02:00
Andreas Stephanides
d56d77daef create_pdf 2015-04-26 18:08:46 +02:00
Andreas Stephanides
7753c80120 crawl routes 2015-04-22 18:43:41 +02:00
Andreas Stephanides
b02dcad387 add a treeview 2015-04-14 17:56:35 +02:00
Andreas Stephanides
0df5e72e15 attachment new version 2015-04-07 23:21:33 +02:00
Andreas Stephanides
415da41236 log file view 2015-02-17 18:59:28 +01:00
Andreas Stephanides
29a35f76d8 modify attachments 2015-02-11 20:53:25 +01:00
Andreas Stephanides
f1a149908d meetingtyp management 2015-02-09 15:38:21 +01:00
Andreas Stephanides
3c2250b4fc Revert "change meetings" 
This reverts commit 585b386e7c.

Conflicts:
	app/controllers/neuigkeiten_controller.rb
 2015-01-17 12:16:37 +01:00
Thomas Blazek
79ba089b70 Merge branch 'master' of https://github.com/Inachos/fetsite 
Conflicts:
	Gemfile.lock
	config/routes.rb
 2015-01-11 22:18:05 +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
87dd70ea44 meetings added, documents added 2014-12-08 22:58:21 +01:00
Andreas Stephanides
699517fb56 Revert "removecomments" 
This reverts commit 6ee1468ce3.
 2014-11-28 14:22:43 +01:00
Andreas Stephanides
741a3abb6d meetings added, documents added 2014-11-26 20:36:04 +01:00
Andreas Stephanides
96ef48cb31 is updated button für themen 2014-10-19 19:25:34 +02:00
Andreas Stephanides
d083d00bbb rmeove wiki 2014-10-17 10:17:24 +02:00
Andreas Stephanides
116d0562d9 removecomments 2014-10-17 10:17:24 +02:00
Andreas Stephanides
a8dd419f9e pagination update 2014-10-17 10:17:24 +02:00
Andreas Stephanides
fc48959e48 nlink fix 2014-10-17 10:17:23 +02:00
Andreas Stephanides
1d00b07719 pagination bootstrap update layout 2014-10-17 10:17:23 +02:00
Andreas Stephanides
7d56d10431 comments 2014-10-17 10:17:23 +02:00
Andreas Stephanides
5bf20e1a98 contact page new 2014-10-17 10:17:22 +02:00
Thomas Blazek
bb3229e826 Merge branch 'master' of https://github.com/thisisaname/fetsite 
Conflicts:
	app/controllers/neuigkeiten_controller.rb
	config/routes.rb
 2014-08-27 15:31:52 +02:00
Sai
585b386e7c change meetings 2014-08-27 15:22:47 +02:00