| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | • [Client] fixed incorrect JOptionPane | Michael Wilson | 2014-12-10 | 1 | -1/+10 | |
| | | | | | | | | | • [Server] fixed bug: server used to delete modified images, even if no new file was uploaded | |||||
| * | | d | Nino Breuer | 2014-12-11 | 1 | -1/+2 | |
| |/ | ||||||
| * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-12-01 | 3 | -172/+1127 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java möp. großes geschrei, fehler bitte an mich. dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java dozentenmodulserver/src/main/java/server/ServerHandler.java dozentenmodulserver/src/main/java/server/generated/Server.java dozentenmodulserver/thrift/server.thrift | |||||
| | * | lecture permissions deleted after deleting lecture | Michael Wilson | 2014-11-28 | 1 | -2/+9 | |
| | | | ||||||
| | * | • Image update now removes old file and avoids zombies | Michael Wilson | 2014-11-26 | 2 | -364/+1152 | |
| | | | ||||||
| | * | • Deleting a lecture does not throw an "XML note found"-Exception any more ↵ | Michael Wilson | 2014-11-24 | 1 | -1/+4 | |
| | | | | | | | | | --> No XMLs left to delete :) | |||||
| * | | • changed implementation of user authentication. | Nino Breuer | 2014-11-28 | 3 | -4421/+8036 | |
| | | | | | | | | | | | | | | | | | | | | | | | • changed position of class file • fixed some little things (not necessary to mention) Important Notes: •organizationID in token returns "wrong" values, therefore university is still set by client. To be fixed someday. • userID is the value with which the user starts his log in. this value is not represented in the token! (as it is not(!) the email). To be implemented someday, as this value is represented in the masterserver. • Feature isn't well tested. | |||||
| * | | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-11-24 | 1 | -1/+1 | |
| |\| | ||||||
| | * | • getAllOS is now ordered by name | Michael Wilson | 2014-11-24 | 1 | -1/+1 | |
| | | | ||||||
| * | | • started changing the authentification | Nino Breuer | 2014-11-24 | 1 | -11/+28 | |
| |/ | ||||||
| * | • Only allow permission changes for users who are authorized to do so | Michael Wilson | 2014-11-21 | 3 | -0/+1970 | |
| | | ||||||
| * | Fixed Bug: no new user possible --> query changed | Michael Wilson | 2014-11-20 | 3 | -4/+6 | |
| | | ||||||
| * | • authentication | Nino Breuer | 2014-11-20 | 2 | -418/+594 | |
| | | ||||||
| * | • removed commented regular statements which were used before prepared ↵ | Nino Breuer | 2014-11-20 | 1 | -435/+19![]() | |
| | | | | | | | statements. • starting implementing the user authentication, this version is usable but without authentication | |||||
| * | • new package for thrift classes | Nino Breuer | 2014-11-20 | 4 | -3/+5 | |
| | | ||||||
| * | f | Nino Breuer | 2014-11-20 | 3 | -0/+132 | |
| | | ||||||
| * | • added dependency to server | Nino Breuer | 2014-11-20 | 3 | -17/+788 | |
| | | | | | • startet implementing user authentication | |||||
| * | fdh | Nino Breuer | 2014-11-19 | 1 | -6/+6 | |
| | | ||||||
| * | • fixed bug: wrong content of lists after de-selecting dropdown menu while ↵ | Nino Breuer | 2014-11-19 | 1 | -8/+5![]() | |
| | | | | | | | | | filtering for images/lectures • added single line selection restriction to lists • removed some unused imports | |||||
| * | • xml creation in server is not used anymore - removed | Nino Breuer | 2014-11-18 | 2 | -232/+8![]() | |
| | | ||||||
| * | • Verantwortlicher wird nun bei Veranstaltung in allen Tabellen korrekt ↵ | Michael Wilson | 2014-11-18 | 1 | -19/+4![]() | |
| | | | | | angezeigt | |||||
| * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-11-18 | 3 | -218/+1200 | |
| |\ | | | | | | | | | | | Conflicts: dozentenmodulserver/src/main/java/server/ServerHandler.java dozentenmodulserver/src/main/java/sql/SQL.java | |||||
| | * | - | Michael Wilson | 2014-11-18 | 1 | -1/+1 | |
| | | | ||||||
| | * | • Ausgaben an sinnvollen gekürzt bzw. erweitert | Michael Wilson | 2014-11-18 | 2 | -21/+19![]() | |
| | | | ||||||
| | * | • Beim Bearbeiten eines Image oder einer Veranstaltung wurde bisher der ↵ | Michael Wilson | 2014-11-18 | 3 | -197/+1178 | |
| | | | | | | | | | aktuell eingeloggte Benutzer immer neu als Verantwortlicher eingetragen --> Der Verantwortliche ändert sich nun nicht mehr und wird korrekt angezeigt | |||||
| | * | - | Michael Wilson | 2014-11-17 | 1 | -1/+1 | |
| | | | ||||||
| * | | • fixed bug, where there could only be one image and one lecture with the ↵ | Nino Breuer | 2014-11-18 | 3 | -68/+1018 | |
| |/ | | | | same name | |||||
| * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-11-17 | 1 | -21/+5![]() | |
| |\ | ||||||
| | * | • Images can now be updated without destroying everything... | Michael Wilson | 2014-11-17 | 1 | -272/+987 | |
| | |\ | ||||||
| | * | | SQL: mehr ausgaben | Michael Wilson | 2014-11-17 | 1 | -5/+6 | |
| | | | | | | | | | | | | | FTPEditUploader: Pfade korrigiert | |||||
| * | | | • fixed bug where the os name was not set to the correct value while ↵ | Nino Breuer | 2014-11-17 | 3 | -0/+874 | |
| | |/ |/| | | | | | editing an image | |||||
| * | | • changed regular statements to prepared statements to prevent sql injections | Nino Breuer | 2014-11-17 | 1 | -259/+991 | |
| |/ | ||||||
| * | - | Michael Wilson | 2014-11-17 | 1 | -2/+3 | |
| | | ||||||
| * | h | Nino Breuer | 2014-11-11 | 4 | -54/+1087 | |
| | | ||||||
| * | . | Michael Wilson | 2014-11-03 | 1 | -1/+1 | |
| | | ||||||
| * | fixed bug: all images now show ALL images | Nino Breuer | 2014-11-03 | 3 | -240/+1178 | |
| | | ||||||
| * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-11-03 | 3 | -268/+1098 | |
| |\ | | | | | | | | | | | | | Conflicts: dozentenmodulserver/src/main/java/sql/SQL.java • Note: manual merge | |||||
| | * | -image templates are now listed a such, independently of the logged in user | Michael Wilson | 2014-10-31 | 3 | -251/+1079 | |
| | | | | | | | | | -Lectures can now be connected to image templates | |||||
| | * | Fixed all date formats to 24h format in complete program | Michael Wilson | 2014-10-30 | 1 | -5/+5 | |
| | | | ||||||
| | * | Fixed bug: returned wrong content for lectures | Michael Wilson | 2014-10-30 | 1 | -2/+2 | |
| | | | ||||||
| | * | Fixed bug when filtering for images | Michael Wilson | 2014-10-30 | 1 | -1/+1 | |
| | | | ||||||
| | * | fixed bug | Nino Breuer | 2014-10-30 | 1 | -3/+3 | |
| | | | ||||||
| | * | f | Michael Wilson | 2014-10-30 | 1 | -0/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Michael Wilson | 2014-10-29 | 2 | -40/+147 | |
| | |\ | ||||||
| | * | | -- | Michael Wilson | 2014-10-29 | 1 | -8/+7![]() | |
| | | | | ||||||
| * | | | v | Nino Breuer | 2014-11-03 | 1 | -1/+1 | |
| | |/ |/| | ||||||
| * | | g | Nino Breuer | 2014-10-29 | 1 | -23/+27 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module | Nino Breuer | 2014-10-29 | 2 | -99/+138 | |
| |\| | ||||||
| | * | Ausgaben etwas verkürzt | Michael Wilson | 2014-10-29 | 2 | -87/+107 | |
| | | | ||||||
| | * | Radiobutton "Lecture is active" holt jetzt korrekte Werte aus Model | Michael Wilson | 2014-10-29 | 1 | -3/+3 | |
| | | | ||||||

