summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* -allowed 3 special chars in image nameMichael Wilson2014-10-311-3/+5
* //Michael Wilson2014-10-311-6/+6
* -image templates are now listed a such, independently of the logged in userMichael Wilson2014-10-316-253/+1129
* Fixed all date formats to 24h format in complete programMichael Wilson2014-10-307-23/+23
* Fixed bug: returned wrong content for lecturesMichael Wilson2014-10-301-2/+2
* Fixed bug when filtering for imagesMichael Wilson2014-10-301-1/+1
* fixed bugNino Breuer2014-10-301-3/+3
* • added full text search in earch search-guiNino Breuer2014-10-3013-143/+352
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleMichael Wilson2014-10-304-37/+174
|\
| * [client] remove misleading commentJonathan Bauer2014-10-291-2/+0Star
| * [client] vmx file generation after downloading an imageJonathan Bauer2014-10-292-31/+165
| * [client] clearer comments for ResourceLoaderJonathan Bauer2014-10-291-2/+2
| * [client] some comments for UploadTaskJonathan Bauer2014-10-291-2/+7
* | fMichael Wilson2014-10-301-0/+1
|/
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleMichael Wilson2014-10-298-628/+525Star
|\
| * Merge branch 'master' of git.openslx.org:openslx-ng/tutor-moduleJonathan Bauer2014-10-297-623/+503Star
| |\
| | * gNino Breuer2014-10-291-23/+27
| | * Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-2912-154/+270
| | |\
| | * \ Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-2824-2651/+7360
| | |\ \
| | * | | changed implementation of full text search in some classesNino Breuer2014-10-287-600/+477Star
| * | | | [client] support for loading text files through the ResouceLoaderJonathan Bauer2014-10-291-5/+22
| | |_|/ | |/| |
* / | | --Michael Wilson2014-10-291-8/+7Star
|/ / /
* | | Ausgaben etwas verkürztMichael Wilson2014-10-294-89/+109
* | | Radiobutton "Lecture is active" holt jetzt korrekte Werte aus ModelMichael Wilson2014-10-292-4/+15
* | | -Löschen der Berechtigungen bei gelöschtem Image/Versanstaltung implementiertMichael Wilson2014-10-293-11/+40
* | | Berechtigung für Veranstaltung korrigiertMichael Wilson2014-10-296-52/+108
| |/ |/|
* | Serverseitiges Read und Write von Rechten korrigiertMichael Wilson2014-10-284-242/+1154
* | Merge branch 'master' of git.openslx.org:openslx-ng/tutor-moduleJonathan Bauer2014-10-284-7/+11
|\ \
| * | Bug behoben: GUI erkennt nun wieder einen abgeschlossenen Up-/DownloadMichael Wilson2014-10-284-7/+11
* | | [client] fixes "fertig stellen" button not beeing activated when download fin...Jonathan Bauer2014-10-281-7/+7
|/ /
* | [client] Fix upload not completingSimon Rettberg2014-10-271-1/+1
* | Revert "[client] fix uploads not completing"Simon Rettberg2014-10-271-1/+1
* | [client] fix uploads not completingJonathan Bauer2014-10-271-1/+1
* | Button Position korrigertMichael Wilson2014-10-271-97/+97
* | Sämtliche Logik und Grafiken zur Vergabe und Verwaltung von Berechtigungen ei...Michael Wilson2014-10-2718-2408/+6153
* | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleMichael Wilson2014-10-273-26/+36
|\ \
| * | [client] rework upload code, should fix upload rate problemsJonathan Bauer2014-10-273-26/+36
| |/
* / -Rechtevergabe für Veranstaltungen vorbereitetMichael Wilson2014-10-231-71/+110
|/
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleMichael Wilson2014-10-211-12/+25
|\
| * fixed bugNino Breuer2014-10-211-15/+2Star
* | -Fehler behoben, Liste der Benutzer für Berechtigung nun korrektMichael Wilson2014-10-217-541/+3343
|/
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-213-13/+21
|\
| * [client] comments for showMainMenu functionJonathan Bauer2014-10-211-3/+9
| * [client] fix typo in static variableJonathan Bauer2014-10-211-4/+6
| * [client] log errors of thread executing shibboleth LoginJonathan Bauer2014-10-211-4/+2Star
| * [client] make buffer size human-friendly & increased buffer size for download...Jonathan Bauer2014-10-212-2/+4
* | fixed some bugsNino Breuer2014-10-214-11/+15
|/
* [client] increase buffer for reading fileJonathan Bauer2014-10-211-2/+2
* Anlegen eines Benutzers in die Datenbank erfolgt nun bereits beim einloggen. ...Michael Wilson2014-10-217-14/+2040
* -Breadcrumbs und deren Beschriftungen korrigiertMichael Wilson2014-10-2122-158/+96Star