summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * • Ausgaben an sinnvollen gekürzt bzw. erweitertMichael Wilson2014-11-1826-537/+475Star
| |
| * • Beim Bearbeiten eines Image oder einer Veranstaltung wurde bisher der ↵Michael Wilson2014-11-1812-356/+1371
| | | | | | | | aktuell eingeloggte Benutzer immer neu als Verantwortlicher eingetragen --> Der Verantwortliche ändert sich nun nicht mehr und wird korrekt angezeigt
| * -Michael Wilson2014-11-171-1/+1
| |
| * • Cells in non-permitted user-list is now non-clickableMichael Wilson2014-11-171-3/+12
| |
* | • fixed bug, where there could only be one image and one lecture with the ↵Nino Breuer2014-11-189-122/+1083
|/ | | | same name
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-11-172-131/+133
|\
| * • Images can now be updated without destroying everything...Michael Wilson2014-11-172-279/+1003
| |\
| * | SQL: mehr ausgabenMichael Wilson2014-11-172-108/+118
| | | | | | | | | | | | FTPEditUploader: Pfade korrigiert
* | | • fixed bug where the os name was not set to the correct value while ↵Nino Breuer2014-11-175-1/+888
| |/ |/| | | | | editing an image
* | • changed regular statements to prepared statements to prevent sql injectionsNino Breuer2014-11-171-259/+991
|/
* -Michael Wilson2014-11-173-2/+7
|
* Navigation korrigiertMichael Wilson2014-11-131-1/+1
|
* Feedback nach Anlegen / Änderungen am ImageMichael Wilson2014-11-132-2/+23
|
* hNino Breuer2014-11-1111-173/+1326
|
* main mainu now not resizableMichael Wilson2014-11-031-0/+1
|
* [client] save vmx file to currently selected download directory instead of ↵Jonathan Bauer2014-11-031-1/+1
| | | | the last download dir
* [client] change vmx template from hostonly to natJonathan Bauer2014-11-031-1/+1
|
* .Michael Wilson2014-11-031-1/+1
|
* Sonderzeichen nun auch im bearbeiten von Images erlaubtMichael Wilson2014-11-031-2/+2
|
* fixed bug: all images now show ALL imagesNino Breuer2014-11-035-241/+1222
|
* initialize all lectures with ALL lectures...Nino Breuer2014-11-031-1/+38
|
* sdNino Breuer2014-11-031-1/+1
|
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-11-0329-492/+1866
|\ | | | | | | | | | | | | Conflicts: dozentenmodulserver/src/main/java/sql/SQL.java • Note: manual merge
| * • fixed bug which caused search guis to be closed when pressing enter in ↵Nino Breuer2014-10-314-15/+9Star
| | | | | | | | search bar
| * Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-318-262/+1140
| |\
| | * -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
| | | | | | | | | | | | -Lectures can now be connected to image templates
| * | implemented äääääh template filterNino Breuer2014-10-313-39/+96
| |/
| * 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
| | | | | | | | | | | | | | • fixed bug: arrayIndexOutOfBounds (several classes) • fixed bug: failed to update image data • changed text examples • fixed bug: any image has been shown as template when changing value of search bar (each direction)
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WARNING: this will not work for StreamOptimized-VMDKs. This is not something we can directly fix, since it depends on the type of the vmdk beeing downloaded. TODO: How to handle this case? Minor: also reworked speed calculations for downloads to lessen the amount of updates needed by the GUI.
| | * [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
| |\
| * | --Michael Wilson2014-10-291-8/+7Star
| | |
* | | vNino Breuer2014-11-031-1/+1
| |/ |/|
* | 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
| |\ \ | | | | | | | | | | | | | | | | Conflicts: dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
| * | | 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
| |_|/ |/| | | | | | | | this will be needed to read the vmx-template from resources/
* | | Ausgaben etwas verkürztMichael Wilson2014-10-294-89/+109
| | |