Commit Graph

64 Commits

Author SHA1 Message Date
Andreas Stephanides
47b692b243 Suchergebnis darstellung 2015-01-14 09:07:34 +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
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
a9ef5c14ba meeting ix 2014-12-12 15:24:20 +01:00
Andreas Stephanides
e411a98b4e Treffen sichtbar 2014-12-08 22:58:22 +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
741a3abb6d meetings added, documents added 2014-11-26 20:36:04 +01:00
Andreas Stephanides
ba8a20c3d1 sanitize 2014-10-21 13:29:14 +02:00
Andreas Stephanides
5b81cbcdad blue1 startpage 2014-10-19 20:39:21 +02:00
Andreas Stephanides
6343896744 showversions, Neuigkeit 2014-10-19 19:50:24 +02:00
Andreas Stephanides
7436c5c01e rechte für actions versions neuigkeiten 2014-10-19 19:49:33 +02:00
Andreas Stephanides
ad751c0837 button ausblenden wenn nicht eingeloggt 2014-10-19 19:29:29 +02:00
Andreas Stephanides
96ef48cb31 is updated button für themen 2014-10-19 19:25:34 +02:00
Andreas Stephanides
6639011968 thmen sanitize 2014-10-17 10:17:24 +02:00
2b562fd7e0 Interface Neuigkeiten & Attachment 2014-10-17 10:17:22 +02:00
ed5b2b8685 thmen nur rendern wenn erlaubt 2014-10-17 10:17:22 +02:00
397721f89e Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
	app/views/themen/_form.html.erb
2014-07-09 20:18:07 +02:00
4bc7c4b001 Interface fixes icons,colors 2014-07-09 22:44:42 +05:30
9bd786d053 design neue Farben & icons 2014-07-05 19:20:47 +05:30
6a730c7411 for error 2014-07-04 06:44:48 +02:00
520ce0c6ed Form themen fix1 2014-07-04 06:37:43 +02:00
527743c4c1 tinmce update 2014-07-03 21:31:27 +05:30
38716d7a58 neuigkeiten form 2014-06-28 18:11:46 +05:30
ee8f2d0076 themessticker, cleanup routes 2014-06-25 23:09:05 +05:30
2ba920331a profile form fixed, themen isdraft 2014-06-24 16:32:00 +05:30
3a8ccdd205 Oberfläche aufräumen... 2014-06-24 13:53:38 +05:30
a87990c338 Zeit formatiert
Datetimepicker fixed, Speichern und weiter
2014-06-21 16:36:30 +05:30
6c9a1b51c4 themen interface cleanup1 2014-06-21 14:53:16 +05:30
2df0d89b61 facebookpublish,themen fixes 2014-06-20 00:15:45 +05:30
67ccecaf51 #143
#143 fixed
themen fixed
2014-06-10 18:47:16 +05:30
6451c0f175 themen ueberarbeitet attachments verwalten 2014-06-09 23:14:05 +05:30
bd073e0835 Wiki integriert in HP 2014-06-03 18:23:14 +05:30
Andreas Stephanides
667f5b680e attachments view 2014-05-02 18:55:38 +02:00
Andreas Stephanides
ad704aacd5 größerer Editor 2014-05-02 18:55:26 +02:00
Andreas Stephanides
73a2627cd3 link Profile und Gremien an neuigkeit 2014-04-23 17:15:59 +02:00
Andreas Stephanides
40a34b44ca Merge branch 'master' of http://github.com/mleop/fetsite 2014-04-11 13:02:20 +02:00
Andreas Stephanides
e9be76d6e4 small fixes rubriken und themen 2014-04-11 13:02:00 +02:00
73bba9bc6f faqs oberfläche 2014-04-11 13:01:17 +02:00
Andreas Stephanides
58c46375a1 nlinks fetprofile added 2014-04-06 23:01:37 +02:00
Andreas Stephanides
ddb230604c small fixes
removed beispiel show action
beautified search url
anchors for faqs fixed
2014-03-29 14:05:33 +01:00
Andreas Stephanides
5134e25b81 FIXED themengruppe verwalten + faqs order 2014-03-29 13:10:41 +01:00
Andreas Stephanides
95370d4ae8 verwalten template 2014-03-29 12:43:24 +01:00
Andreas Stephanides
07f53c59bc thema verwalten added 2014-03-29 12:43:08 +01:00
Andreas Stephanides
a8401391a6 Neuigkeiten Link
Querverweise für Neuigkeiten
2014-03-29 11:30:46 +01:00
Andreas Stephanides
c235619e31 diverse fixed 2014-03-23 21:02:47 +01:00
Andreas Stephanides
6d4c24742a added some transations to thema 2014-03-16 14:15:48 +01:00