summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Squashed commit of the following:Christian Klinger2016-07-1313-930/+1602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit af19d2aa593a4b4b068a5bc3707d74378625d774 Author: Christian Klinger <spam@klinch.de> Date: Wed Jul 13 12:32:17 2016 +0200 added sorting functionality. commit 0030ebebb49bad18fba8e74184d331be5485ed4e Author: Christian Klinger <spam@klinch.de> Date: Fri Jul 8 16:09:16 2016 +0200 small improvements. commit 8dc5ee1173ffbc6e689f3197ad4d1ecf700a9374 Author: Christian Klinger <spam@klinch.de> Date: Fri Jul 8 12:49:29 2016 +0200 added location fiter. commit 63a2da244a6def5cdd76c654bd5a6a0c108cc47b Author: Christian Klinger <spam@klinch.de> Date: Fri Jul 8 12:25:15 2016 +0200 most filters should work. commit 847536b34cec0194c58cb41a17006a8bd88f748d Author: Christian Klinger <spam@klinch.de> Date: Tue Jul 5 15:57:38 2016 +0200 rudimentary filter options.
* fixed bug.Christian Klinger2016-07-051-5/+14
|
* i18n for bootstrap_datepicker.Christian Klinger2016-07-0573-21/+1200
|
* Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into ↵Christian Klinger2016-07-0545-195/+338
|\ | | | | | | | | | | | | modularization Conflicts: modules-available/main/templates/main-menu.html
| * Update translationsSimon Rettberg2016-07-043-0/+12
| |
| * [statistics] Don't show uptime for offline clients; chart.js: highlight in boldSimon Rettberg2016-07-045-9/+12
| |
| * [news/summernote] Make button selection match capabilities of Qt/vmchooserSimon Rettberg2016-07-043-10/+9Star
| |
| * Rename js plugin modules to be prefixed with "js_"Simon Rettberg2016-07-047-4/+4
| |
| * Update docsSimon Rettberg2016-07-041-3/+12
| |
| * Update translationsSimon Rettberg2016-07-0413-20/+27
| |
| * [translation] Improve module list; move baseconfig hook to baseconfig_bwlpSimon Rettberg2016-07-045-8/+51
| |
| * delete update.inc.php: Not used anymoreSimon Rettberg2016-07-041-59/+0Star
| |
| * [main] Fix ul & li mismatch in main-menuSimon Rettberg2016-06-241-18/+18
| |
| * [news] Move over global news API, add support for type paramSimon Rettberg2016-06-241-1/+4
| |
| * [news] Fix install script (SQL syntax), add error messages/handlingSimon Rettberg2016-06-241-23/+26
| |
| * [locations] Support CIDR notion (start field), tweak templates a bitSimon Rettberg2016-06-245-41/+164
| |
* | minimal changesChristian Klinger2016-07-053-12/+16
|/
* modified the editor toolbar.Christian Klinger2016-06-241-3/+3
|
* added i18n for summernote.Christian Klinger2016-06-2436-17/+3551
|
* Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into ↵Christian Klinger2016-06-241-2/+2
|\ | | | | | | modularization
| * [locations] Quick "fix" for buttons overlapping text in tableSimon Rettberg2016-06-241-2/+2
| |
* | added summernote as an optional wysiwyg-editor.Christian Klinger2016-06-248-3/+35
|/
* Merge branch 'modularization' of dnbd3:openslx-ng/slx-admin into modularizationSimon Rettberg2016-06-2410-228/+375
|\
| * display locationid=0 as locationid=*Christian Klinger2016-06-241-1/+8
| |
| * Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into ↵Christian Klinger2016-06-244-23/+55
| |\ | | | | | | | | | modularization
| * | fixed i18n and updated l10nChristian Klinger2016-06-245-7/+16
| | |
| * | let's try this.Christian Klinger2016-06-241-1/+0Star
| | |
| * | also allow users to edit the help.Christian Klinger2016-06-244-220/+352
| | | | | | | | | | | | The code is still a little ugly.
* | | [exams] Indent location by tree depth; fix ordering of locations in vis.jsSimon Rettberg2016-06-244-11/+22
| |/ |/|
* | [exams] Move to content group; fix timepicker; mark old examsSimon Rettberg2016-06-244-23/+55
|/
* [exams] Apply formattingSimon Rettberg2016-06-241-274/+277
|
* [exams] Unify add/edit template; check date ranges; other small fixesSimon Rettberg2016-06-245-8/+31
|
* [exams] Unify add/edit templates, add error messages, limit zoom range some moreSimon Rettberg2016-06-2410-195/+167Star
|
* Fix indentationSimon Rettberg2016-06-231-1/+1
|
* Update translationsSimon Rettberg2016-06-236-9/+19
|
* [exams] Add baseconfig API hookSimon Rettberg2016-06-232-12/+27
|
* [exams] Fix vis.js when an exam is active in more than one location (id ↵Simon Rettberg2016-06-233-27/+35
| | | | collision), complete install hook (missing table), limit max. zoom level for vis.js
* [baseconfig] Take dependencies into account when handling API hooksSimon Rettberg2016-06-231-2/+10
|
* [module] Add getDependencies() to recursively get all deps of a moduleSimon Rettberg2016-06-231-0/+22
|
* [locations/sysconfig] Implement location specific sysconfigSimon Rettberg2016-06-2213-280/+589
|
* [location] Support passing array of selected locs to getLocations()Simon Rettberg2016-06-171-5/+6
|
* Added installation script.Christian Klinger2016-06-171-0/+18
|
* Added a localized version of momentjs.Christian Klinger2016-06-177-13/+110
|
* [render/modules] Include scripts/css in order according to dependenciesSimon Rettberg2016-06-172-7/+9
|
* Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into ↵Christian Klinger2016-06-176-920/+75Star
|\ | | | | | | modularization
| * [locations] Handle machine UUID param to determine locationSimon Rettberg2016-06-163-8/+66
| |
| * Don't need these anymoreSimon Rettberg2016-06-162-906/+0Star
| |
| * [Request] fix comments of isGet and isPost :)Simon Rettberg2016-06-161-6/+9
| |
* | "Edit" for exam periods, UTC timestamps.Christian Klinger2016-06-176-48/+208
| |
* | Added translation for messages.Christian Klinger2016-06-173-14/+34
|/