diff options
| author | Michael Wilson | 2014-08-11 11:18:19 +0200 |
|---|---|---|
| committer | Michael Wilson | 2014-08-11 11:18:19 +0200 |
| commit | e4d336aa4cc2c5f2417d19fcde5cd12909c405f6 (patch) | |
| tree | 090e9df6e7d4a0dc8de97a28b34175678f7bfb55 /Dozentenmodulserver | |
| parent | nix (diff) | |
| parent | Benutzername speichern nun möglich (diff) | |
| download | tutor-module-e4d336aa4cc2c5f2417d19fcde5cd12909c405f6.tar.gz tutor-module-e4d336aa4cc2c5f2417d19fcde5cd12909c405f6.tar.xz tutor-module-e4d336aa4cc2c5f2417d19fcde5cd12909c405f6.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/gui/intro/Login_GUI.class
Diffstat (limited to 'Dozentenmodulserver')
| -rw-r--r-- | Dozentenmodulserver/bin/util/XMLCreator.class | bin | 7561 -> 7564 bytes | |||
| -rw-r--r-- | Dozentenmodulserver/src/server/ServerHandler.java | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class Binary files differindex 6d7673fb..04ba5197 100644 --- a/Dozentenmodulserver/bin/util/XMLCreator.class +++ b/Dozentenmodulserver/bin/util/XMLCreator.class diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 84022089..b70f9c74 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -392,7 +392,7 @@ public class ServerHandler implements Server.Iface { try { String path = Configuration.config.getAbsolute_path() - + "temp/" + + "prod/" + map.get("date") .substring(0, map.get("date").length() - 2) + "_" + hs + "_" + user + "_" + map.get("name") + ".xml"; |