Thomas Blazek
deb8ccf47d
started working on menu
2015-01-27 10:58:45 +01:00
Thomas Blazek
6f52496a7a
updating beispielupload
2015-01-22 11:19:49 +01:00
Thomas Blazek
0280ebb6a1
Merge pull request #4 from bernis/master
...
Die spans/offsets + Optische Veränderungen (Hauptseite)
2015-01-21 10:37:48 +01:00
Bernhard Stampfer
a196b56669
Kleinere optische Veränderungen
...
Bitte umbedingt testen
Etwas größere Maximalbreite des content-wrap (kann man das sauberer ändern?)
5/7 Aufteilung des Contents
Word-wrap in den neuen Beispielen
Einige margins angepasst (oben sind die Boxen jetzt bündig)
2015-01-20 14:58:04 +01:00
Bernhard Stampfer
767df6439b
Platzhalter SPAN1s durch OFFSETs ersetzt, reduziert Leerstellen in Mobilansicht
...
Die span10 mit dem Seiteninhalt wurden von zwei span1 davor und dahinter
zentriert, diese verursachen aber Abstände in der mobilen Ansicht (sind dort
ober und unter dem span10), offset ist denk ich sauberer
2015-01-20 13:05:40 +01:00
Thomas Blazek
028cf58952
started working on beispiel
2015-01-19 18:40:15 +01:00
Thomas Blazek
229a44df4e
Alignment/added fix for dropdown
2015-01-19 14:59:14 +01:00
Thomas Blazek
e5966bccce
I18n korrekturen
2015-01-18 00:30:42 +01:00
Thomas Blazek
7c5ac3b8d7
Merge branch 'master' of https://github.com/fetsite/fetsite
2015-01-18 00:21:19 +01:00
Thomas Blazek
b3000ae542
Show lecturer picture if it exists
2015-01-18 00:19:41 +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
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
a9969a6c72
updates
2015-01-16 09:46:01 +01:00
Thomas Blazek
75667ae6ce
work in progress
2015-01-16 00:03:09 +01:00
Andreas Stephanides
978d923082
fix blueimp gallery
2015-01-15 16:38:16 +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
Thomas Blazek
3dff2d2bbe
Fix: Bildergallerie
...
Bildergallerie läuft jetzt auf Blueimp-gallery.
Viel spaß
2015-01-15 15:36:20 +01:00
Andreas Stephanides
565024c282
blue2
2015-01-15 15:20:19 +01:00
Thomas Blazek
9873c4f1c1
Merge branch 'master' of https://github.com/Inachos/fetsite
2015-01-15 14:38:41 +01:00
Thomas Blazek
f6a95dee57
commit
2015-01-15 14:30:53 +01:00
Thomas Blazek
3a00794851
dfsd
2015-01-15 14:01:16 +01:00
Thomas Blazek
bcffee7bc9
Merge branch 'master' of https://github.com/fetsite/fetsite
2015-01-14 09:12:56 +01:00
70e34875f1
search results fix
2015-01-14 09:11:09 +01:00
Thomas Blazek
9cc108b2ed
Merge branch 'master' of https://github.com/andreassteph/fetsite
2015-01-14 09:10:57 +01:00
Andreas Stephanides
1731d1f3d2
Merge branch 'master' of github.com:fetsite/fetsite
2015-01-14 09:08:05 +01:00
Andreas Stephanides
47b692b243
Suchergebnis darstellung
2015-01-14 09:07:34 +01:00
Thomas Blazek
f95c8469e3
Merge branch 'master' of https://github.com/fetsite/fetsite
2015-01-12 16:54:21 +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
Bernhard Stampfer
c879189705
Sprache/Login im Menü rechtsbündig
2015-01-05 18:37: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
aa080a1eec
Buttons doument show
2015-01-03 10:49:41 +01:00
Andreas Stephanides
0cca373f33
document views
2015-01-03 10:08:00 +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
9307acf29f
fix2
2014-12-17 17:00:50 +01:00
Andreas Stephanides
8232b0d0c0
faqs fix
2014-12-17 16:58:24 +01:00
Andreas Stephanides
bf7111816f
faqs
2014-12-17 16:57:13 +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
a9ef5c14ba
meeting ix
2014-12-12 15:24:20 +01:00
Andreas Stephanides
e411a98b4e
Treffen sichtbar
2014-12-08 22:58:22 +01:00
Andreas Stephanides
ab396c002e
meeting views
2014-12-08 22:58:21 +01:00
Andreas Stephanides
87dd70ea44
meetings added, documents added
2014-12-08 22:58:21 +01:00
Andreas Stephanides
c2ea1782ff
documents
2014-12-08 22:58:21 +01:00
Andreas Stephanides
6ad5a76cc8
logo2014
2014-12-08 17:17:18 +01:00
