summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [dozmod] reworked permission system from "click and you get error" to "button...Christian Hofmaier2017-12-0711-37/+39
* [sysconfig] Overview: Make mouseover highlighting work in the other direction...Simon Rettberg2017-12-023-21/+74
* [syslog, statistics] Pretty print time, shorten CPU model in listSimon Rettberg2017-12-013-24/+9Star
* [inc/Util] Add helper to pretty-print timestampSimon Rettberg2017-12-011-0/+24
* Merge branch 'master' into permission-managerSimon Rettberg2017-12-015-9/+14
|\
| * Fix several PHP notices about undefined indexes, variables, not-arraysSimon Rettberg2017-12-015-9/+14
* | [location] WTF?Simon Rettberg2017-12-011-2/+1Star
* | <install.php> add another button at the topSimon Rettberg2017-12-012-3/+6
* | [inc/User] Fix getAllowedLocations for legacy permission managerSimon Rettberg2017-12-011-0/+2
* | [locations] Move overlap warnings to topSimon Rettberg2017-12-011-10/+13
* | [backup] Add label refs, fix layout of last download time hintSimon Rettberg2017-12-011-7/+7
* | [style] Fix checkbox/radio in input-group-addon, add missing label<->input refsSimon Rettberg2017-12-016-24/+48
* | [style.css] Try to reduce copy&pasteSimon Rettberg2017-12-011-73/+27Star
* | [inc/User] Fix permission compat to old systemSimon Rettberg2017-12-011-1/+3
* | Merge branch 'master' into permission-managerSimon Rettberg2017-12-0180-640/+1653
|\|
| * [roomplanner] Sort already placed machines to the bottomSimon Rettberg2017-12-013-17/+36
| * [roomplanner] Fallback to ip if hostname is emptySimon Rettberg2017-12-011-0/+6
| * [runmode] Fix client filter logicSimon Rettberg2017-12-012-4/+4
| * [statistics, roomplanner, locationinfo] Ignore machines with runmode:isclient==0Simon Rettberg2017-12-014-7/+28
| * [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