307 Commits

Author	SHA1	Message	Date
Andreas Stephanides	5775c1b419	gallery public	2015-02-25 16:34:12 +01:00
Andreas Stephanides	554c7ef937	ability foto 3	2015-02-25 16:15:06 +01:00
Andreas Stephanides	855117a117	ability foto 2	2015-02-25 16:12:12 +01:00
Andreas Stephanides	0575546603	ability fotogallery	2015-02-25 16:07:55 +01:00
Andreas Stephanides	e410aef098	foto abiltiy	2015-02-25 11:41:13 +01:00
Andreas Stephanides	67d0d19bd7	foto gallery - schema.org und download button	2015-02-24 13:46:43 +01:00
Andreas Stephanides	a0427336c8	sticky topics	2015-02-23 09:19:30 +01:00
Andreas Stephanides	e1ffc5ae85	gallery order	2015-02-17 19:04:04 +01:00
Andreas Stephanides	1cb6cecf81	Merge branch 'opengraph'	2015-02-17 19:00:37 +01:00
Andreas Stephanides	ebe8d1f8df	opengraph	2015-02-14 18:24:46 +01:00
Andreas Stephanides	14ebb13bc1	meeting fixes	2015-02-14 17:25:51 +01:00
Andreas Stephanides	29a35f76d8	modify attachments	2015-02-11 20:53:25 +01:00
Andreas Stephanides	7326b08729	themen spezifische rollen	2015-02-10 14:04:54 +01:00
Andreas Stephanides	ebf486b347	outdate topics after 7 months	2015-02-09 15:38:38 +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	e93b9b7342	Merge branch 'testgallery'	2015-01-17 12:18:14 +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
Andreas Stephanides	edc8f6c2e3	small fixes	2015-01-17 12:04:53 +01:00
Andreas Stephanides	057a66966d	fix document searchable	2015-01-17 12:04:10 +01:00
Thomas Blazek	a9969a6c72	updates	2015-01-16 09:46:01 +01:00
Thomas Blazek	75667ae6ce	work in progress	2015-01-16 00:03:09 +01:00
Thomas Blazek	bcffee7bc9	Merge branch 'master' of https://github.com/fetsite/fetsite	2015-01-14 09:12:56 +01:00
Thomas Blazek	9cc108b2ed	Merge branch 'master' of https://github.com/andreassteph/fetsite	2015-01-14 09:10:57 +01:00
Andreas Stephanides	1d11b270cf	Merge branch 'master' of https://github.com/fetsite/fetsite	2015-01-14 09:08:51 +01:00
Andreas Stephanides	47b692b243	Suchergebnis darstellung	2015-01-14 09:07:34 +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	5b0840a7d2	Merge branch 'master' of https://github.com/fetsite/fetsite	2015-01-04 16:31:51 +01:00
Andreas Stephanides	fd20bd5c90	ability agenda sehen	2015-01-04 16:31:19 +01:00
Andreas Stephanides	40739523c2	fix document typ	2015-01-03 11:40:25 +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	aa98919e88	searchable	2014-12-14 21:30:09 +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	b259c1080a	merge	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	282d16c086	reformat searchable	2014-12-02 23:29:19 +01:00
Andreas Stephanides	2df6f7745e	Fix SunSpot and minor fix in calentry	2014-12-02 12:03:14 +01:00
Andreas Stephanides	85c6985a06	lva nlink fix	2014-11-28 20:48:22 +01:00
Andreas Stephanides	dc124e3810	weitere classen durchsuchen	2014-11-28 14:27:44 +01:00
Andreas Stephanides	a41f964a84	sunspot install	2014-11-28 14:27:44 +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
Andreas Stephanides	c49ec5e736	calentry js interface	2014-11-16 14:30:04 +01:00
Andreas Stephanides	483fc37345	studium info, modulgruppen	2014-11-08 10:38:22 +01:00
Andreas Stephanides	2855b72bb6	fix public thema	2014-10-29 13:44:17 +01:00