Commit Graph

49 Commits

Author SHA1 Message Date
Andreas Stephanides
fd20bd5c90 ability agenda sehen 2015-01-04 16:31:19 +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
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
2df6f7745e Fix SunSpot and minor fix in calentry 2014-12-02 12:03:14 +01:00
Andreas Stephanides
741a3abb6d meetings added, documents added 2014-11-26 20:36:04 +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
27d5d2cda2 hide gallery 2014-10-27 14:49:28 +01:00
Andreas Stephanides
b4f9e793c3 fix link dialog #181 2014-10-26 13:14:37 +01: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
2fbd277e21 can manage lecturer 2014-10-19 16:03:58 +02:00
Andreas Stephanides
116d0562d9 removecomments 2014-10-17 10:17:24 +02:00
7d56d10431 comments 2014-10-17 10:17:23 +02:00
360f6880fe rechte fuer attachment 2014-07-26 08:45:21 +02:00
d2f269f15b manage bsp 2014-07-24 09:22:06 +02:00
bd4f84e7ec ability rework 2014-07-21 23:41:56 +05:30
3572cb8d01 Merge branch 'master' of http://github.com/andreassteph/fetsite 2014-07-16 06:00:39 +02:00
8d347886c7 Gremium deletes memberships if deleted 2014-07-16 06:00:14 +02:00
6c92fd8607 abilities und beispiel delete 2014-07-16 00:24:34 +05:30
4bc7c4b001 Interface fixes icons,colors 2014-07-09 22:44:42 +05:30
ee8f2d0076 themessticker, cleanup routes 2014-06-25 23:09:05 +05:30
2df0d89b61 facebookpublish,themen fixes 2014-06-20 00:15:45 +05:30
Andreas Stephanides
c713a44884 Intern Bereich 2014-05-02 18:54:50 +02:00
Andreas Stephanides
e9be76d6e4 small fixes rubriken und themen 2014-04-11 13:02:00 +02:00
Andreas Stephanides
332b20f969 faq ability 2014-04-02 12:10:52 +02:00
Andreas Stephanides
fcdbb2248a Rechte für alle zum Beispielupload 2014-03-30 20:41:22 +02:00
Andreas Stephanides
1bf0940862 ability show thema 2014-03-30 20:09:40 +02:00
Andreas Stephanides
50bceaf017 neuigkeiten rechte 2014-02-07 22:15:30 +01:00
Andreas Stephanides
e62f5a2600 mehrere Termine je neuigkeit 2013-11-13 12:50:04 +01:00
Andreas Stephanides
328502c6a6 ability - rubrik changed 2013-11-12 21:08:24 +01:00
Andreas Stephanides
663da5422f Gremienliste anzeigen erlauben 2013-11-05 10:35:39 +01:00
Andreas Stephanides
ff7c1d71bb Aktivere Rechtemanagement für einige Controller 2013-10-26 12:49:03 +02:00
Andreas Stephanides
f7aa1b3240 utf8 fix in ability 2013-09-24 10:00:40 +02:00
Thomas Blazek
24d21df84b minor changes 2013-08-21 14:11:53 +02:00
Andreas Stephanides
a19d708134 fix translate_studien 2013-08-19 13:55:40 +02:00
Andreas Stephanides
b748382df4 Abilities für Rollenvergabe 2013-08-18 17:56:54 +02:00
Andreas Stephanides
b00e0709ca einige updates ability 2013-08-15 11:47:23 +02:00
Andreas Stephanides
81c46e28b9 Rechteverwaltung Start 2013-08-13 22:21:45 +02:00
Thomas Blazek
cc002d4291 Init 2013-07-22 15:49:19 +02:00
Andreas Stephanides
f8ad8f4527 Merge remote-tracking branch 'github/master'
Conflicts:
	app/models/ability.rb
2013-03-02 20:31:22 +01:00
Andreas Stephanides
cdf7acd426 Wiki Erstentwurf,
gollum installiert und Aktiviert,
noch nicht fertig!

Neuigkeiten / Rubriken Verwaltung verbessert
+ Neue Neuigkeiten einfügen,
+ Liste der Neuigkeiten einer Kategorie
+ html für Neuigkeiten
2013-03-02 14:09:12 +01:00
Andreas Stephanides
0de57e08a9 small fixes 2013-02-28 09:57:54 +01:00
Andreas Stephanides
f444707908 layout in news und kleiner fix 2013-02-20 01:03:06 +01:00
Andreas Stephanides
154e338360 Versionen für Gemfile, Für Debug Rechteverwaltung deaktiviert 2013-02-14 07:32:02 +01:00
Andreas Stephanides
232e6cefff scaffoldsgesäubert 2013-02-12 10:08:44 +01:00
Andreas Stephanides
3d11400d5e GitHub Account angelegt 2013-02-12 02:05:12 +01:00