summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * [locationinfo] Fix room scalingSimon Rettberg2017-12-011-36/+16Star
| * [locationinfo] Month is 0-based in jsSimon Rettberg2017-12-011-1/+1
| * [runmode] Varname mismatchSimon Rettberg2017-12-011-1/+1
| * [runmode] Fix syntax error in SQL querySimon Rettberg2017-12-011-1/+23
| * [roomplanner] Set SLX_AUTOLOGIN for dedicated managersSimon Rettberg2017-11-301-1/+1
| * [roomplanner] Refactor to use runmodeSimon Rettberg2017-11-309-34/+226
| * Update translationsSteffen Ritter2017-11-3013-24/+33
| * [locationinfo] removed seconds from the time. More than 4 locations are allow...Jannik Schönartz2017-11-302-4/+7
| * [statistics] Reset session name on login to vmchooserSimon Rettberg2017-11-301-1/+1
| * [statistics] Update translationsSimon Rettberg2017-11-304-6/+12
| * [runmode] Overhauled getRunMode with its paramsSimon Rettberg2017-11-301-11/+39
| * [statistics] Handle runmode and its isclient flagSimon Rettberg2017-11-307-53/+140
| * [locationinfo] Added standby to the summary panelJannik Schönartz2017-11-302-12/+19
| * [locationinfo] Fix prettytime, fix standby, check dependency on weekcalendarSimon Rettberg2017-11-301-12/+14
| * [locationinfo] Merge branch 'master' of git.openslx.org:openslx-ng/slx-adminJannik Schönartz2017-11-3022-115/+198
| |\
| | * [sessions] english text in en templateJonathan Bauer2017-11-301-2/+2
| | * [locations] english text in en templateJonathan Bauer2017-11-301-2/+2
| | * english text for backend-hisinone en temlpateJonathan Bauer2017-11-301-3/+3
| | * [main] Detect clock mismatch, fix translationsSimon Rettberg2017-11-307-6/+31
| | * Update translationsSteffen Ritter2017-11-297-39/+139
| | * [news] install: Better index for tableSimon Rettberg2017-11-291-1/+3
| | * [inc/Paginate] Use Count(*) instead of SQL_CALC_FOUND_ROWS, which is fasterSimon Rettberg2017-11-292-58/+12Star
| | * [baseconfig_bwlp] Update translationsSimon Rettberg2017-11-292-4/+6
| * | [locationinfo] Reworked summary-panel to the new panel uuid stuff.Jannik Schönartz2017-11-307-88/+342
| |/
| * [inc/Database] Do EXPLAIN SELECT at shutdown so we don't interfere with SQL_C...Simon Rettberg2017-11-291-2/+15
| * [js] Move all our fixes into one file, add browser history/URL fix for messagesSimon Rettberg2017-11-294-26/+44
| * [runmode] Implement delete-machine actionSimon Rettberg2017-11-293-24/+30
| * [statistics] Introduce state column to get rid of complicated state determina...Simon Rettberg2017-11-2812-129/+226
| * [dnbd3] Disable SLX_SYSTEM_STANDBY_TIMEOUTSimon Rettberg2017-11-281-0/+1
| * [sysconfig] Don't delete default config...Simon Rettberg2017-11-281-1/+1
| * [sysconfig] Revert contraint to location table: Breaks default configSimon Rettberg2017-11-282-12/+6Star
| * [baseconfig] Add current unix timestamp to configSimon Rettberg2017-11-271-0/+2
| * [baseconfig_bwlp] Add SLX_WAKEUP_SCHEDULESimon Rettberg2017-11-271-0/+6
| * [sysconfig] Simplify installer, add constraint to location tableSimon Rettberg2017-11-241-17/+20
| * [runmode] Simplify installerSimon Rettberg2017-11-241-21/+3Star
| * Installer: Properly check preconditions for adding constraintsSimon Rettberg2017-11-241-3/+8
| * [statistics] Warn about suspicious hardware changes (RAM, CPU)Simon Rettberg2017-11-241-18/+42
| * [dnbd3] Add installer scriptSimon Rettberg2017-11-241-0/+41
| * Installer: Add more helper functions (constraints, response)Simon Rettberg2017-11-241-1/+57
| * [baseconfig_bwlp] Add new config varsSimon Rettberg2017-11-233-3/+42
| * [baseconfig] Fix shadow variable handling on unset varsSimon Rettberg2017-11-231-1/+1
| * [syslog] Fixed sql injection preventionJannik Schönartz2017-11-231-2/+1Star
| * [syslog] Added sql injection preventionJannik Schönartz2017-11-231-1/+3
| * [statistics] Filter 'state' was missing in the client statistics filterJannik Schönartz2017-11-231-1/+6
| * Merge branch 'master' of git.openslx.org:openslx-ng/slx-adminJannik Schönartz2017-11-231-1/+1
| |\
| * | [statistics&syslog] Changed ip to machine-uuid for filtering. Fixed a bug wh...Jannik Schönartz2017-11-204-13/+14
* | | Merge remote-tracking branch 'origin/permission-manager' into permission-managerUdo Walter2017-11-305-64/+73
|\ \ \
| * | | [statistics_reporting] reworked permission system from "click and you get err...Christian Hofmaier2017-11-303-31/+30Star
| * | | [news] reworked permission system from "click and you get error" to "button i...Christian Hofmaier2017-11-231-16/+24
| * | | Merge branch 'permission-manager' of git.openslx.org:openslx-ng/slx-admin int...Christian Hofmaier2017-11-232-7/+4Star
| |\ \ \