Commit Graph

110 Commits

Author SHA1 Message Date
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
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
1d00b07719 pagination bootstrap update layout 2014-10-17 10:17:23 +02:00
7d56d10431 comments 2014-10-17 10:17:23 +02:00
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
44a0dc2f98 voteable 2014-07-21 23:41:44 +05:30
e8252fbf16 Beispiele als ZIP Datei 2014-07-19 18:41:50 +05:30
9bd786d053 design neue Farben & icons 2014-07-05 19:20:47 +05:30
b76818eaab fix neuigkeit_path 2014-06-26 10:47:29 +02:00
ee8f2d0076 themessticker, cleanup routes 2014-06-25 23:09:05 +05:30
2df0d89b61 facebookpublish,themen fixes 2014-06-20 00:15:45 +05:30
b1c46a3dc3 error fixes 2014-06-14 14:16:16 +02:00
bd073e0835 Wiki integriert in HP 2014-06-03 18:23:14 +05:30
13514317c9 fetprofileprivate data 2014-05-27 19:41:35 +05:30
Andreas Stephanides
c713a44884 Intern Bereich 2014-05-02 18:54:50 +02:00
Andreas Stephanides
f96c3dee9a studium_edit_lvas added 2014-04-12 18:03:39 +02:00
Andreas Stephanides
c3e1a23073 bulk modul edit 2014-04-04 14:13:47 +02:00
Andreas Stephanides
484776802a modul code clean up 2014-04-02 14:31:30 +02:00
Andreas Stephanides
d9cfe567f7 routes für neugikeiten fixed 2014-03-31 13:19:40 +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
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
cbec643b96 #114 closed 2014-03-16 15:28:22 +01:00
Andreas Stephanides
286fb014d2 kontakt added 2014-03-16 13:32:27 +01:00
Andreas Stephanides
34fe0739d6 lecturers von tiss laden 2014-03-16 13:13:31 +01:00
Andreas Stephanides
8897a217d9 upload beispiele attachments... 2014-02-20 10:50:03 +01:00
Andreas Stephanides
87d7cc247a themengruppen verwalten form 2014-02-16 15:32:04 +01:00
Andreas Stephanides
61f78c4e17 Gemfile ui fix
Gemfile + routes für themen gruppen
2014-02-09 21:23:35 +01:00
Andreas Stephanides
20d97d1b4d search route fix 2014-02-08 16:40:20 +01:00
Andreas Stephanides
783b9f41c9 changes in lva und beispiele
change
2014-01-22 12:33:07 +01:00
Andreas Stephanides
723182c69f tiss interface alpha 2014-01-17 12:16:37 +01:00
Andreas Stephanides
b86d3aca23 Themen und themes_for_rails neues design
Neues design mit theme=2003 ansehen
2014-01-08 20:23:58 +01:00