summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [server] Add Thread factory...Simon Rettberg2015-09-181-0/+24
|
* Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into1.1Jonathan Bauer2015-09-171-2/+15
|\
| * [client] TransferPanel germanizedStephan Schwaer2015-09-171-2/+15
| |
* | [client] async loginJonathan Bauer2015-09-171-23/+31
|/
* Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1Jonathan Bauer2015-09-175-6/+7
|\
| * [server] Rename variable (since I messed up in the sqldump)Simon Rettberg2015-09-173-5/+5
| |
| * Revert "[server] Fix SQL dump of DB"Simon Rettberg2015-09-171-1/+1
| | | | | | | | This reverts commit 7b9089a77a52fa7cd4874e309451a2a4598004a4.
| * [server] Fix SQL dump of DBSimon Rettberg2015-09-171-1/+1
| |
| * [client] Changed "Neu" Buttonlabel in ImageListW, fix userfeedback in ↵Stephan Schwaer2015-09-172-1/+2
| | | | | | | | ImageMetaDataPage.
* | [client] success message when the upload creation finishedJonathan Bauer2015-09-171-9/+25
|/
* [client] Disclaimer no longer editable.Stephan Schwaer2015-09-171-0/+1
|
* [client] minor: same order as the paramsJonathan Bauer2015-09-161-1/+1
|
* [client] OrgCache: try/catch sat org list fetching and optimize code a bitJonathan Bauer2015-09-161-5/+10
|
* Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1Jonathan Bauer2015-09-163-7/+12
|\
| * [client] set default permissions from sat, sort organizations in cache.Stephan Schwaer2015-09-163-7/+12
| |
* | [client] ImageUpdateWiz: if updating version metadata failed, inform userJonathan Bauer2015-09-163-3/+6
|/
* [client] forgotten TODOs that are long doneJonathan Bauer2015-09-162-4/+0Star
|
* [client] ImageCreationWizard: in performFinish, check if any step fails and ↵Jonathan Bauer2015-09-161-5/+18
| | | | stop in that case
* [client] done TODO: if SSL with masterserver is not available, ask him if he ↵Jonathan Bauer2015-09-161-7/+13
| | | | wants to connect w/o SSL and if he chooses yes, do so
* [client] SatList: fix NPE if user closes SatListWJonathan Bauer2015-09-162-11/+12
| | | | added nullcheck for generating radio button so that we can call it with null to force/fake a manual IP input field
* [client] SatListWindow: Fix formatingSimon Rettberg2015-09-162-8/+8
|
* [server] Refresh organization list of a user with an unknown organization ↵Simon Rettberg2015-09-164-3/+21
| | | | connects
* [client] Clean up satellite selection windowSimon Rettberg2015-09-163-76/+65Star
|
* [server] Support querying master->sat transfer statusSimon Rettberg2015-09-162-1/+5
|
* [server] Reduce DB caching time of user and org perms to 15 secsSimon Rettberg2015-09-161-2/+2
|
* [server] Adjust priority of file transfersSimon Rettberg2015-09-162-2/+24
|
* [server] Add missing index to imageversion tableSimon Rettberg2015-09-161-1/+2
|
* Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1Jonathan Bauer2015-09-154-113/+73Star
|\
| * [client] Erstversion Lizensierung DozModChristian Rößler2015-09-151-13/+8Star
| |
| * [client] Reworked the satellite selection window.Stephan Schwaer2015-09-153-100/+65Star
| |
* | [client] only use the first part of the given username if the organization ↵Jonathan Bauer2015-09-151-3/+3
|/ | | | exists
* [client] Fix shade goal removing required logging classesSimon Rettberg2015-09-151-5/+13
|
* Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1Jonathan Bauer2015-09-156-42/+96
|\
| * [client] Shift key for forcing satellite selection now works.Stephan Schwaer2015-09-154-41/+49
| |
| * [client] Put real update url in placeSimon Rettberg2015-09-151-1/+1
| |
| * [client] Changelog creation modeSimon Rettberg2015-09-152-0/+46
| |
* | [client] reworked german textJonathan Bauer2015-09-1525-50/+49Star
|/
* [client] Login: check if the user enters its org as part of the usernameJonathan Bauer2015-09-151-2/+32
| | | | | | if he did and its the same as the selected IDP, then just use the username (everything before '@') and that IDP to login if he did and the entered org exists and is different than the IDP, ask which we should use if he did and the entered org does not exists, do nothing, meaning the login will eventually fail
* [client] Added selection of satellite when more than one available. Shift ↵Stephan Schwaer2015-09-147-10/+278
| | | | key to force selection not working yet.
* [client] space between info text and checkboxesJonathan Bauer2015-09-141-1/+3
|
* [client] ImagePermissionWindowLayout: info text für default permissionsJonathan Bauer2015-09-141-7/+23
|
* [client] ImageMetadataPage: set description message when all checks for the ↵Jonathan Bauer2015-09-141-1/+3
| | | | page pass
* [client] ClientVersion: changelog support. The JSON must now have a ↵Jonathan Bauer2015-09-143-11/+27
| | | | 'changelog' element
* [client] Version: fix manifest pathJonathan Bauer2015-09-141-1/+2
|
* [server] Minor tweaks and fixesSimon Rettberg2015-09-136-10/+47
| | | | | | - Logging format - Catch unchecked exceptions in web server and return internal server error - fix: insert os-virt-mappings to db
* [server] Limit hashqueue length depending on max memSimon Rettberg2015-09-132-3/+28
|
* [client] Remove unneeded checksSimon Rettberg2015-09-111-6/+4Star
|
* [client] Image/Lectures: only push metadata/permissions if they were changedJonathan Bauer2015-09-1111-209/+275
|
* [client] return a bool for success in UpdatePermissions for ImagesJonathan Bauer2015-09-111-1/+3
|
* [client] PermissionTables: Edit -> BearbeitenJonathan Bauer2015-09-112-2/+2
|