Commit Graph

30 Commits

Author SHA1 Message Date
Andreas Stephanides
5b09d51365 AutoCommit Fre Jul 10 12:03:14 CEST 2015 2015-07-10 12:03:14 +02:00
Andreas Stephanides
783ba0d030 AutoCommit Don Jul 2 13:03:01 CEST 2015 2015-07-02 13:03:01 +02:00
Andreas Stephanides
a5c950ad46 Merge branch 'master' of github.com:fetsite/fetsite 2015-06-25 16:35:14 +02:00
74e39f45d6 smallfix 2015-06-25 16:33:51 +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
f2131f7725 lva fix 2015-03-08 22:13:16 +01:00
Thomas Blazek
6f52496a7a updating beispielupload 2015-01-22 11:19:49 +01:00
Andreas Stephanides
a785cc0bc5 beispielcontroller fix :show_comments 2014-10-17 10:17:24 +02:00
Andreas Stephanides
a8dd419f9e pagination update 2014-10-17 10:17:24 +02:00
7d56d10431 comments 2014-10-17 10:17:23 +02:00
44a0dc2f98 voteable 2014-07-21 23:41:44 +05:30
a0a0306c23 mail to current user 2014-07-17 17:40:36 +05:30
Andreas Stephanides
341f6db268 themengruppen show small fix 2014-03-29 14:06:44 +01: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
8897a217d9 upload beispiele attachments... 2014-02-20 10:50:03 +01:00
Andreas Stephanides
ff7c1d71bb Aktivere Rechtemanagement für einige Controller 2013-10-26 12:49:03 +02:00
Thomas Blazek
8b0186b4b4 Beispiele on startpage / beispiele kosmetik 2013-10-06 18:51:33 +02:00
Thomas Blazek
93667d4cea Beispiel überarbeitungen 2013-08-25 15:16:19 +02:00
Thomas Blazek
96753c3fef Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
2013-08-12 13:44:47 +02:00
Andreas Stephanides
4aca98c0f5 Merge remote-tracking branch 'thomasb/master'
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
2013-08-12 11:11:59 +02:00
Thomas Blazek
88ba8fa1c2 Merge branch 'kalender' of https://github.com/andreassteph/fetsite into calendar
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
2013-08-11 10:34:03 +02:00
Thomas Blazek
9d8b8ad3d6 kleiner bugfix, layout 2013-08-10 00:58:09 +02:00
Andreas Stephanides
b990151bde Merge branch 'master' of https://github.com/andreassteph/fetsite
Beispiel.lva bei neues Beispiel resolved
Conflicts:
	app/controllers/beispiele_controller.rb
2013-08-05 14:55:55 +02:00
Andreas Stephanides
988efd9e6a Neues Beispiel Button 2013-08-05 14:54:31 +02:00
Thomas Blazek
eb2f14f18b div-layouts+bugfixes 2013-08-05 09:57:44 +02:00
Thomas Blazek
05ed9da9c4 List views 2013-08-04 15:20:20 +02:00
Thomas Blazek
c03ecd3076 Einbindung Beispieluploader 2013-07-29 21:10:15 +02:00
Thomas Blazek
cc002d4291 Init 2013-07-22 15:49:19 +02:00
Andreas Stephanides
19b4ed31f4 Beispiele hinzugefügt 2013-02-15 10:48:52 +01:00