Commit Graph

1185 Commits

Author SHA1 Message Date
Andreas Stephanides
6736e4cf04 Merge branch 'master' of github.com:fetsite/fetsite 2015-03-03 20:06:14 +01:00
Andreas Stephanides
ee69c09aa4 neuigkeit cache added 2015-03-03 20:06:08 +01:00
0d6e11299a fix neuigkeiten 2015-03-03 18:12:22 +01:00
Andreas Stephanides
8718a77e4f neuigkeit update 2015-03-02 19:12:07 +01:00
Andreas Stephanides
1926c51836 foto update 2015-03-02 19:03:31 +01:00
Andreas Stephanides
97b646ec7d gallery div fix 2015-02-28 17:56:26 +01:00
Andreas Stephanides
c55a2479e8 shareable 2015-02-28 16:22:01 +01:00
Andreas Stephanides
bf774d27eb Merge branch 'master' of github.com:fetsite/fetsite 2015-02-28 15:14:37 +01:00
Andreas Stephanides
97bef49aba fix gallery histitem 2015-02-28 15:14:02 +01:00
fa33d76656 merge Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
	app/views/galleries/show.html.erb
2015-02-28 15:07:50 +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
f07925701d tinymce relative urls 2015-02-28 15:01:56 +01:00
Andreas Stephanides
be24c23751 gitignore update 2015-02-28 13:31:19 +01:00
Andreas Stephanides
daf258820a gallery foto view history fix 2015-02-28 13:27:40 +01:00
Andreas Stephanides
444db14e98 foto fb button 2015-02-25 17:15:14 +01:00
5c112be55c Merge branch 'master' of https://github.com/fetsite/fetsite 2015-02-25 17:10:44 +01:00
Andreas Stephanides
2f37259a53 gallery og tag 2015-02-25 17:10:27 +01:00
7993b2f543 Merge branch 'master' of https://github.com/fetsite/fetsite 2015-02-25 17:09:44 +01:00
3d21645596 gall2 2015-02-25 17:09:31 +01:00
Andreas Stephanides
819f9885b2 gallery og tag 2015-02-25 17:08:29 +01:00
b158d2cb05 Merge branch 'master' of https://github.com/fetsite/fetsite 2015-02-25 17:01:34 +01:00
Andreas Stephanides
d0732cbc57 gallery og tag 2015-02-25 17:00:43 +01:00
ce9d5fc947 Merge branch 'master' of https://github.com/fetsite/fetsite 2015-02-25 16:34:32 +01:00
Andreas Stephanides
5775c1b419 gallery public 2015-02-25 16:34:12 +01:00
735a9493ab Merge branch 'master' of https://github.com/fetsite/fetsite 2015-02-25 16:19:28 +01:00
3e879d620e gallery shwo 0 2015-02-25 16:19:19 +01:00
Andreas Stephanides
6286e2dadf gallery view 2015-02-25 16:18:35 +01:00
Andreas Stephanides
554c7ef937 ability foto 3 2015-02-25 16:15:06 +01:00
Andreas Stephanides
855117a117 ability foto 2 2015-02-25 16:12:12 +01:00
Andreas Stephanides
0575546603 ability fotogallery 2015-02-25 16:07:55 +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
c04c8d8f91 fixes in views 2015-02-25 12:16:17 +01:00
Andreas Stephanides
2f7fcc3ca9 gallery fix double 2015-02-25 12:03:26 +01:00
Thomas Blazek
0d1bf9739a fixed no image on the download-view (data-type -> type) 2015-02-25 12:00:53 +01:00
Thomas Blazek
dbf52f11f9 Merge branch 'master' of https://github.com/andreassteph/fetsite into andi_spinnt 2015-02-25 11:43:02 +01:00
Andreas Stephanides
374f535dac sitemap add themen 2015-02-25 11:42:20 +01:00
Andreas Stephanides
ad375d6c10 neuigkeiten Themen view fix 2015-02-25 11:42:12 +01:00
Andreas Stephanides
564c355d2d fetprofile schema 2015-02-25 11:41:59 +01:00
Andreas Stephanides
e410aef098 foto abiltiy 2015-02-25 11:41:13 +01:00
Thomas Blazek
710ef968dc Merge branch 'master' of https://github.com/andreassteph/fetsite into andi_spinnt 2015-02-25 10:37:12 +01:00
Andreas Stephanides
2ab6be038f neuigkeiten schema.org 2015-02-24 13:50:29 +01:00
Andreas Stephanides
6197f1d15e themen index 2015-02-24 13:50:09 +01:00
Andreas Stephanides
15327c75de alle themen anzeigen 2015-02-24 13:49:29 +01:00
Andreas Stephanides
67d0d19bd7 foto gallery - schema.org und download button 2015-02-24 13:46:43 +01:00
Andreas Stephanides
742962255b show topic default theme 2015-02-23 09:22:07 +01:00
Andreas Stephanides
52a33a027c faq fix 2015-02-23 09:21:54 +01:00
Andreas Stephanides
53ef07ab1a schema.org for neuigkeit 2015-02-23 09:21:48 +01:00
Andreas Stephanides
90f7485c06 themengruppe fix 2015-02-23 09:21:32 +01:00