cris-technikum 635974fa22 Merge branch 'master' into feature/Anrechnungen_NEU ...

# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php

2021-07-07 15:05:31 +02:00

..

accounting

Merge branch 'hotfix-5697/DigitalerLehrauftrag_ErrorMessages'

2020-01-15 10:04:17 +01:00

CL

Merge branch 'master' into feature-7434/Messages_Neue_Felder_zu_eingeloggtem_User_ergaenzen

2020-11-25 14:52:22 +01:00

codex

codex/Bisverwendung_model: getVerwendungen ordered by beginn by default

2020-08-01 08:20:52 +02:00

content

- Changed filtersupdate to better divide filters for infocenter overview and freigegeben

2018-07-02 17:40:22 +02:00

crm

Merge branch 'master' into feature/Anrechnungen_NEU

2021-07-07 15:05:31 +02:00

education

Adapted & Enhanced Withdrawing of Approvement

2021-05-17 12:35:14 +02:00

extensions

- Removed file system execute permission for all files (no directories)

2017-11-13 10:45:49 +01:00

organisation

Merge branch 'master' into feature/Anrechnungen_NEU

2021-07-07 15:05:31 +02:00

person

Merged master into branch

2021-04-28 15:54:54 +02:00

project

Fixed Broken Unit Tests

2018-02-16 11:43:59 +01:00

ressource

Mitarbeiter_model getPersonal: possible to reduce result to eonly certain uids

2020-09-14 11:11:44 +02:00

system

Merge branch 'master' into feature-7434/Messages_Neue_Felder_zu_eingeloggtem_User_ergaenzen

2020-11-25 14:52:22 +01:00

testtool

- Fixed codeception test

2016-11-23 15:09:10 +01:00

index.html

- Removed file system execute permission for all files (no directories)

2017-11-13 10:45:49 +01:00