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 |
|
|
|
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 |
|
|
|
81f1db8ff6
|
Merge remote-tracking branch 'origin'
|
2015-01-03 10:54:48 +01:00 |
|
|
|
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 |
|
Andreas Stephanides
|
87dd70ea44
|
meetings added, documents added
|
2014-12-08 22:58:21 +01:00 |
|
Andreas Stephanides
|
cba52fccc2
|
Merge branch 'master' of github.com:fetsite/fetsite
|
2014-12-08 17:12:11 +01:00 |
|
Andreas Stephanides
|
2bc428456c
|
logo2014 added , sitemap fix
|
2014-12-08 17:08:26 +01:00 |
|
|
|
41d6407093
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2014-12-08 16:14:28 +01:00 |
|
|
|
d17e5330e9
|
sitemap update
|
2014-12-08 16:14:15 +01:00 |
|
Andreas Stephanides
|
34891f09bf
|
themengruppen statt themen ind der sitmap
|
2014-12-08 16:09:00 +01:00 |
|
Andreas Stephanides
|
ad6fc74303
|
whenever
|
2014-12-08 14:58:29 +01:00 |
|
Andreas Stephanides
|
276496635f
|
extend sitemap
|
2014-12-08 14:29:01 +01:00 |
|
Andreas Stephanides
|
bd3c6054fb
|
sitemap generator
|
2014-12-08 13:42:34 +01:00 |
|
|
|
2df6f7745e
|
Fix SunSpot and minor fix in calentry
|
2014-12-02 12:03:14 +01:00 |
|
Andreas Stephanides
|
a41f964a84
|
sunspot install
|
2014-11-28 14:27:44 +01:00 |
|
Andreas Stephanides
|
741a3abb6d
|
meetings added, documents added
|
2014-11-26 20:36:04 +01:00 |
|
Andreas Stephanides
|
88b1a53fc7
|
Rate Beispiele text
|
2014-10-21 13:28:59 +02:00 |
|
Andreas Stephanides
|
54a2aee4c3
|
translate lva
|
2014-10-20 16:10:37 +02:00 |
|
Andreas Stephanides
|
6a2be58a73
|
default host für mailer
|
2014-10-19 22:16:34 +02:00 |
|
Andreas Stephanides
|
7247d67a64
|
Merge branch 'master' of https://github.com/HausdorffHimself/fetsite
|
2014-10-19 21:59:29 +02:00 |
|
Andreas Deutschmann
|
309d10bc39
|
Gremien "Alle Gremien" entfernt
|
2014-10-19 21:41:14 +02:00 |
|
Andreas Stephanides
|
5b81cbcdad
|
blue1 startpage
|
2014-10-19 20:39:21 +02:00 |
|
Andreas Stephanides
|
96ef48cb31
|
is updated button für themen
|
2014-10-19 19:25:34 +02:00 |
|
Andreas Stephanides
|
faf3151de0
|
lva Beispiele translate
|
2014-10-19 17:59:19 +02:00 |
|
Andreas Stephanides
|
2de81b5cc7
|
translate lva
|
2014-10-19 17:10:04 +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 |
|
|
|
111e703274
|
studien
|
2014-07-14 20:41:29 +05:30 |
|
|
|
4bc7c4b001
|
Interface fixes icons,colors
|
2014-07-09 22:44:42 +05:30 |
|
