andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
1,323 Commits 7 Branches 0 Tags
c36008729b1402964df0dec1075e5704f75c3372
Commit Graph

276 Commits

Author SHA1 Message Date
Andreas Stephanides
5a7eb23a1f studium form update 2015-05-28 20:17:36 +02:00
Andreas Stephanides
fa61337459 rake task for crawl 2015-05-13 11:27:02 +02:00
Andreas Stephanides
a2491ee84d inline tinymce document 2015-05-04 13:40:27 +02:00
Andreas Stephanides
8a32bff399 sanitize document 2015-04-29 16:07:39 +02:00
Andreas Stephanides
19959b083e time zone 2015-04-29 15:25:10 +02:00
Andreas Stephanides
2d2931cdb8 icon form 2015-04-29 15:24:59 +02:00
Andreas Stephanides
d56d77daef create_pdf 2015-04-26 18:08:46 +02:00
Andreas Stephanides
7753c80120 crawl routes 2015-04-22 18:43:41 +02:00
Andreas Stephanides
036f90e6e5 crawler 2015-04-22 18:43:24 +02:00
Andreas Stephanides
682d5687fc remove h from english time 2015-04-17 10:50:05 +02:00
Andreas Stephanides
6bb7cb917c fix meeting translation 2015-04-14 18:26:03 +02:00
Andreas Stephanides
d8aa87d25a translation date 2015-04-14 18:19:37 +02:00
Andreas Stephanides
e56ff2597b on->am 2015-04-14 18:16:30 +02:00
Andreas Stephanides
bbc8dc27cc date->datum.on 2015-04-14 18:15:18 +02:00
Andreas Stephanides
3a747cb04f date on 2015-04-14 18:08:27 +02:00
Andreas Stephanides
6cc2dad611 date.en 2015-04-14 18:05:39 +02:00
Andreas Stephanides
659653606a move translation for date.on 2015-04-14 18:03:21 +02:00
Andreas Stephanides
b02dcad387 add a treeview 2015-04-14 17:56:35 +02:00
Andreas Stephanides
4f8dd29240 translation meeting 2015-04-09 16:45:54 +02:00
Andreas Stephanides
387312f631 #247 2015-04-09 09:14:53 +02:00
Andreas Stephanides
0df5e72e15 attachment new version 2015-04-07 23:21:33 +02:00
Andreas Stephanides
8046b1ac7f only published news in sitemap 2015-03-09 00:36:13 +01:00
Andreas Stephanides
1f790c3f9b sitemap news name 2015-03-09 00:04:38 +01:00
Andreas Stephanides
02c5cc2d55 neuigkeiten sort und ability 2015-03-04 15:51:44 +01:00
Andreas Stephanides
f07925701d tinymce relative urls 2015-02-28 15:01:56 +01:00
Andreas Stephanides
3b332d5272 sitemap fix 2015-02-25 12:41:33 +01:00
Andreas Stephanides
d2816e2d21 sitemap neuigkeit name 2015-02-25 12:40:06 +01:00
Andreas Stephanides
374f535dac sitemap add themen 2015-02-25 11:42:20 +01:00
Andreas Stephanides
088b3562cc admin fixes 2015-02-23 09:21:14 +01: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
20240b75de social plugin 2015-02-11 01:14:52 +01:00
Andreas Stephanides
f1a149908d meetingtyp management 2015-02-09 15:38:21 +01:00
Andreas Stephanides
6c39c40403 precompile blueimp 2015-02-01 20:22:31 +01:00
Thomas Blazek
e5966bccce I18n korrekturen 2015-01-18 00:30:42 +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
Thomas Blazek
b7f9cf942b Bildergallerie auf Kurs 
Für alle mit löschrechten: 2 Buttons, einer zeigt auf originaldatei,
einer löscht das bild.
 2015-01-16 14:41:37 +01:00
Thomas Blazek
75667ae6ce work in progress 2015-01-16 00:03:09 +01:00
Thomas Blazek
3dff2d2bbe Fix: Bildergallerie 
Bildergallerie läuft jetzt auf Blueimp-gallery.
Viel spaß
 2015-01-15 15:36:20 +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
81f1db8ff6 Merge remote-tracking branch 'origin' 2015-01-03 10:54:48 +01:00
Andreas Stephanides
3799e5f842 configuration for production 2015-01-03 10:52:34 +01:00
Andreas Stephanides
d72f78488d document/meeting updates 2015-01-03 10:06:58 +01:00
Andreas Stephanides
de8802c34a Merge branch 'master' into documentmeeting 2014-12-18 07:50:16 +01:00
Andreas Stephanides
afb4508e71 updated tinymce config 2014-12-17 16:41:33 +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