db14c86a77
Merge after last Commit
2018-02-28 14:39:33 +01:00
ef331e1580
AMPELSYSTEM: new GUI with Sancho; new logic
...
. new GUI with Sancho and collapsable panel
. new logic:
1. popup only for notifications that are:
---- mandatory
---- unconfirmed
---- not expired
---- not before vorlaufszeit
2. overall display for all notifications that are
---- not before vorlaufszeit
-> confirmed and/or expired notifications are displayed serperately and only readable
2018-02-28 10:47:45 +01:00
c830f125e3
Removed unused Images
2018-02-15 18:24:03 +01:00
629d8446f8
bootstrapped write message page, no error on showing first message in messageList
2018-02-07 09:59:02 +01:00
20455d264c
added message table, added tinymce editor to header and messageList
2018-02-05 15:00:54 +01:00
c7008c9ccd
added Bewerbung Zugang, bewerbung abgeschickt, collapsible menu, Statusgrund entering is compulsory, restyled (button/text positions, colors, zebra widget of tablesorter)
2018-01-30 16:52:43 +01:00
3b07cdca73
added filter widget to tablesorter in Zeitsperren, replaced christianbach with mottie tablesorter
2018-01-25 17:10:16 +01:00
73c4c6c722
Changed the color of the stripes for tables
2018-01-24 18:10:18 +01:00
fe8e5ed507
added mottie tablesorter, removed datatables and datepicker, restyled tablesorter for better bootstrap look, layout changes
2018-01-24 17:29:12 +01:00
f8cfab3c16
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-01-17 14:59:22 +01:00
979991fac0
small additions / modifications
2018-01-17 14:59:17 +01:00
0bc0a09bf4
- Removed file system execute permission for all files (no directories)
...
- application/extensions file system permission now is 775
- application/logs file system permission now is 775
- Added extensions directory in application/: config, controllers, helpers, hooks, libraries, models, views and widgets
- Added view views/extensions/manage.php
- Added controller controllers/system/extensions/Manager.php
- Added library ExtensionsLib to manage extensions
- Added model models/system/Extensions_model.php
- Moved code related to print out info from MigrationLib to EPrintfLib
2017-11-13 10:45:49 +01:00
da23548cf9
Logo wird jetzt über CSS angezeigt anstatt über default Ordner.
...
Custom Stylesheets müssen entsprechend erweitert werden um
div.header_logo, td.headerbar und div.cis_logo
2017-10-05 08:15:29 +02:00
5594c2dccf
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-15 12:51:57 +02:00
36412b8308
Wochenplan.class: Anzeige der LV-Bezeichnung
...
Wenn der typ==lva dann wird in der Titelleiste die Bezeichnung der LV
angezeigt
2017-09-15 12:51:43 +02:00
bcd84512f5
Second commit
2017-09-11 16:06:56 +02:00
e4160088e8
- Added headers where they were missing
...
- Added comments where needed
- Beautified the code where needed, more readable and more compliant to CS
- loadResource function in helper fhc_helper.php is not using anymore CI
- Moved all constants from UDFWidget to UDFLib
- Added constant SORT to UDFLib
- Renamed constant REGEX_LANGUAGE to FE_REGEX_LANGUAGE in UDFLib
- Better formatting and indentation of the code of WidgetLib (more compliant to CS)
- Added missing validation attributes to HTML widgets
- Added constant HTML_DEFAULT_VALUE to CheckboxWidget
- Unset parameter multiple in DropdownWidget constructor
- Changed value of constant REQUIRED in widget HTMLWidget
- Added protected property $htmlParameters to widget HTMLWidget
(it works as alias to $this->_args[HTMLWidget::HTML_ARG_NAME] -> better code)
- Replaced $this->_args[HTMLWidget::HTML_ARG_NAME] with $this->htmlParameters in the widgets
- Changed the CSS class label[udf-required=true]::after to label[required-field=true]::after in widgets.css
- Better use of constants in UDFWidget: constants from HTMLWidget are used only for the HTML parameters,
while constants from UDFLib are used only for UDF parameters
2017-08-17 11:51:40 +02:00
d7bed89869
- Added class label[udf-required=true]::after to skin/widgets.class
...
- Added attribute udf-required to tag label in the HTML components widges
2017-08-09 17:10:10 +02:00
bba27f75e0
Merge branch 'master' into udf
2017-07-28 18:41:35 +02:00
0ff635f5ea
- Added Zusatzfelder tab for UDF in FAS, students and employees
...
- UDF for person and prestudent only
- Added CSS for widgets
- Fixed checkbox
- Improved aesthetics of widgets
2017-07-28 17:25:27 +02:00
b538b82946
SD-Tools Link im Vilesci aus Core entfernt
2017-07-28 08:31:30 +02:00
6573d46525
Merge branch 'master' into udf
2017-07-21 15:08:50 +02:00
dab6515038
- Added widgets.css
...
- Better widgets HTML format
- Changed required attribute to udf-required
2017-07-21 15:02:04 +02:00
3ccac21136
Removed Debug Colors
2017-07-03 10:22:09 +02:00
27203cb334
Im FAS werden die Aufnahmetermine farblich markiert die zur Berechnung
...
der Gesamtpunkte herangezogen werden.
2017-06-28 19:07:25 +02:00
d9db422d40
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-03-03 11:33:18 +01:00
8a26b44e23
Testtool Redesign
2017-03-03 11:33:02 +01:00
0048d458b1
Fehlerhafte HTTP Header korrigiert damit FAS mit Apache 2.4.10-10+deb8u8 funktioniert
2017-03-01 16:15:49 +01:00
64d02b62b5
Merge branch 'master' into ci
2017-02-07 14:35:09 +01:00
5bc0d72341
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-02-07 11:46:06 +01:00
4f42c7ec12
Umbau Testtool auf .ogg Audiofiles
2017-02-07 10:10:01 +01:00
81bcda2e40
Merge branch 'master' into ci
2017-02-02 15:20:15 +01:00
e7635e2608
logo sfu jpg
2017-01-28 03:10:13 +01:00
74fe782908
logo sfu
2017-01-28 03:05:25 +01:00
b8177b58e8
Merge branch 'master' into ci
...
Conflicts:
composer.json
composer.lock
phpci.yml
system/checksystem.php
system/dbupdate_3.2.php
tests/codeception/_data/dump.sql
tests/codeception/tests/acceptance/CISLoginPage.php
2017-01-20 11:05:08 +01:00
19bda38727
removed unused spaces
2016-12-12 11:13:44 +01:00
3b3721f3f0
reporting vector graphics:
...
- path to letter
2016-12-12 10:15:44 +01:00
53dc0f5771
new reporting icons
2016-11-23 13:46:43 +01:00
68a696cdc8
Merge branch 'master' into ci
...
Conflicts:
cis/testtool/admin/add_gebiet.php
cis/testtool/admin/edit_gebiet.php
cis/testtool/admin/index.php
config/global.config-default.inc.php
content/student/studentDBDML.php
content/student/studentdetailoverlay.xul.php
include/ablauf.class.php
include/frage.class.php
include/organisationseinheit.class.php
include/studiengang.class.php
include/vorschlag.class.php
phpci.yml
rdf/student.rdf.php
system/dbupdate_3.2.php
tests/codeception/_support/AcceptanceTester.php
tests/codeception/_support/BasisKlasseTest.php
tests/codeception/_support/FunctionalTester.php
tests/codeception/_support/UnitTester.php
tests/codeception/_support/_generated/AcceptanceTesterActions.php
tests/codeception/acceptance/AcceptanceTester.php
tests/codeception/acceptance/CISLoginPageCept.php
tests/codeception/acceptance/_bootstrap.php
tests/codeception/codeception.dist.yml
tests/codeception/functional/FunctionalTester.php
tests/codeception/functional/_bootstrap.php
tests/codeception/tests/acceptance.suite.dist.yml
tests/codeception/tests/acceptance/CISLoginPage.php
tests/codeception/tests/acceptance/CISLoginPageCept.php
tests/codeception/tests/api/_bootstrap.php
tests/codeception/tests/functional/FunctionalTester.php
tests/codeception/tests/functional/_bootstrap.php
tests/codeception/tests/unit/BasisKlasseTest.php
tests/codeception/tests/unit/UnitTester.php
tests/codeception/unit/BasisKlasseTest.php
tests/codeception/unit/UnitTester.php
2016-11-22 13:58:29 +01:00
18ff20cd58
Inaktive MitarbeiterInnen werden ausgegraut
...
- Im Tabreiter "Mitarbeiter" (Hauptfenster) und "Lehrende" (Quellmenü)
- Default-Stundensatz wird neben Stundensatzeingabe angezeigt
2016-10-28 14:51:43 +02:00
40a2b53858
Merge master into HEAD
...
Conflicts:
include/dokument_export.class.php
include/studiengang.class.php
vilesci/stammdaten/reihungstestverwaltung.php
2016-08-18 16:23:11 +02:00
591013e09a
Icons Reihungstestverwaltung, DB update
...
Spalte "arbeitsplaetze" in tbl_ort
2016-07-28 11:39:48 +02:00
d899ccad08
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2016-05-23 12:25:14 +02:00
2dada5200c
Merge branch 'master' into ci
...
Conflicts:
.gitignore
composer.json
include/prestudent.class.php
include/securimage/securimage.php
include/studienplan.class.php
system/dbupdate_3.2.php
tests/codesniffer/FHComplete/Sniffs/Commenting/DocBlockAlignmentSniff.php
tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentSniff.php
tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentTypeSniff.php
tests/codesniffer/FHComplete/Sniffs/ControlStructures/ControlSignatureSniff.php
tests/codesniffer/FHComplete/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
tests/codesniffer/FHComplete/Sniffs/ControlStructures/WhileStructuresSniff.php
tests/codesniffer/FHComplete/Sniffs/Formatting/OneClassPerUseSniff.php
tests/codesniffer/FHComplete/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
tests/codesniffer/FHComplete/Sniffs/Functions/ClosureDeclarationSniff.php
tests/codesniffer/FHComplete/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/CamelCapsMethodNameSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassBracketsSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidTraitNameSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidVariableNameSniff.php
tests/codesniffer/FHComplete/Sniffs/PHP/DisallowShortOpenTagSniff.php
tests/codesniffer/FHComplete/Sniffs/PHP/TypeCastingSniff.php
tests/codesniffer/FHComplete/Sniffs/Strings/ConcatenationSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/CommaSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/OperatorSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ScopeIndentSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/TabAndSpaceSniff.php
tests/codesniffer/FHComplete/ruleset.xml
tests/codesniffer/FHComplete/tests/FHCompletePHPStandardTest.php
tests/codesniffer/FHComplete/tests/TestHelper.php
tests/codesniffer/FHComplete/tests/bootstrap.php
tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
tests/codesniffer/FHComplete/tests/files/bad_trait_name.php
tests/codesniffer/FHComplete/tests/files/class_brackets_fail1.php
tests/codesniffer/FHComplete/tests/files/class_brackets_fail2.php
tests/codesniffer/FHComplete/tests/files/class_brackets_fail3.php
tests/codesniffer/FHComplete/tests/files/class_underscore_prefix_pass.php
tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
tests/codesniffer/FHComplete/tests/files/control_structure_nobrackets.php
tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
tests/codesniffer/FHComplete/tests/files/control_structure_while.php
tests/codesniffer/FHComplete/tests/files/control_structures_no_newline.php
tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
tests/codesniffer/FHComplete/tests/files/double_space.php
tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_fail.php
tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_pass.php
tests/codesniffer/FHComplete/tests/files/function_comment_type_fail.php
tests/codesniffer/FHComplete/tests/files/function_comment_type_pass.php
tests/codesniffer/FHComplete/tests/files/function_spacing.php
tests/codesniffer/FHComplete/tests/files/mixing_indent.php
tests/codesniffer/FHComplete/tests/files/multiple_use.php
tests/codesniffer/FHComplete/tests/files/multiple_use_pass.php
tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
tests/codesniffer/FHComplete/tests/files/short_open_tags_fail.php
tests/codesniffer/FHComplete/tests/files/short_open_tags_pass.php
tests/codesniffer/FHComplete/tests/files/space_tab.php
tests/codesniffer/FHComplete/tests/files/tab_space.php
tests/codesniffer/FHComplete/tests/files/traits_no_order.php
tests/codesniffer/FHComplete/tests/files/traits_pass.php
tests/codesniffer/FHComplete/tests/files/type_casting_fail.php
tests/codesniffer/FHComplete/tests/files/type_casting_pass.php
tests/codesniffer/FHComplete/tests/files/use_class_and_closure_pass.php
tests/codesniffer/FHComplete/tests/files/use_closure_pass.php
tests/codesniffer/FHComplete/tests/files/use_no_order.php
tests/codesniffer/FHComplete/tests/files/use_ok_pass.php
tests/codesniffer/FHComplete/tests/files/use_with_commas.php
tests/codesniffer/FHComplete/tests/files/variable_name_pass.php
tests/codesniffer/FHComplete/tests/files/whitespace_comma.php
tests/codesniffer/FHComplete/tests/files/whitespace_comma_before.php
tests/codesniffer/FHComplete/tests/files/whitespace_comma_pass.php
tests/codesniffer/FHComplete/tests/ruleset.xml
2016-04-28 18:14:40 +02:00
bc427f7d2b
fixed config bugs in rest client
2016-04-05 11:35:06 +02:00
c4320ae53d
Neue Icons hinzugefügt
2016-03-16 19:19:24 +01:00
64f10154af
semester assignment for study plan
2016-03-10 10:45:59 +01:00
b23ed8466f
Logo Anzeigefehler bei LVInformationen behoben
...
Tippfehler in Phrase behoben
FHTW spezifische Phrase entfernt
Warning bei LVInformationen entfernt wenn diese global aufgerufen werden
2016-02-18 15:30:54 +01:00
606949513c
- LVPlan kann als Excel exportiert werden
...
- Stunden werden im Export (ICal, Caldav, etc) nicht mehr zu 4er Blöcken geblockt sondern auf die gesammte Länge
2016-02-15 10:19:20 +01:00
321cffb8fa
Neue TW-Logos, Text "LV-Infos gesperrt"
2016-02-02 11:14:31 +01:00
cris-technikum