summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src/main/java/sql/SQL.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-12-011-2/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 lectureMichael Wilson2014-11-281-2/+9
| |
* | • changed implementation of user authentication.Nino Breuer2014-11-281-12/+52
|/ | | | | | | | | | | • 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.
* • getAllOS is now ordered by nameMichael Wilson2014-11-241-1/+1
|
* • Only allow permission changes for users who are authorized to do soMichael Wilson2014-11-211-0/+52
|
* Fixed Bug: no new user possible --> query changedMichael Wilson2014-11-201-3/+4
|
* • authenticationNino Breuer2014-11-201-33/+3Star
|
* • removed commented regular statements which were used before prepared ↵Nino Breuer2014-11-201-435/+19Star
| | | | | | statements. • starting implementing the user authentication, this version is usable but without authentication
* • new package for thrift classesNino Breuer2014-11-201-0/+2
|
* • added dependency to serverNino Breuer2014-11-201-17/+55
| | | | • startet implementing user authentication
* fdhNino Breuer2014-11-191-6/+6
|
* • Verantwortlicher wird nun bei Veranstaltung in allen Tabellen korrekt ↵Michael Wilson2014-11-181-19/+4Star
| | | | angezeigt
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-11-181-65/+157
|\ | | | | | | | | | | Conflicts: dozentenmodulserver/src/main/java/server/ServerHandler.java dozentenmodulserver/src/main/java/sql/SQL.java
| * -Michael Wilson2014-11-181-1/+1
| |
| * • Ausgaben an sinnvollen gekürzt bzw. erweitertMichael Wilson2014-11-181-8/+7Star
| |
| * • Beim Bearbeiten eines Image oder einer Veranstaltung wurde bisher der ↵Michael Wilson2014-11-181-57/+151
| | | | | | | | aktuell eingeloggte Benutzer immer neu als Verantwortlicher eingetragen --> Der Verantwortliche ändert sich nun nicht mehr und wird korrekt angezeigt
* | • fixed bug, where there could only be one image and one lecture with the ↵Nino Breuer2014-11-181-18/+25
|/ | | | same name
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-11-171-21/+5Star
|\
| * • Images can now be updated without destroying everything...Michael Wilson2014-11-171-272/+987
| |\
| * | SQL: mehr ausgabenMichael Wilson2014-11-171-5/+6
| | | | | | | | | | | | FTPEditUploader: Pfade korrigiert
* | | • fixed bug where the os name was not set to the correct value while ↵Nino Breuer2014-11-171-0/+29
| |/ |/| | | | | editing an image
* | • changed regular statements to prepared statements to prevent sql injectionsNino Breuer2014-11-171-259/+991
|/
* -Michael Wilson2014-11-171-2/+3
|
* hNino Breuer2014-11-111-31/+69
|
* .Michael Wilson2014-11-031-1/+1
|
* fixed bug: all images now show ALL imagesNino Breuer2014-11-031-0/+37
|
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-11-031-27/+69
|\ | | | | | | | | | | | | Conflicts: dozentenmodulserver/src/main/java/sql/SQL.java • Note: manual merge
| * -image templates are now listed a such, independently of the logged in userMichael Wilson2014-10-311-10/+50
| | | | | | | | -Lectures can now be connected to image templates
| * Fixed all date formats to 24h format in complete programMichael Wilson2014-10-301-5/+5
| |
| * Fixed bug: returned wrong content for lecturesMichael Wilson2014-10-301-2/+2
| |
| * Fixed bug when filtering for imagesMichael Wilson2014-10-301-1/+1
| |
| * fixed bugNino Breuer2014-10-301-3/+3
| |
| * fMichael Wilson2014-10-301-0/+1
| |
| * Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleMichael Wilson2014-10-291-36/+43
| |\
| * | --Michael Wilson2014-10-291-8/+7Star
| | |
* | | vNino Breuer2014-11-031-1/+1
| |/ |/|
* | gNino Breuer2014-10-291-23/+27
| |
* | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-291-57/+99
|\|
| * Ausgaben etwas verkürztMichael Wilson2014-10-291-49/+83
| |
| * Radiobutton "Lecture is active" holt jetzt korrekte Werte aus ModelMichael Wilson2014-10-291-3/+3
| |
| * -Löschen der Berechtigungen bei gelöschtem Image/Versanstaltung implementiertMichael Wilson2014-10-291-7/+15
| | | | | | | | -Recht "LinkAllowed" wird jetzt korrekt gesetzt
* | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleNino Breuer2014-10-281-92/+248
|\| | | | | | | | | Conflicts: dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
| * Serverseitiges Read und Write von Rechten korrigiertMichael Wilson2014-10-281-0/+10
| |
| * Sämtliche Logik und Grafiken zur Vergabe und Verwaltung von Berechtigungen ↵Michael Wilson2014-10-271-62/+169
| | | | | | | | eingeführt. Kleinere Bugs sind bekannt, werden aktuell behoben
| * -Rechtevergabe für Veranstaltungen vorbereitetMichael Wilson2014-10-231-71/+110
| |
* | changed implementation of full text search in some classesNino Breuer2014-10-281-15/+18
|/
* Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-moduleMichael Wilson2014-10-211-12/+25
|\ | | | | | | | | Conflicts: dozentenmodulserver/src/main/java/sql/SQL.java
| * fixed bugNino Breuer2014-10-211-15/+2Star
| |
* | -Fehler behoben, Liste der Benutzer für Berechtigung nun korrektMichael Wilson2014-10-211-401/+491
|/ | | | -Backend vorbereitet für personenabhängige Liste der Veranstaltungen nach Rechten
* fixed some bugsNino Breuer2014-10-211-1/+1
|