summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/intro
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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-161-4/+44
|\ \ \ | | |/ | |/|
| * | 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-161-1/+2
| |\
| | * [client] dont create a huge error box when thrift communication to ↵Jonathan Bauer2014-10-161-1/+2
| | | | | | | | | | | | masterserver failed
| * | • added possibilty to test offline, if masterserver is not reachable. to ↵Nino Breuer2014-10-161-3/+30
| |/ | | | | | | be removed someday. use parameter"offline_mode" to start. Warning: Authentication skipped!!!
* / fehler protokoll erweitertMichael Wilson2014-10-161-0/+1
|/
* [client] bwIDM-Support started, work in progress...Jonathan Bauer2014-10-151-83/+133
| | | | big changes in pom.xml, please rebuild everything :)
* [client] Login_GUI: oops, reactivate the Login by pressing Enter on either ↵Jonathan Bauer2014-10-151-13/+10Star
| | | | the username or the password fields.
* [client] Login_GUI: update text of radio button & remove dead codeJonathan Bauer2014-10-151-7/+9
|
* [client] Login_GUI: clicking radiobuttons for the login type now shows the ↵Jonathan Bauer2014-10-151-372/+476
| | | | corresponding login mask
* Diverse Änderungen für BerechtigungenMichael Wilson2014-10-141-1/+1
|
* -Wechsel ins Hauptmenü löscht nun gespeichrte Berechtigungen, die sich noch ↵Michael Wilson2014-10-141-0/+5
| | | | | | | im Zwischenspeicher befinden -Beim Bearbeiten vom Image werden nun Berechtigte Benutzer angezeigt -Aktuell funktioniert bei den Veranstaltungen nichts... :(
* Text angepasstMichael Wilson2014-10-141-5/+5
|
* Auswahl für Loginverfahren hinzugefügtMichael Wilson2014-10-141-317/+372
|
* • added possibility to change location of applicationNino Breuer2014-10-095-40/+31Star
| | | | | • 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-moduleNino Breuer2014-10-092-26/+29
|\
| * -Rechteveraltung funktioniert endlich beim anlegen eines neuen Image -> muss ↵Michael Wilson2014-10-081-0/+1
| | | | | | | | entsprechend für alle anderen Seiten sinnvoll übernommen werden
| * Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleMichael Wilson2014-10-072-5/+26
| |\
| * | -Verwaltung von Rechten ist nun in der PermissionCreateImage_GUI.java möglichMichael Wilson2014-10-072-26/+28
| | |
* | | fgNino Breuer2014-10-091-1/+2
| |/ |/|
* | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-071-2/+2
|\| | | | | | | | | | | | | | | 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
| * Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleMichael Wilson2014-10-022-16/+25
| |\
| * | -Suchfenster "Image bearbeiten", "Image löschen", Veranstaltung bearbeiten", ↵Michael Wilson2014-10-021-2/+2
| | | | | | | | | | | | | | | | | | | | | "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 GUIsNino Breuer2014-10-072-5/+26
| |/ |/| | | | | Added some helping information for users
* | dgNino Breuer2014-10-011-18/+11Star
| |
* | added info option in main menuNino Breuer2014-10-012-0/+16
|/
* testMichael Wilson2014-09-301-1/+1
|
* testMichael Wilson2014-09-301-1/+1
|
* [client] few javadoc commentsJonathan Bauer2014-09-231-9/+7Star
|
* [client] do commit the changes :)Jonathan Bauer2014-09-222-38/+26Star
|
* [client] remove pointless instantiation of a static class ...Jonathan Bauer2014-09-181-4/+2Star
|
* revert accidental deletion of MainMenue_GUI.javaJonathan Bauer2014-09-181-0/+620
|
* Merge branch 'master' of git.openslx.org:openslx-ng/tutor-moduleJonathan Bauer2014-09-181-620/+0Star
|\
| * Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-09-171-605/+0Star
| |\ | | | | | | | | | | | | Conflicts: dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
| * | Fixed some wording and spellingNino Breuer2014-09-171-5/+5
| | |
* | | [client] moved main function to App.java & refined Config stuffJonathan Bauer2014-09-183-43/+11Star
| |/ |/|
* | [client] only set news if not nullJonathan Bauer2014-09-151-1/+1
| |
* | [client] News class for getting news from the satelliteJonathan Bauer2014-09-151-1/+16
|/
* Fix server.thrift file (make future-proof by using field ids), move ↵Simon Rettberg2014-09-131-1/+1
| | | | generated thrift classes to own package
* [client] Add resource loader that will take care of error handlingSimon Rettberg2014-09-133-65/+63Star
|
* [client] Reworked performLogin(): Better error handling, removed dead code, ↵Simon Rettberg2014-09-131-167/+119Star
| | | | got rid of deep if-else nestings, removed unused variables
* replaced escaped umlauts by UTF-8 encoded charsJonathan Bauer2014-09-124-33/+33
|
* [client] Show automatically generated version stringSimon Rettberg2014-09-121-1/+1
|
* java style name for Config class ...Jonathan Bauer2014-09-123-17/+17
|
* reworked config file class, now a static class.Jonathan Bauer2014-09-113-137/+58Star
| | | | see code for an example...
* oopsJonathan Bauer2014-09-115-0/+1652