| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | • added possibilty to test offline, if masterserver is not reachable. to ↵ | Nino Breuer | 2014-10-16 | 1 | -3/+30 | |
| | |/ | | | | | | | be removed someday. use parameter"offline_mode" to start. Warning: Authentication skipped!!! | |||||
| * / | fehler protokoll erweitert | Michael Wilson | 2014-10-16 | 1 | -0/+1 | |
| |/ | ||||||
| * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-10-15 | 1 | -83/+133 | |
| |\ | ||||||
| | * | [client] bwIDM-Support started, work in progress... | Jonathan Bauer | 2014-10-15 | 1 | -83/+133 | |
| | | | | | | | | | big changes in pom.xml, please rebuild everything :) | |||||
| * | | • added model for local holding of permissions | Nino Breuer | 2014-10-15 | 1 | -27/+121 | |
| |/ | | | | | • added integrity check as used in createImage • fixed bug in sql syntax which caused whitespace to be shown as #011 in statement | |||||
| * | user angepasst | Michael Wilson | 2014-10-15 | 4 | -37/+37 | |
| | | ||||||
| * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-10-15 | 11 | -454/+931 | |
| |\ | | | | | | | | | | | Conflicts: dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java g | |||||
| | * | [client] Login_GUI: oops, reactivate the Login by pressing Enter on either ↵ | Jonathan Bauer | 2014-10-15 | 1 | -13/+10![]() | |
| | | | | | | | | | the username or the password fields. | |||||
| | * | [client] Login_GUI: update text of radio button & remove dead code | Jonathan Bauer | 2014-10-15 | 1 | -7/+9 | |
| | | | ||||||
| | * | [client] Login_GUI: clicking radiobuttons for the login type now shows the ↵ | Jonathan Bauer | 2014-10-15 | 1 | -372/+476 | |
| | | | | | | | | | corresponding login mask | |||||
| | * | Diverse Änderungen für Berechtigungen | Michael Wilson | 2014-10-14 | 4 | -361/+545 | |
| | | | ||||||
| | * | -Wechsel ins Hauptmenü löscht nun gespeichrte Berechtigungen, die sich noch ↵ | Michael Wilson | 2014-10-14 | 2 | -33/+151 | |
| | | | | | | | | | | | | | | | im Zwischenspeicher befinden -Beim Bearbeiten vom Image werden nun Berechtigte Benutzer angezeigt -Aktuell funktioniert bei den Veranstaltungen nichts... :( | |||||
| | * | Text angepasst | Michael Wilson | 2014-10-14 | 1 | -5/+5 | |
| | | | ||||||
| | * | Auswahl für Loginverfahren hinzugefügt | Michael Wilson | 2014-10-14 | 1 | -317/+372 | |
| | | | ||||||
| | * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Michael Wilson | 2014-10-13 | 8 | -155/+162 | |
| | |\ | ||||||
| | | * | added email to detailed data in searcheditimage | Nino Breuer | 2014-10-13 | 2 | -2/+1![]() | |
| | | | | ||||||
| | | * | fix PermissionCreateImage_GUI not getting back to center | Jonathan Bauer | 2014-10-10 | 1 | -7/+6![]() | |
| | | | | ||||||
| | | * | [client] add logger and point to null pointer exception.... | Jonathan Bauer | 2014-10-10 | 1 | -1/+7 | |
| | | | | ||||||
| | * | | Rechteverwaltung weiter umgesetzt: | Michael Wilson | 2014-10-13 | 5 | -6/+10 | |
| | | | | | | | | | | | | | -Alle Instanzen von Listen der Images sind nun auf die Rechte des eingeloggten Benutzers beschränkt | |||||
| * | | | added functionality: klick on table header also handles all sub-rights | Nino Breuer | 2014-10-15 | 1 | -14/+9![]() | |
| | |/ |/| | ||||||
| * | | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-10-10 | 1 | -8/+5![]() | |
| |\ \ | ||||||
| | * \ | Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module | Jonathan Bauer | 2014-10-10 | 1 | -5/+0![]() | |
| | |\ \ | ||||||
| | * | | | [client] only show vmdk's on EditUploader's file chooser | Jonathan Bauer | 2014-10-10 | 1 | -8/+5![]() | |
| | | | | | ||||||
| * | | | | changed position of gui element (image-->lecture) | Nino Breuer | 2014-10-10 | 4 | -119/+89![]() | |
| | |/ / |/| | | ||||||
| * | | | Removed wrong field values (lecture name was set to image name) | Nino Breuer | 2014-10-10 | 1 | -5/+0![]() | |
| |/ / | ||||||
| * | | [client] make logger for the correct class ... | Jonathan Bauer | 2014-10-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | added autocomplete and autocheck for setting new image rights | Nino Breuer | 2014-10-10 | 1 | -12/+53 | |
| |/ | ||||||
| * | vorbereitung rechte korrigieren | Michael Wilson | 2014-10-09 | 1 | -1/+21 | |
| | | ||||||
| * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-10-09 | 1 | -19/+23 | |
| |\ | | | | | | | | | Conflicts: dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java | |||||
| | * | Rechte werden nur noch geschrieben, wenn auch welche zugeteilt wurden | Michael Wilson | 2014-10-09 | 1 | -20/+21 | |
| | | | ||||||
| * | | • added possibility to change location of application | Nino Breuer | 2014-10-09 | 27 | -329/+361 | |
| | | | | | | | | | | | • set all JOptionPane positions relative to their parent • known bug: relative position does not work when clicking "back" in ftpcreateimage | |||||
| * | | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-10-09 | 6 | -185/+251 | |
| |\| | ||||||
| | * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Michael Wilson | 2014-10-08 | 1 | -111/+18![]() | |
| | |\ | ||||||
| | | * | [client] EditImageTech: code cleanup | Jonathan Bauer | 2014-10-08 | 1 | -111/+18![]() | |
| | | | | | | | | | | | | | TODO: get the image's OS from the DB (through client) and set the combobox to that string | |||||
| | * | | -Rechteveraltung funktioniert endlich beim anlegen eines neuen Image -> muss ↵ | Michael Wilson | 2014-10-08 | 4 | -8/+34 | |
| | |/ | | | | | | | entsprechend für alle anderen Seiten sinnvoll übernommen werden | |||||
| | * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Michael Wilson | 2014-10-07 | 25 | -585/+393![]() | |
| | |\ | ||||||
| | * | | -Verwaltung von Rechten ist nun in der PermissionCreateImage_GUI.java möglich | Michael Wilson | 2014-10-07 | 3 | -67/+200 | |
| | | | | ||||||
| * | | | fg | Nino Breuer | 2014-10-09 | 1 | -1/+2 | |
| | |/ |/| | ||||||
| * | | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-10-07 | 14 | -900/+395![]() | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Conflicts: dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java g | |||||
| | * | | [client] now also remember the "technisch-info" wenn going back a page | Jonathan Bauer | 2014-10-06 | 1 | -31/+8![]() | |
| | | | | ||||||
| | * | | [client] parametrise JComboBox, makes eclipse happy | Jonathan Bauer | 2014-10-06 | 1 | -2/+2 | |
| | |/ | ||||||
| | * | -Volltextsuche vorbereitet, Funktion wird noch angepasst | Michael Wilson | 2014-10-02 | 7 | -111/+40![]() | |
| | | | ||||||
| | * | -Debug Ausgaben reduziert | Michael Wilson | 2014-10-02 | 1 | -54/+25![]() | |
| | | | ||||||
| | * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Michael Wilson | 2014-10-02 | 7 | -43/+158 | |
| | |\ | ||||||
| | * | | -Suchfenster "Image bearbeiten", "Image löschen", Veranstaltung bearbeiten", ↵ | Michael Wilson | 2014-10-02 | 6 | -718/+345![]() | |
| | | | | | | | | | | | | | | | | | | | | | | "Veranstaltung löschen" wurden vereinfacht (nur Anzeige, noch nicht Logik) -Login speichert nun den gesamten Login als User, nicht nur den String vor dem "@uni......." -SQL wurde umgebogen um den Login als primary key für den User festzulegen und damit umzugehen | |||||
| * | | | Removed (now) unused GUIs | Nino Breuer | 2014-10-07 | 25 | -533/+373![]() | |
| | |/ |/| | | | | | Added some helping information for users | |||||
| * | | • added warning for 'back' on ftp upload task | Nino Breuer | 2014-10-01 | 4 | -38/+98 | |
| | | | | | | | | | • enabled and implemented radio buttons for vmchooser userlist | |||||
| * | | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-10-01 | 2 | -6/+8 | |
| |\| | ||||||
| | * | Verlinkung der Seiten gefixt | Michael Wilson | 2014-10-01 | 2 | -6/+8 | |
| | | | ||||||
| * | | dg | Nino Breuer | 2014-10-01 | 3 | -26/+65 | |
| | | | ||||||

