summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | implemented äääääh template filterNino Breuer2014-10-313-39/+96
| |/
| * Fixed all date formats to 24h format in complete programMichael Wilson2014-10-306-18/+18
| |
| * • 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)
| * [client] remove misleading commentJonathan Bauer2014-10-291-2/+0Star
| |
| * [client] vmx file generation after downloading an imageJonathan Bauer2014-10-291-31/+95
| | | | | | | | | | | | | | | | | | | | | | 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
|/
* Merge branch 'master' of git.openslx.org:openslx-ng/tutor-moduleJonathan Bauer2014-10-294-583/+355Star
|\
| * Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-2910-55/+132
| |\
| * \ Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-2819-1366/+1760
| |\ \ | | | | | | | | | | | | | | | | Conflicts: dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
| * | | changed implementation of full text search in some classesNino Breuer2014-10-284-581/+354Star
| | | |
* | | | [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-292-2/+2
| | |
* | | Radiobutton "Lecture is active" holt jetzt korrekte Werte aus ModelMichael Wilson2014-10-291-1/+12
| | |
* | | -Löschen der Berechtigungen bei gelöschtem Image/Versanstaltung implementiertMichael Wilson2014-10-291-0/+10
| | | | | | | | | | | | -Recht "LinkAllowed" wird jetzt korrekt gesetzt
* | | Berechtigung für Veranstaltung korrigiertMichael Wilson2014-10-296-52/+108
| |/ |/|
* | 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 ↵Jonathan Bauer2014-10-281-7/+7
|/ / | | | | | | finishes
* | [client] Fix upload not completingSimon Rettberg2014-10-271-1/+1
| |
* | Revert "[client] fix uploads not completing"Simon Rettberg2014-10-271-1/+1
| | | | | | | | This reverts commit 56733637669d300b472be062fc7a85a49ede3322.
* | [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 ↵Michael Wilson2014-10-2713-1324/+1705
| | | | | | | | eingeführt. Kleinere Bugs sind bekannt, werden aktuell behoben
* | [client] rework upload code, should fix upload rate problemsJonathan Bauer2014-10-273-26/+36
|/
* -Fehler behoben, Liste der Benutzer für Berechtigung nun korrektMichael Wilson2014-10-213-6/+9
| | | | -Backend vorbereitet für personenabhängige Liste der Veranstaltungen nach Rechten
* 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 ↵Jonathan Bauer2014-10-212-2/+4
| | | | | | | | download too
* | fixed some bugsNino Breuer2014-10-213-10/+14
|/
* [client] increase buffer for reading fileJonathan Bauer2014-10-211-2/+2
| | | | increases uploadspeeds
* Anlegen eines Benutzers in die Datenbank erfolgt nun bereits beim einloggen. ↵Michael Wilson2014-10-214-9/+41
| | | | Vorher war es fälschlicherweise erst beim hochladen des ersten Images
* -Breadcrumbs und deren Beschriftungen korrigiertMichael Wilson2014-10-2122-158/+96Star
|
* bug fix in main menuMichael Wilson2014-10-171-2/+4
|
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-166-544/+693
|\
| * unterschieldiche kleinigkeitenMichael Wilson2014-10-166-544/+693
| |
* | -Nino Breuer2014-10-163-7/+38
|/
* -Michael Wilson2014-10-161-3/+3
|
* namen geändertMichael Wilson2014-10-161-3/+3
|
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleMichael Wilson2014-10-161-2/+1Star
|\ | | | | | | | | Conflicts: dozentenmodul/src/main/java/gui/intro/Login_GUI.java
| * Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-161-1/+13
| |\
| * | • removed bug which caused main menu to open twice while working in ↵Nino Breuer2014-10-161-2/+0Star
| | | | | | | | | | | | offline mode
* | | -Michael Wilson2014-10-161-1/+1
| | |
* | | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleMichael Wilson2014-10-163-6/+52
|\ \ \ | | |/ | |/|
| * | fix NPE if no args are given & fake user info for bwIDM testsJonathan Bauer2014-10-161-1/+13
| |/
| * Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-162-1/+8
| |\
| | * [client] sanity check SessionData.session.getServerAdress() before making ↵Jonathan Bauer2014-10-161-0/+6
| | | | | | | | | | | | the request :)
| | * [client] dont create a huge error box when thrift communication to ↵Jonathan Bauer2014-10-161-1/+2
| | | | | | | | | | | | masterserver failed