Commit Graph

350 Commits

Author SHA1 Message Date
Andreas Stephanides
080150f11b attachments has_many for document, neuigkeit, thema 2015-04-07 23:23:14 +02:00
Andreas Stephanides
0df5e72e15 attachment new version 2015-04-07 23:21:33 +02:00
Andreas Stephanides
99a9ad6c07 cache key fix2 2015-03-15 20:51:20 +01:00
Andreas Stephanides
001c2e3070 startpage new 2015-03-15 19:50:17 +01:00
Andreas Stephanides
34c0374877 meeting style 2015-03-15 13:09:05 +01:00
Andreas Stephanides
3cc9de7d29 Merge branch 'master' of github.com:fetsite/fetsite
Conflicts:
	app/controllers/application_controller.rb
2015-03-09 17:40:52 +01:00
Andreas Stephanides
d5e0d20884 app controler url parameter 2015-03-09 17:39:33 +01:00
63e3d68053 fixes 2015-03-09 17:37:02 +01:00
Andreas Stephanides
f2131f7725 lva fix 2015-03-08 22:13:16 +01:00
Andreas Stephanides
bd3c3a25e1 document versions 2015-03-06 16:40:47 +01:00
Andreas Stephanides
06dd5ff5bb 2003 theme inaktive 2015-03-06 16:40:17 +01:00
0d6e11299a fix neuigkeiten 2015-03-03 18:12:22 +01:00
Andreas Stephanides
c71cef48fa do not fix links for themen 2015-02-28 15:02:52 +01:00
Andreas Stephanides
62b6f8ca88 gallery fixes 2015-02-28 15:02:22 +01:00
Andreas Stephanides
daf258820a gallery foto view history fix 2015-02-28 13:27:40 +01:00
Andreas Stephanides
6286e2dadf gallery view 2015-02-25 16:18:35 +01:00
Andreas Stephanides
6197f1d15e themen index 2015-02-24 13:50:09 +01:00
Andreas Stephanides
67d0d19bd7 foto gallery - schema.org und download button 2015-02-24 13:46:43 +01:00
Andreas Stephanides
90f7485c06 themengruppe fix 2015-02-23 09:21:32 +01:00
Andreas Stephanides
088b3562cc admin fixes 2015-02-23 09:21:14 +01:00
Andreas Stephanides
a0427336c8 sticky topics 2015-02-23 09:19:30 +01:00
Andreas Stephanides
81e97837de filter log fix 2015-02-17 19:31:32 +01:00
Andreas Stephanides
1cb6cecf81 Merge branch 'opengraph' 2015-02-17 19:00:37 +01:00
Andreas Stephanides
415da41236 log file view 2015-02-17 18:59:28 +01:00
Andreas Stephanides
5c8b8dcfe6 fixes 2015-02-14 17:26:37 +01:00
Andreas Stephanides
b4683bd396 rubrik / Themen -> accessible by 2015-02-14 17:26:33 +01:00
Andreas Stephanides
14ebb13bc1 meeting fixes 2015-02-14 17:25:51 +01:00
Andreas Stephanides
29a35f76d8 modify attachments 2015-02-11 20:53:25 +01:00
Andreas Stephanides
ddd786994c Merge branch 'master' of github.com:fetsite/fetsite 2015-02-11 01:16:49 +01:00
20240b75de social plugin 2015-02-11 01:14:52 +01:00
Andreas Stephanides
44d35e196f picture url bei neuigkeiten ohne locale und theme 2015-02-10 14:05:20 +01:00
Andreas Stephanides
2b483ae9e9 themen auf eigenen seiten anzeigen 2015-02-10 14:04:18 +01:00
Andreas Stephanides
f1a149908d meetingtyp management 2015-02-09 15:38:21 +01:00
Thomas Blazek
6f52496a7a updating beispielupload 2015-01-22 11:19:49 +01:00
Andreas Stephanides
69b7604761 fix calendar for all 2015-01-18 15:08:18 +01:00
Andreas Stephanides
7a8889dcc4 meeting cont 2015-01-18 14:51:56 +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
057a66966d fix document searchable 2015-01-17 12:04:10 +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
9c6038d6dd Gallery show enhancements
a) Worked on better pagination, knows now 25, 50, 100  and "all"
b) Viewer always shows ALL pictures, sorted to fit the order of the
pagination
2015-01-16 12:10:02 +01:00
Thomas Blazek
75667ae6ce work in progress 2015-01-16 00:03:09 +01:00
Andreas Stephanides
43a551fc28 Merge branch 'master' of https://github.com/Inachos/fetsite into testgallery
Conflicts:
	app/views/layouts/application.html.erb
2015-01-15 15:40:36 +01:00
Andreas Stephanides
565024c282 blue2 2015-01-15 15:20:19 +01:00
Thomas Blazek
9cc108b2ed Merge branch 'master' of https://github.com/andreassteph/fetsite 2015-01-14 09:10:57 +01:00
Andreas Stephanides
47b692b243 Suchergebnis darstellung 2015-01-14 09:07:34 +01:00
Thomas Blazek
85d2bb5bf9 Check for 0 themen 2015-01-11 22:18:31 +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
940e7211d2 fix meeting auth 2015-01-04 16:25:44 +01:00
81f1db8ff6 Merge remote-tracking branch 'origin' 2015-01-03 10:54:48 +01:00