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 |
|
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
|
b46e19b466
|
integrate calendar with meetings
|
2015-01-18 14:32:20 +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.
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 |
|
|
|
057a66966d
|
fix document searchable
|
2015-01-17 12:04:10 +01:00 |
|
Thomas Blazek
|
9ffebfd4e7
|
started writing the init script
|
2015-01-16 15:25:44 +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
|
c95782744a
|
gemfle update
|
2015-01-15 16:13:28 +01:00 |
|
Andreas Stephanides
|
fe4d72dcb3
|
application css scss
|
2015-01-15 15:57:00 +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
|
48e3c1149a
|
added start_topic.yml to gitignore
|
2015-01-15 15:36:54 +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
|
2931ee6cd6
|
Need to enforce the jquery-fileupload version
0.4.2 broke uploads for me
|
2015-01-15 12:56:52 +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 |
|
|
|
1d11b270cf
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2015-01-14 09:08:51 +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
|
25cf052f95
|
Merge pull request #212 from bernis/master
Sprache/Login im Menü rechtsbündig
|
2015-01-12 12:26:29 +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 |
|
Bernhard Stampfer
|
c879189705
|
Sprache/Login im Menü rechtsbündig
|
2015-01-05 18:37:05 +01:00 |
|
|
|
5b0840a7d2
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2015-01-04 16:31:51 +01:00 |
|
Andreas Stephanides
|
fd20bd5c90
|
ability agenda sehen
|
2015-01-04 16:31:19 +01:00 |
|
|
|
edecf20a44
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2015-01-04 16:26:38 +01:00 |
|
Andreas Stephanides
|
940e7211d2
|
fix meeting auth
|
2015-01-04 16:25:44 +01:00 |
|
|
|
40739523c2
|
fix document typ
|
2015-01-03 11:40:25 +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 |
|
