| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-10-16 | 1 | -1/+13 | |
| | |\ | ||||||
| | * | | • removed bug which caused main menu to open twice while working in ↵ | Nino Breuer | 2014-10-16 | 1 | -2/+0![]() | |
| | | | | | | | | | | | | | offline mode | |||||
| * | | | - | Michael Wilson | 2014-10-16 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Michael Wilson | 2014-10-16 | 1 | -4/+44 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | fix NPE if no args are given & fake user info for bwIDM tests | Jonathan Bauer | 2014-10-16 | 1 | -1/+13 | |
| | |/ | ||||||
| | * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-10-16 | 1 | -1/+2 | |
| | |\ | ||||||
| | | * | [client] dont create a huge error box when thrift communication to ↵ | Jonathan Bauer | 2014-10-16 | 1 | -1/+2 | |
| | | | | | | | | | | | | | masterserver failed | |||||
| | * | | • 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 | |
| |/ | ||||||
| * | [client] bwIDM-Support started, work in progress... | Jonathan Bauer | 2014-10-15 | 1 | -83/+133 | |
| | | | | | big changes in pom.xml, please rebuild everything :) | |||||
| * | [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 | 1 | -1/+1 | |
| | | ||||||
| * | -Wechsel ins Hauptmenü löscht nun gespeichrte Berechtigungen, die sich noch ↵ | Michael Wilson | 2014-10-14 | 1 | -0/+5 | |
| | | | | | | | | 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 | |
| | | ||||||
| * | • added possibility to change location of application | Nino Breuer | 2014-10-09 | 5 | -40/+31![]() | |
| | | | | | | • 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 | 2 | -26/+29 | |
| |\ | ||||||
| | * | -Rechteveraltung funktioniert endlich beim anlegen eines neuen Image -> muss ↵ | Michael Wilson | 2014-10-08 | 1 | -0/+1 | |
| | | | | | | | | | 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 | 2 | -5/+26 | |
| | |\ | ||||||
| | * | | -Verwaltung von Rechten ist nun in der PermissionCreateImage_GUI.java möglich | Michael Wilson | 2014-10-07 | 2 | -26/+28 | |
| | | | | ||||||
| * | | | 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 | 1 | -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-module | Michael Wilson | 2014-10-02 | 2 | -16/+25 | |
| | |\ | ||||||
| | * | | -Suchfenster "Image bearbeiten", "Image löschen", Veranstaltung bearbeiten", ↵ | Michael Wilson | 2014-10-02 | 1 | -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 GUIs | Nino Breuer | 2014-10-07 | 2 | -5/+26 | |
| | |/ |/| | | | | | Added some helping information for users | |||||
| * | | dg | Nino Breuer | 2014-10-01 | 1 | -18/+11![]() | |
| | | | ||||||
| * | | added info option in main menu | Nino Breuer | 2014-10-01 | 2 | -0/+16 | |
| |/ | ||||||
| * | test | Michael Wilson | 2014-09-30 | 1 | -1/+1 | |
| | | ||||||
| * | test | Michael Wilson | 2014-09-30 | 1 | -1/+1 | |
| | | ||||||
| * | [client] few javadoc comments | Jonathan Bauer | 2014-09-23 | 1 | -9/+7![]() | |
| | | ||||||
| * | [client] do commit the changes :) | Jonathan Bauer | 2014-09-22 | 2 | -38/+26![]() | |
| | | ||||||
| * | [client] remove pointless instantiation of a static class ... | Jonathan Bauer | 2014-09-18 | 1 | -4/+2![]() | |
| | | ||||||
| * | revert accidental deletion of MainMenue_GUI.java | Jonathan Bauer | 2014-09-18 | 1 | -0/+620 | |
| | | ||||||
| * | Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module | Jonathan Bauer | 2014-09-18 | 1 | -620/+0![]() | |
| |\ | ||||||
| | * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-09-17 | 1 | -605/+0![]() | |
| | |\ | | | | | | | | | | | | | Conflicts: dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java | |||||
| | * | | Fixed some wording and spelling | Nino Breuer | 2014-09-17 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | [client] moved main function to App.java & refined Config stuff | Jonathan Bauer | 2014-09-18 | 3 | -43/+11![]() | |
| | |/ |/| | ||||||
| * | | [client] only set news if not null | Jonathan Bauer | 2014-09-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | [client] News class for getting news from the satellite | Jonathan Bauer | 2014-09-15 | 1 | -1/+16 | |
| |/ | ||||||
| * | Fix server.thrift file (make future-proof by using field ids), move ↵ | Simon Rettberg | 2014-09-13 | 1 | -1/+1 | |
| | | | | | generated thrift classes to own package | |||||
| * | [client] Add resource loader that will take care of error handling | Simon Rettberg | 2014-09-13 | 3 | -65/+63![]() | |
| | | ||||||
| * | [client] Reworked performLogin(): Better error handling, removed dead code, ↵ | Simon Rettberg | 2014-09-13 | 1 | -167/+119![]() | |
| | | | | | got rid of deep if-else nestings, removed unused variables | |||||
| * | replaced escaped umlauts by UTF-8 encoded chars | Jonathan Bauer | 2014-09-12 | 4 | -33/+33 | |
| | | ||||||
| * | [client] Show automatically generated version string | Simon Rettberg | 2014-09-12 | 1 | -1/+1 | |
| | | ||||||
| * | java style name for Config class ... | Jonathan Bauer | 2014-09-12 | 3 | -17/+17 | |
| | | ||||||
| * | reworked config file class, now a static class. | Jonathan Bauer | 2014-09-11 | 3 | -137/+58![]() | |
| | | | | | see code for an example... | |||||
| * | oops | Jonathan Bauer | 2014-09-11 | 5 | -0/+1652 | |

