Build: #152 was successful Changes by Daniel Gruber

Stages & jobs

  1. Build Application

  2. Tests

  3. Build Distro

  4. Create Docs

    Requires a user to start manually

Build result summary

Details

Completed
Duration
44 seconds
Labels
None
Revision
1a5d679e974d45c936be129f89aa3b9a5110a0b1 1a5d679e974d45c936be129f89aa3b9a5110a0b1
Total tests
640

Tests

  • 0 New failures
  • 0 Existing failures
  • 0 Fixed

Code commits

Author Commit Message Commit date
Daniel Gruber Daniel Gruber 1a5d679e974d45c936be129f89aa3b9a5110a0b1 1a5d679e974d45c936be129f89aa3b9a5110a0b1 Merge pull request #31 in GOMA/goma from develop-framework-upgrade to develop
* commit '1b8209e776658bbb84eb413a3553420a76f4335c':
  Squashed 'system/' changes from fd40904..f27e136
  Squashed 'system/' changes from b36e019..fd40904
  - cms upgrade
Daniel Gruber Daniel Gruber 93ddcd0b13e22050dd4c12f5e5be1ab80b914cf7 m 93ddcd0b13e22050dd4c12f5e5be1ab80b914cf7 Squashed 'system/' changes from fd40904..f27e136
f27e136 - fix cms creation
e17568c - fix possibility to create gfs

git-subtree-dir: system
git-subtree-split: f27e13666c49e90373958d7f4592d22c3a22ce40
Daniel Gruber Daniel Gruber 1b8209e776658bbb84eb413a3553420a76f4335c 1b8209e776658bbb84eb413a3553420a76f4335c Merge commit '93ddcd0b13e22050dd4c12f5e5be1ab80b914cf7' into develop-framework-upgrade
Daniel Gruber Daniel Gruber 7c1986ca4cb9bf805e15147ac547b54a60005ff3 7c1986ca4cb9bf805e15147ac547b54a60005ff3 Merge commit 'd30a99a5d915f826072a7816e50b5d9d2b56ab55' into develop-framework-upgrade
# Conflicts:
#        system/installer/application/control/installController.php
Daniel Gruber Daniel Gruber d30a99a5d915f826072a7816e50b5d9d2b56ab55 m d30a99a5d915f826072a7816e50b5d9d2b56ab55 Squashed 'system/' changes from b36e019..fd40904
fd40904 - correct name for BoolSQLField
64c50e1 - extend disallowed words
6cacf44 Merge commit '0eb1e48711afd6dbd2b093973dd3bf7d92a5ff73' into develop-framework-upgrade
1867749 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-framework-upgrade
c108c51 - fix taskbooks - fix SOREDI-1127 - fix SOREDI-1126
af73d01 Merge branch 'develop-framework-upgrade' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-1117-memory-issue-in-update-script-generation
6d19ba9 - framework
a65ce2a Merge commit 'f8ff85caedf0b7e617ea3f76c656587b76dce183' into develop-framework-upgrade
54046f7 Merge commit 'f56dcc4d4a344e34de625afb96ac16a2e8d22878' into develop-framework-upgrade
9e0b2d4 - fix id generation
1c110ef - framework fixes
be13baa - framework fixes
c69e2fd - renderif
6979f5f - update iterators
2eabe4f - merges from gomav3
d80b9a5 - merges from gomav3
b9aed04 Merge pull request #782 in SOREDIWEB/soredi-webservice from feature/SOREDI-1113-upgrade-framework to develop-framework-upgrade
50be6a1 Merge commit 'e6bc14e0dccd0ba66fc95eb429f18010d736983e' into feature/SOREDI-1113-upgrade-framework
f8195f5 Merge commit 'e6bc14e0dccd0ba66fc95eb429f18010d736983e' into feature/SOREDI-1113-upgrade-framework
e6bc14e Squashed 'system/' changes from 2996634..46fbb63
bc36549 - naming
0aa0288 - fix notice - fix tests
9ee3b63 - fix notice - fix tests
a5bc226 - fix memory lack
90fd093 - fix memory lack
46fbb63 - include children
f26ffa4 - add char and float as fields - add test for casting DBFields - fix notice for ServiceDataImporter
1cb87b5 - add char and float as fields - add test for casting DBFields - fix notice for ServiceDataImporter
23c12ae - enum support
2f8db87 - enum support
1a5c534 - strpos casting + chr fixes (PHP 7.3)
c1cc2b8 - strpos casting + chr fixes (PHP 7.3)
5e4f1e1 - tryfix tests which fail
ad3e1dc - tryfix tests which fail
260f3a7 - remove permission checks
acd2714 - fix notice in Permission class
74c8db7 - fix notice in Permission class
d10dc3c - early failure seems to work
4ec8da9 - early failure seems to work
94e3637 test
dfeda53 test
4de7465 Squashed 'system/' changes from 1fc3b34..2996634
8c51b56 Merge commit '4de74651fc7afb9da13b7892f3b4d9303c95dcb7' into feature/SOREDI-1113-upgrade-framework
0deb191 Merge commit '4de74651fc7afb9da13b7892f3b4d9303c95dcb7' into feature/SOREDI-1113-upgrade-framework
92090f9 - test why it does not fail
4e14b9e - test why it does not fail
102eedf Merge pull request #777 in SOREDIWEB/soredi-webservice from update/SOREDI-1087-updatescript-fur-tablerenaming to develop
4e3a045 Merge branch 'update/SOREDI-1087-updatescript-fur-tablerenaming' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into update/SOREDI-1087-updatescript-fur-tablerenaming
8afc37b - moved update script from core to soredi system
75a1337 - moved update script from core to soredi system
c13af95 Merge pull request #775 in SOREDIWEB/soredi-webservice from master to develop
ff0ec01 Merge pull request #773 in SOREDIWEB/soredi-webservice from update/SOREDI-1087-updatescript-fur-tablerenaming to master
0e55cda Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into update/SOREDI-1087-updatescript-fur-tablerenaming
a3e57db Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into update/SOREDI-1087-updatescript-fur-tablerenaming
790a05d Merge pull request #767 in SOREDIWEB/soredi-webservice from develop to master
d566ce3 Merge pull request #774 in SOREDIWEB/soredi-webservice from feature/SOREDI-1106-sort-device-configurations-by-productnr to develop
dd205f3 - changed sorting
f3fdc6f Merge pull request #768 in SOREDIWEB/soredi-webservice from feature/SOREDI-1076-implementieren-verpackungsaufkleber to develop
c3f1bf1 - fixed unique verification for edit
962d5e6 - fixed german translation - implemented unique check for partnr
8850bba - fixed sumit form method name - implemented support for lengths 8 to 11 (incl)
2996634 - fixes for required fields
4cb0d2b - remove problematic test - fix problem in content.php
6164096 - add tests
743f7ec - required fields
185017d Merge commit 'b73188db476aab84e0aa7af167ae543c8e7d0cee' into bugfix/GOMA-224-tablefield-cansortby
729aea0 - implement exception for SortArgument - catch exception in TableField
32c241b - renamed submit_form method - translated error messages - removed testing methods
be04078 - renamed functions
0f06911 - removed test function
9204c67 - small cr fixes
faf80b2 - strpos fixes
b767653 - fix tableField each()
dd6314d Merge commit '7ac153f3fc8c28e9cc38247fe06bc61936fd4c47' into feature/MBG-237-framework-upgrade
a5d60e3 - updated to db_prefix
b04f815 - updated to db_prefix
160e7fc - implemented Query Generation Script
65fa64b - implemented Query Generation Script
5bc0e1b - fix change management
9e8b812 - fix permission
6591ee3 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-1076-implementieren-verpackungsaufkleber
86d5aed Merge branch 'develop' of https://repo.goma-cms.org/scm/mbg/mbg-website into bugfix/MBG-148-new-tree-hierarchy
33c54e4 - cachemanager fix
c51cd09 Better CacheManager
9690125 - better cache manager vorOrt.news
dd45073 - fix problems with serialising - fix stateData
f72211a - fix tests + remove positions
e0cf51d - change iterators
fef606f - correct fetch mode setting
cbc1af5 - fix DateTest (too less cache clearance)
4ddbec3 - sleep + wakeup
d0d347e Merge pull request #300 in MBG/mbg-website from bugfix/elternsprechtag-gleichzeitige-reservierung to develop
8dba1f0 Merge pull request #772 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1059-doppelt-saving-and-edit-handleform to develop
3b72f71 - fixes for cache management
0d3b65b - prohibit reservations at the same time
de8633e - memory exhausted exception problem
3ee8966 - fix form handler without permissions
aa1c943 - fix form handler without permissions
1a6c87c Merge pull request #770 in SOREDIWEB/soredi-webservice from master to develop
1bf0c83 - improved docu
c184be1 Merge pull request #771 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1105-wlan-wird-in-templates-und-netzteil-nicht-in-gerate-richtig-angezeigt to master
a15b986 - removed verification on device creation from template $field "true", not necessary right now, will change on component update - corrected rhino status on info functions in templates to true - added all options to device form, else the devices won't be displayed correctly
bd25805 Merge pull request #769 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1098-sh-tb-fehler-netzteil-nicht-ausgewahlt to master
21ce162 - removed power from validation
49dd044 - moved files
88e9836 - implemented search_fields
803d813 - corrected standard val for input to string
0baaeb4 - implemented abstract pdf printing system for shipping labels - changed printing system for device shipping labels - implemented accessory and spare part management system - implemented print by count system for accessories and spare parts
2c749cd - fix problems categoryView - add Google Cloud
72af2b7 Merge pull request #748 in SOREDIWEB/soredi-webservice from develop-disguise to develop
a0f4d9e - remove unneeded acitons
dfef295 - improved disguise - removed ajax call to set disguise
c301778 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-disguise
f85e97e Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-disguise
a106de4 Merge pull request #765 in SOREDIWEB/soredi-webservice from feature/SOREDI-1074-110-230-180-w to develop
e06a2de Merge pull request #766 in SOREDIWEB/soredi-webservice from feature/SOREDI-1074-110-230-180-w to master
7beac82 Add 180W VAC
f3b057b - post flight always
e76eaa5 - correct distinction
3c9fbb0 - versions controller - file name problems - ...
f609291 - fixes + tests
175829a - simulate writing
5fb7e0d - sorting of hierarchies - fix problems with setting parent manually
d8558da - table names
f96278b - rename PermissionTest -> PermissionCheckerTest (as class defined) - Fix issues with State
a6a4361 - hierarchy versioning
284af5d - Hierarchy
7eb8054 - register methods
40f5186 - better exc handling
cafa193 - query definitions
c20670a - getAllChildVersionIds
6dbabc9 - manipulations and checks
e1af864 - fix query for generation
45d2d8f - implement draft of update
8bc9206 Merge pull request #762 in SOREDIWEB/soredi-webservice from feature/SOREDI-1038-button-um-template-von-gerat-zu-losen to develop
a3e4c83 - added phpdoc
bd69c20 - implement grouped query update - add hierarchy implementation (missing updating hierarchy downwards)
cd36279 Merge branch 'develop' of https://repo.goma-cms.org/scm/mbg/mbg-website into bugfix/MBG-148-new-tree-hierarchy
a819dc2 Merge pull request #297 in MBG/mbg-website from bugfix/MBG-222-bugfix-bubbles-bugfix-finanzstatistik-htmltext-in-table to master
29bd161 - mb4 not supported yet
81b3936 - utf8mb4
7a7876d - correct colation
ec1a18a - newsletter registrierung und senden bei Fehlern
4cd1967 Merge branch 'develop' of https://repo.goma-cms.org/scm/mbg/mbg-website into bugfix/MBG-148-new-tree-hierarchy
2614a70 Merge branch 'develop' of https://repo.goma-cms.org/scm/mbg/mbg-website into bugfix/MBG-222-bugfix-bubbles-bugfix-finanzstatistik-htmltext-in-table
9497286 - reformat + fix for casting from model
46ee6c1 Merge commit '4f4da52d3cd96ea677b01565b7a2709e5ca07ed8' into feature/MBG-227-upgrade-framework-for-datacolumns-fix
86cf386 - refix tablefield casting
d356ac7 - hierarchy
c3ae96a Merge pull request #763 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1062-manymany-keine-auswahl-nicht-moglich-bei-partner-endkunden to develop
c621013 Merge pull request #764 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1062-manymany-keine-auswahl-nicht-moglich-bei-partner-endkunden to master
8099508 - fix extendedDropdown Multiselect
35f25eb - fix extendedDropdown Multiselect
3630871 - implemented reset of templateid for superadmin
1f540bd - added docu
2609e50 Merge pull request #761 in SOREDIWEB/soredi-webservice from feature/SOREDI-1056-feature-konfigurator-wahrend-verkleidung-nur-eigene-konfigurationen to develop-disguise
560f8d1 - added additional statement
b9937f3 Merge pull request #760 in SOREDIWEB/soredi-webservice from feature/SOREDI-1055-button-um-verkleidung-auszuschalten to develop-disguise
8829d48 - implemented reset button for disguise
1296194 Merge pull request #759 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1054-disguise-als-normaler-nutzer-auch-sichtbar-und-einschrankung to develop-disguise
80b945b - wrong permission settings on disguise fixed
441710a Merge branch 'develop-disguise' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-1054-disguise-als-normaler-nutzer-auch-sichtbar-und-einschrankung
b979ab0 Merge pull request #751 in SOREDIWEB/soredi-webservice from develop to master
c8556ef Merge pull request #758 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1051-ticket-erstellen-in-navigationsbar-soll-immer-auf-webservice to develop
ef67f89 - fixed url
78b755d - add lastRule as debug option for Request - add $ids
f05ca18 Merge branch 'develop-framework-upgrade' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-disguise
5973d2f Merge branch 'develop-framework-upgrade' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-disguise
5d33a45 - css problem in merge
a67bf9a - css problem in merge
e540ac4 Squashed 'system/' changes from 3d7bde8..1fc3b34
df02aa8 Merge commit 'e540ac4786d6d756a586245099e7faca712dac70' into develop-framework-upgrade
7505bbf Merge commit 'e540ac4786d6d756a586245099e7faca712dac70' into develop-framework-upgrade
5d936a2 Squashed 'system/' changes from d290672..3d7bde8
9c8410c Merge commit '5d936a220348000833fa7437ad5d86a6f08897b6' into develop-framework-upgrade
3889bd3 Merge commit '5d936a220348000833fa7437ad5d86a6f08897b6' into develop-framework-upgrade
1fc3b34 - fix tests
7ef3fb3 - ClusterFormField PostName
f48b256 - js fix
6f8fab5 - fix JS issues with form.js - fix password form
31d63d4 - session fixes
5cb6ef4 - toggleLock test
b366322 - fix toggleLock
921a151 - service cloning
0784d3b Merge commit '603132fe5c75e2e58e42c67de55b61c5470fea44' into develop
2cf9ef1 Merge commit '5820393fc22808adafe426778e4fb43d52e80464' into develop
c194e55 Merge pull request #277 in MBG/mbg-website from develop-reservation to develop
65c0110 - fixed merge conflict
99227ca Revert "- removed doubled declaration"
0661874 - removed doubled declaration
87bcf60 Merge branch 'develop' of https://repo.goma-cms.org/scm/mbg/mbg-website into develop-reservation
7c6678d Merge branch 'develop' of https://repo.goma-cms.org/scm/mbg/mbg-website into develop-reservation
ba7da0c Merge pull request #276 in MBG/mbg-website from bugfix/MBG-217-kann-reservierung-ohne-mail-erstellen-aber-nicht-bearbeiten to develop-reservation
aed1748 - updated
3e89bb7 Merge pull request #275 in MBG/mbg-website from bugfix/MBG-218-bei-verkauf-ist-das-design-verschoben to develop-reservation
2bfa493 - fixed design
a30a0a4 Merge pull request #274 in MBG/mbg-website from bugfix/MBG-214-overflow-bei-verwaltung to develop-reservation
6d99043 - fix overflow
3094dc8 Merge pull request #273 in MBG/mbg-website from bugfix/MBG-216-platze-werden-bei-aktualisierung-der-reservierung-nicht-mehr-aktualisiert to develop-reservation
14ebd27 - removed comment - updated docs - fixed bug
e374ec6 Merge pull request #272 in MBG/mbg-website from bugfix/MBG-214-overflow-bei-verwaltung to develop-reservation
2eb9c9b - fixed overflow
2b25f5b Merge pull request #271 in MBG/mbg-website from bugfix/MBG-215-anzeige-entries to develop-reservation
19c58ac - fixed entry view
3d7bde8 - fix build
e46748c Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-framework-upgrade
2956bd8 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-framework-upgrade
2837da5 - fix infinite scroll
913daed - fix infinite scroll
dd42e3c - ExtendedDD Styling
82965c1 - ExtendedDD Styling
5f3a3e5 - merge form part of develop-software
3a0fbf8 - merge form part of develop-software
c46b0d2 - fix extended dd form
25fa9ee - fix extended dd form
1fa025b - fixed fallback function
a95a484 - documented disguise functions - documented login count functions
256a461 - moved data source in own folder - documented data source - improved get data
49972a2 Merge pull request #749 in SOREDIWEB/soredi-webservice from master to develop
4d73793 Merge pull request #750 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1030-topbar-scheint-immer-noch-runter-zu-schieben to master
e5575f6 - fixed print css
943739d Merge pull request #747 in SOREDIWEB/soredi-webservice from feature/SOREDI-1016-simulation-implementieren to develop-disguise
7363562 - fixed extended dd form
036ae2b - fixed extended dd form
1bfae36 Merge branch 'develop-framework-upgrade' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-1016-simulation-implementieren
b566d70 Merge branch 'develop-framework-upgrade' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-1016-simulation-implementieren
d4de14a - undo form.js
7beeb16 - undo form.js
ddacfc3 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-1016-simulation-implementieren
899689f - implemented simulation for service cases
b06489a - implemented simulation on device
edec891 - improved disguise data so short names will be found better
e01f756 - fixed backup function
9ab1eb0 - backup funciton in case js fails
4699ad8 Merge pull request #746 in SOREDIWEB/soredi-webservice from feature/SOREDI-1015-ui-button-in-navbar-wie-verlauf to develop-disguise
2881c3d - better implementation of the menu button - fixed disguise functions - removed Member Extension
a6493ed - better implementation of the menu button - fixed disguise functions - removed Member Extension
ccf6bc0 Merge pull request #745 in SOREDIWEB/soredi-webservice from develop to master
a8a9309 Merge pull request #744 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1022-geratekonfiguration-tabelle-hat-den-falschen-namen to develop
c0e7610 - removed unused code - improved table naming
ed25778 - updated datasource - implemented some useful functions
6cfa62f Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-1015-ui-button-in-navbar-wie-verlauf
ded60fd Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-1015-ui-button-in-navbar-wie-verlauf
53227c7 Merge pull request #743 in SOREDIWEB/soredi-webservice from develop to master
fbee6af Merge pull request #742 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-989-fcc-ce-bei-allen-konfigurationen-aktivieren to develop
c7f4750 - renamed 110/230 VAC, 180W to 120W
01bb286 - good error message
84ebcea - good error message
6e0c504 - full page tag
ad0547c Merge branch 'develop-framework-upgrade' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-1015-ui-button-in-navbar-wie-verlauf
35fa65d - permission fixes
79f8f4c - permission fixes
197699e Merge pull request #740 in SOREDIWEB/soredi-webservice from master to develop
513246c Merge pull request #741 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1021-navigation-bar-im-webservice-wird-bei-labeldruck-nicht-versteckt to master
72e5100 - vanished all header in print mode
6c0ffbc Merge pull request #739 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1020-in-profilansicht-last-login-und-login-count-vertauscht to master
65dab30 - fixed order
cb970b4 Merge pull request #723 in SOREDIWEB/soredi-webservice from develop to master
355e72e - url handlers instead of actions
2be25c8 - non static url handlers
6733fe1 - settings maintainance
1de6573 - migrate allowed actions + url handlers to static
4bbdd21 Squashed 'system/' changes from 4ae9c12..d290672
435cb2d Merge commit '4bbdd21952dba839168c5fbdf8920e5b3cf94df5' into develop-framework-upgrade
ccf209e Merge commit '4bbdd21952dba839168c5fbdf8920e5b3cf94df5' into develop-framework-upgrade
d290672 - merge v3 updates to v2
63d7a4e Merge pull request #734 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-1007-c-p-recognition-optimieren to develop
def8013 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into hotfix/SOREDI-1007-c-p-recognition-optimieren
5e92217 Merge pull request #738 in SOREDIWEB/soredi-webservice from develop-configuration to develop
47fc6aa Merge branch 'develop-configuration' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-configuration
b02441d Merge branch 'develop-configuration' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-configuration
2da34b6 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-configuration
f40a9c1 Merge pull request #736 in SOREDIWEB/soredi-webservice from feature/SOREDI-1014-ausschlussmoglichkeit-implementieren to develop-configuration
27a8292 Squashed 'system/' changes from 9aff953..4ae9c12
ea403eb Merge commit '27a82929a6ab34e28c00d569d18ba1507573fe67' into develop-framework-upgrade
37c0c6b Merge commit '27a82929a6ab34e28c00d569d18ba1507573fe67' into develop-framework-upgrade
9adf4d2 Squashed 'system/' changes from 2d88b0f..9aff953
7687102 Merge commit '9adf4d2a31b4b6163f17269f149fc83407f66023' into develop-framework-upgrade
ffca98b Merge commit '9adf4d2a31b4b6163f17269f149fc83407f66023' into develop-framework-upgrade
5a71922 - added support for iOS Devices
7fa5a2b - first broken implementation
9aff953 Merge pull request #737 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-994-hover-effect-on-navigationbar-in-webservice to develop
9961e29 - updated webservice jira navbar
4ae9c12 Merge pull request #20 in GOMA/goma-framework from bugfix/GOMA-246-trailing-slash-nur-automatisch-bei-get-hinzufugen to develop
3403b59 - fixed strtoupper
d6fcb68 - fixed
dbc8fff - undo tryfix urlend - header only executed if request_method == get
5953d60 - updated docs - tryfix urlend
50b500f Revert "- updated docs"
6561408 - updated docs - tryfix urlend
78c4456 - implemented exclude all option for all errors shown
5421038 - implemented exclude all option for all errors shown
a68836a Merge pull request #735 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-996-mobile-navigationbar-kaputt to develop
77da8a4 ms support
b9c90a3 - updated webkit appearance for input
b311f21 - renamed property
550a9d3 - renamed method
26d1be8 - added documentation
f83d8b4 - superadmin can now exlude a device from verification by configuration
5a437f2 - removed unused code
ffb122a - optimised jira topnav
d60fcb7 - fixed navbar
2469064 - fixed beta badge
ac22070 - fixed popup positioning - fixed autoclose of popup when user clicks outside
aa17219 - removed unused code - removed unnecessary log - added documentation
060ca6d - optimised serial search
c82bd54 Merge pull request #733 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-1003-anderung-implementieren to develop
78a53c7 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into hotfix/SOREDI-1003-anderung-implementieren
4a639a3 Merge pull request #732 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-863-singleton-fur-settings-nutzen to develop
8321f8e -  device data will now be saved on service case creation instead of serial no selection
830b0ef Merge pull request #729 in SOREDIWEB/soredi-webservice from develop-logincount to develop
bb0ce72 Merge pull request #729 in SOREDIWEB/soredi-webservice from develop-logincount to develop
61c1878 Merge pull request #731 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1001-geratetyp-wird-bei-rma-erstellung-aus-ticket-falsch-gesetzt to develop
dc8232d Merge pull request #725 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-876-wenn-ein-fehler-bei-ticketerstellung-auftritt-scheint-javascript to develop
bb025b8 - fixed getGlobalSettings
9c38a61 - finished Singleton usage
34a108b - fixed permission
1b45a3b - first use of singleton
71c4db4 - updated to js syntax
4ddb93f - updated to js syntax
c6e84d9 - removed Soredi_ProfileController - updated templates
2be61ac - removed Soredi_ProfileController - updated templates
31728e4 - used device function
1cc531d - fixed device type set for jira
d3e0f80 Merge pull request #730 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-999-mobile-zertifizierung-und-seriennummer-zu-nah-am-rand to develop
875de5c - improved styling
21c9691 Merge pull request #726 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1000-taskbook-power-zeichen to develop
48f3376 - optimised js
edcb605 - optimised js
11870cb Merge pull request #727 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-1000-taskbook-power-zeichen to master
30474e1 - update power for taskbook
aaf3338 - implemented onReady(callback, arguments) in form.js Function calls callback $.onReady - implemented onReady for Supportform
2fc6dd1 - implemented onReady(callback, arguments) in form.js Function calls callback $.onReady - implemented onReady for Supportform
662f1b3 Merge pull request #724 in SOREDIWEB/soredi-webservice from feature/SOREDI-991-umsetzung to develop-logincount
d7370ab - user login will be logged - count and last login will be displayed in backend user list, raw data user list, user profile if superadmin is logged in
dfb5a33 - user login will be logged - count and last login will be displayed in backend user list, raw data user list, user profile if superadmin is logged in
f800167 Merge pull request #720 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-993-can-only-throw-object-when-jira-credentials-missing to develop
eef6204 Merge pull request #722 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-990-erstellung-von-geraten-mit-template-verknupft-gerat-nicht-mit-template to develop
dec745e Merge pull request #721 in SOREDIWEB/soredi-webservice from feature/SOREDI-992-mobile-seriennummer-suche-copy-paste-optimieren-wenn-moglich to develop
a49fd29 - remove unused e
584a8d0 - always set connectionStatus
c62a0ff - removed workaround - templateid is now set on device creation
4e028f5 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-990-erstellung-von-geraten-mit-template-verknupft-gerat-nicht-mit-template
c8dd435 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-993-can-only-throw-object-when-jira-credentials-missing
ab9fb47 - add paste event to searchPopup
386ded7 Merge pull request #719 in SOREDIWEB/soredi-webservice from feature/SOREDI-984-navigation-aus-beta-jira-in-webservice to develop
eb755a1 Merge pull request #717 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-988-wenn-man-keine-seriennummer-eingibt-bei-rma-erstellung-aus-jira to develop
e87de13 - fix logic in order to always return bool and if false exception
191df0a - implemented Exception
e0eba22 Merge pull request #718 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-955-konfigurator-teilweise-springt-es-automatisch-von-angebot- to develop
8f517f8 - removed console.log
e81b53a - fixed formatting
48c1957 - removed unused code
a56e4ba - fixed link
96132c6 - implemented atlassian font - implemented topbar in red - fixed beta banner
2324d95 - user won't be forwarded back if he changes data in the proposal view
f03da71 - not working workaround
bf1c7a9 - fixed error - prior check if field is empty
8806298 Merge pull request #716 in SOREDIWEB/soredi-webservice from feature/SOREDI-978-datalogic-labels-nochmal-besser-konfigurieren to master
d94e509 Merge pull request #715 in SOREDIWEB/soredi-webservice from feature/SOREDI-978-datalogic-labels-nochmal-besser-konfigurieren to develop
bfd14a4 - updates for dl labels
0b40b09 Merge pull request #686 in SOREDIWEB/soredi-webservice from develop to master
0da4e57 Merge pull request #714 in SOREDIWEB/soredi-webservice from bugfix/templateid-devicetemplates to develop
88d4e24 - remove templateid from deviceTemplates
1dadf99 Merge pull request #713 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-354-group-notifications-evtl-broken to develop
e8d3467 - fix filter
0222238 - fix filter
9d1a60e - possible really last fix
b084463 - possible really last fix
2ac2690 - final fix
9351236 - final fix
dc0b306 - deployment test
6b3b69e - deployment test
3c1ea69 - deployment test
e98b175 - deployment test
b05a854 - deployment test
a1ab936 - deployment test
f1461e8 - tryfix
c77ba9b - tryfix
1bd0244 - fix part 2
e36b731 - fix part 2
54066b2 - fix part 1
f5027ed - fix part 1
0daa364 Revert "- fixed group infinite load"
248c60b Revert "- fixed group infinite load"
33b0c92 - fixed group infinite load
f174ffe - fixed group infinite load
ef7c55e Merge pull request #711 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-987-correct-components to develop
e6327e8 Merge pull request #712 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-987-correct-components to master
f0786f9 - typo + correct power supply text
60f5377 Merge pull request #269 in MBG/mbg-website from hotfix/MBG-205-design-vertretungsplan-responsive-uberarbeiten to develop
c9c9d33 Merge pull request #710 in SOREDIWEB/soredi-webservice from master to develop
3780e85 Merge pull request #704 in SOREDIWEB/soredi-webservice from SOREDI-829-e-mails-verschonern to master
0facb40 Merge pull request #709 in SOREDIWEB/soredi-webservice from SOREDI-829-e-mails-verschonern to develop
c253525 - removed comment
cbcdedd Merge pull request #708 in SOREDIWEB/soredi-webservice from SOREDI-829-e-mails-verschonern to develop
6023926 - undo html attr
2198ff5 Merge pull request #707 in SOREDIWEB/soredi-webservice from SOREDI-829-e-mails-verschonern to develop
c7d265a - tryfix link color
3215846 Merge pull request #706 in SOREDIWEB/soredi-webservice from SOREDI-829-e-mails-verschonern to develop
b6896fb - fixed button
7dedab0 Merge pull request #705 in SOREDIWEB/soredi-webservice from SOREDI-829-e-mails-verschonern to develop
391b9d0 - tryfix header - tryfix link color
043af59 - tryfix tutorium
bb0afc7 - optimized layout and design
60b9776 Merge pull request #703 in SOREDIWEB/soredi-webservice from SOREDI-829-e-mails-verschonern to develop
05ad8e8 - fixed mail sending (removed exit)
a90801b Merge pull request #702 in SOREDIWEB/soredi-webservice from SOREDI-829-e-mails-verschonern to develop
23121aa - tryfix
ea4da5d Merge pull request #701 in SOREDIWEB/soredi-webservice from SOREDI-829-e-mails-verschonern to develop
0c0a285 - optimized mail - implemented fonts
1e0b626 Merge pull request #700 in SOREDIWEB/soredi-webservice from master to develop
1f7d8c9 Merge pull request #698 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-919-implementierung-meldung-bzgl-rma to develop
3a6ffc3 Merge pull request #699 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-982-profil-seite-float-funktioniert-nicht-mehr to master
b7c2075 - fixed for PR after CR
5db2238 - additional fix
8f1ddaf - fixed design
0d91010 Merge pull request #697 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-354-group-notifications-evtl-broken to develop
c002892 - tryfix
e980989 - tryfix
5335773 Merge pull request #492 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-354-group-notifications-evtl-broken to develop
8756add Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-354-group-notifications-evtl-broken
c9d7419 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-354-group-notifications-evtl-broken
788d432 - cant add two service cases for one issue
a91a555 - fix jiraissueid display - implemented permission confirmation - updated jira api usage
bd41be2 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into hotfix/SOREDI-919-implementierung-meldung-bzgl-rma
5cfe347 Merge pull request #696 in SOREDIWEB/soredi-webservice from feature/SOREDI-972-feinjustierung to develop
0bcba2a - fixed configuration
22e8c21 - vernier adjustment
0268d8f Merge pull request #694 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-971-karl-demo-gerate-klappen-nicht-serial-zu-aktualisieren to master
7ee1a07 Merge pull request #695 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-971-karl-demo-gerate-klappen-nicht-serial-zu-aktualisieren to develop
a220764 - fix demo device assignment problem
691315e - update
853b6cb Merge pull request #693 in SOREDIWEB/soredi-webservice from feature/SOREDI-921-pdfs-in-gro-e-85x55mm-generieren to develop
d158632 - only devices with template can be printed (else exception) - fixed date
62323d8 - fixed multiple device print
cf8a8f3 - removed unnecessary service - added possibility to set page padding/margin
2093c09 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-921-pdfs-in-gro-e-85x55mm-generieren
5e8cb0b Merge pull request #692 in SOREDIWEB/soredi-webservice from master to develop
4bd78e6 Merge pull request #691 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-970-critical-soredi_jiracontroller-not-found to master
231cbba - fixed bug
12c364f - update
04395ce - implemented PDF Creator - implemented shippinglabel creation
f24f2af Merge pull request #690 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-964-improve-code-of-certification-check-method to develop
b5fa19e - improved
12bfe54 Merge pull request #688 in SOREDIWEB/soredi-webservice from feature/SOREDI-966-neue-wlan-karte to develop
9800840 Merge pull request #689 in SOREDIWEB/soredi-webservice from feature/SOREDI-966-neue-wlan-karte to master
2d08bbd - Sparklan WNFQ-258ACN WiFi/BT 4.1 for SHs
d253e2c Merge pull request #687 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-963-power-0-und-4-tauschen to develop
581a601 Merge pull request #685 in SOREDIWEB/soredi-webservice from feature/SOREDI-906-zertifizierungen-in-geraten-unterstutzen to develop
7f1118f - swap 4 and 0 for power
c0fd15c - show fcc information only if fcc certified
c563d74 - Remove double function
077e09d Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-906-zertifizierungen-in-geraten-unterstutzen
49f4505 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-906-zertifizierungen-in-geraten-unterstutzen
29a9de6 Merge pull request #684 in SOREDIWEB/soredi-webservice from feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten to develop
e4f8329 - added necessary additional check on certification check
cb6b235 - removed test items - fixed update script - improved update visualisation
3739f31 - call postflight events even if no changes occurred - fix allowed actions to get updateCertificates called
3240487 - call postflight events even if no changes occurred - fix allowed actions to get updateCertificates called
3a988fb - minimal
3011abd - Stand
2802e38 - aktueller stand
6c0e7df - improvements
151df03 - konfiguration druck
4b14f88 - implemented updatescript
8b14734 - added direct certification check
ab365c0 - corrected productno field - removed unnecessary disabeling of fields
652d2b9 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten
8646109 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten
ad02b53 - correct linking of fields
ad40ec6 Merge pull request #683 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-949-sso-weiterleitung-auf-development-webservice-geht-nicht to develop
2a8b5b4 - bugfix
730c4a6 - added/improved images - improved detail-header - implemented certification - implemented devices > template relationship - fields will be disabled if created with template - added checkCertificates for device
4ff8f75 Merge pull request #267 in MBG/mbg-website from bugfix/MBG-212-tutorien-funktionieren-nicht-mehr to develop
e456c3f - remove path + fix notice
a710246 - fix problem and add test
b44fff5 - fix problem and add test
a97d7b1 Merge pull request #681 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-958-problem-types-rhino-karl to develop
51447d9 Merge pull request #682 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-958-problem-types-rhino-karl to master
635cb99 - fix type problems
3dfee39 Merge pull request #677 in SOREDIWEB/soredi-webservice from develop to master
0f916a2 Merge pull request #676 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-951-rhino-templates-sollen-auch-sh-unterstutzen to develop
97fca81 - fixed device_form setOptions for rhino
1bd35be Merge pull request #675 in SOREDIWEB/soredi-webservice from develop to master
21643d5 Merge pull request #674 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-951-rhino-templates-sollen-auch-sh-unterstutzen to develop
3cfa702 - hotfix sh and taskbook can be chosen in rhino template
7cfe9c7 Merge pull request #672 in SOREDIWEB/soredi-webservice from develop to master
7288f33 Merge pull request #671 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-944-jira-call-umbauen to develop
28dd1ab - updated jira call in device form
82517f9 Merge pull request #19 in GOMA/goma-framework from bugfix/GOMA-243-static-im-installcontroller-fehlt to develop
a08438e - fixed installController
c6602bd Merge pull request #670 in SOREDIWEB/soredi-webservice from develop to master
98cd0b9 Merge pull request #669 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-936-label-druck-gro-e-soredi-dl-label-falsch to develop
4c6d790 - tryfix label print
0f06323 Merge pull request #668 in SOREDIWEB/soredi-webservice from feature/SOREDI-502-add-to-manymanydropdown to develop
7fb5848 - deprecate dropdown/multiselectdropdown
6fca85b - deprecate dropdown/multiselectdropdown
4b09635 - implement ManyManyDropdown
9340605 - implement ManyManyDropdown
546bcd2 Merge pull request #667 in SOREDIWEB/soredi-webservice from develop to master
81d50de Merge pull request #666 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-935-hotfix-labeldruck to develop
329279a - hotfix labeldruck
71242ae Merge pull request #265 in MBG/mbg-website from feature/MBG-174-abmeldung-newsletter to develop
0d9d647 - enforce MBG-204
e022b65 - refactoring - unsubscribe from newsletter
c0451f7 Merge pull request #665 in SOREDIWEB/soredi-webservice from fix-cast-dropdown to develop
f10e517 - fix problems with escaping
69b9382 - fix problems with escaping
92e806e Merge pull request #264 in MBG/mbg-website from hotfix/MBG-210-fix-quick-fix to develop-reservation
3d60c50 - fixed quick fix
f248cef - quick fix casting MBG-181
d959613 - quick fix casting MBG-181
cae79d8 Merge branch 'develop-reservation' of https://repo.goma-cms.org/scm/mbg/mbg-website into develop-reservation
2b2e708 - better description + typing
e18bc73 Merge pull request #263 in MBG/mbg-website from hotfix/MBG-191-style-verbessern to develop-reservation
cc0f6bd - fixed backend template setting
f0b4fc9 - included legends - fixed custom template
d7ec6ba - fixed seatselector place width
68b9513 - improved styling
184deac Merge pull request #262 in MBG/mbg-website from hotfix/MBG-206-email-versand-funktioniert-nicht-bestatigungsmail to develop-reservation
08f94ce - improved mail sending
3cde49d Merge commit '661a15ccfd91184412851b2f8312287018913588' into develop-reservation
661a15c Squashed 'system/' changes from 7f17452..98433f2
7643105 Merge pull request #661 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-925-veranderungen-moglich-machen to develop
c98431e Merge pull request #662 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-925-veranderungen-moglich-machen to master
5eca3b0 - comment margin: 0
9caa51c Merge pull request #261 in MBG/mbg-website from feature/GOMA-226-url-fix-admin-item to develop-reservation
a8c0a09 - fix second test
60f5c96 - fix testRequestSystem and rename
4f3f096 - allow prohibited actions in allowed actions without url handler
80688d4 - change properties for adminItem to static - fix allowed-action methods GOMA-238 - fix url problem in adminItem
57a4897 - Bessere AC Version
84bea73 Merge pull request #660 in SOREDIWEB/soredi-webservice from feature/SOREDI-922-neues-wlan to master
60559cc Merge pull request #659 in SOREDIWEB/soredi-webservice from feature/SOREDI-922-neues-wlan to develop
21131fe - add sparklan card as of andreas fritz
44807bc - final changes
d31c073 Merge branch 'feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten
3ebfce9 - changes
0701468 Merge branch 'develop-reservation' of https://repo.goma-cms.org/scm/mbg/mbg-website into feature/GOMA-226-url-fix-admin-item
84a0c06 Merge branch 'feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten
85c306a - untested draft of taskbook/i-labels
4ac7b92 Merge pull request #657 in SOREDIWEB/soredi-webservice from develop to master
941cabd Merge branch 'feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten
20dc14e - changes
05b5f1d - fix footer
17977f9 Merge branch 'feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-911-druck-im-ws-fur-fcc-vorbereiten
eeba9a7 - renamed print.css - first changes
b9ad1a4 - renamed print.css - first changes
cf7b4ea Merge pull request #658 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-915-footer-auf-label-ausdrucken-sichtbar to develop
7f194f9 - hide footer in print view
10b43f6 Merge pull request #656 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-914-auf-labels-sind-falsche-netzteil-informationen to develop
47d23ea - improved power image
541ebef Merge pull request #260 in MBG/mbg-website from bugfix/MBG-206-email-versand-funktioniert-nicht-bestatigungsmail to develop-reservation
bd83b26 - tryfix
f40350c Merge pull request #259 in MBG/mbg-website from feature/MBG-201-rechte to develop-reservation
abc0654 - implemented rights for all theater elements
d785504 Merge pull request #654 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-883-benachrichtigung-umbenennen to develop
8510589 - updated lang
7bbc31c Merge pull request #653 in SOREDIWEB/soredi-webservice from develop to master
bcb5f94 Merge pull request #648 in SOREDIWEB/soredi-webservice from feature/SOREDI-604-automatisch-watcher-hinzufugen-zu-support-fall-von to develop
7e48b4f - add second watcher only if it's a different one - reordered
f068b0e Merge pull request #258 in MBG/mbg-website from bugfix/MBG-190-extended-dd-implementieren-fixen to develop-reservation
df6c435 - fix tests
0b6b54d - extended DD works
589cd16 - fix problems regarding callOnDocumentClick with ExtendedDropdown
57d3ee3 - improve HTMLParser impl - fix issues with url-handlers not correctly defined
a34f694 Merge pull request #257 in MBG/mbg-website from bugfix/MBG-203-mailtemplate to develop-reservation
9ebbd5d - fixed template
6cb1fa0 Merge pull request #256 in MBG/mbg-website from hotfix/MBG-202-ausmisten to develop-reservation
a06808f - removed unnecessary code - improved template structure
8ba1315 Merge pull request #255 in MBG/mbg-website from hotfix/MBG-200-ersetzung-der-variablen to develop-reservation
3d87d7a - variables been replaced - correct display if reservation of day is disabled
902a256 Merge pull request #254 in MBG/mbg-website from hotfix/MBG-199-mail to develop-reservation
b00bed7 - fixed mail
a1d106c Merge pull request #253 in MBG/mbg-website from bugfix/MBG-198-event-erstellung-bearbeitung-reset-prufen to develop-reservation
05c6e88 all prior events will be removed
5f706c6 - replace scripts only if body and title
e84762c Merge pull request #647 in SOREDIWEB/soredi-webservice from develop to master
02b8b05 Merge pull request #651 in SOREDIWEB/soredi-webservice from feature/SOREDI-902-vietnam to develop
a066b10 Merge pull request #652 in SOREDIWEB/soredi-webservice from feature/SOREDI-902-vietnam to master
ff5cf0b - add vietnam
6b941b9 Merge pull request #252 in MBG/mbg-website from feature/MBG-171-cronjob-datenschutz to develop-reservation
8dc1bc4 - added Director Rule
53a53bc Merge pull request #645 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-896-jira-url-ist-nicht-in-den-soodomains-enthalten to develop
d95b121 - add settings jira host to sso domains
206e225 - added privacy property - implemented cronjob
ac10e03 Merge pull request #251 in MBG/mbg-website from feature/MBG-197-umsetzung-finanzubersicht to develop-reservation
6c2fc07 - implemented financial statistic - added reservationscount to logging - added fix function for financial entry ending - fixed TabieFieldSortableHeader
ea29d2f Merge pull request #250 in MBG/mbg-website from hotfix/MBG-172-verknupfung-mit-theaterkasse to develop-reservation
c1de52d - default is now default template - removed unnecessary code - reservation is only successfull if no status was change
dd96d97 Merge pull request #249 in MBG/mbg-website from feature/MBG-192-in-bestatigungsubersicht-ggf-und-in-abrechnungsubersicht-alle to develop-reservation
5670c91 - fixed checkout - implemented bill nex to keyboard - removed EDD - minor fixes
6ecc4a4 Merge pull request #649 in SOREDIWEB/soredi-webservice from feature/SOREDI-901-logo-einbauen to develop
da328ec Merge pull request #650 in SOREDIWEB/soredi-webservice from feature/SOREDI-901-logo-einbauen to master
e13e855 - new logo
333585a - bot will now successfully removed as watcher - real reporter will be added as watcher - jira reporter will be added as watcher
64d2570 Merge pull request #646 in SOREDIWEB/soredi-webservice from SOREDI-897-userpicker-fullen to develop
3b9cf15 - fill userpicker
f32e887 - redo
9dacf32 - undo
f5d4e01 - added jira url to sso domains
2b0b984 Merge pull request #248 in MBG/mbg-website from hotfix/MBG-193-abrechnung-direct-commit to develop-reservation
b3e477f - secured reload - fixed direct commit
6c31712 Merge pull request #247 in MBG/mbg-website from bugfix/MBG-194-stornierung-einer-reservierung to develop-reservation
ef40a59 - fixed storno bug
a4ac3b6 Merge pull request #246 in MBG/mbg-website from MBG-164-kleine-statistik to develop-reservation
4a96331 - added summary
bc1c4d8 - implemented small statistic about reservations and seats (status, counts)
90d96ab Merge pull request #245 in MBG/mbg-website from feature/MBG-189-soft-reset to develop-reservation
5842bb6 - implemented Soft-Reset
0882c97 - fix for HTMLParser to parse more HTML
36b5ef8 - manual fix for not parsed HTML
b7b592d Merge pull request #244 in MBG/mbg-website from feature/MBG-168-kauf-eines-platzes to develop-reservation
ab8556d - day will be shown on select
e61aba1 Merge pull request #243 in MBG/mbg-website from feature/MBG-168-kauf-eines-platzes to develop-reservation
8f11dbb - implemented langvars - removed unnecessary files/functions - better naming
2b40524 - implemented keyboard for reservation search - improved default style - improved touch handling with hover
0e16fd3 - finished system - implemented global cancel
c23584b Merge pull request #234 in MBG/mbg-website from origin/bugfix/update_matomo_tracker to develop
d1a2485 - implemented screen keyboard - improved page calling
80b0909 Merge pull request #241 in MBG/mbg-website from hotfix/MBG-176-anderungen-am-sitzplankonfigurator to develop-reservation
2d4fced - fixed seat mode change
2c5f48e - days with reservations can't be synced and will be skipped - skipped days on sync will be reported
8c90e4e - can't sync of all days to sync contain reservations
3095900 - sync only visible if there are more than 1 days
3e242be Merge pull request #240 in MBG/mbg-website from feature/MBG-187-reihen-und-spalten-hinzufugbar-machen to develop-reservation
97697c3 - implemented row expansion - fixed day deletion
80775f5 - implementation Extended DD
5a1028c Merge pull request #239 in MBG/mbg-website from develop-reservation-merge to develop-reservation
cd834d8 - remove not required url_handlers
5e58d8f - static instead of public
77d187e Merge commit '4d64a6ae753cbc3674580668a40e5ee177b0fdf8' into develop-reservation
6030eb8 Merge pull request #238 in MBG/mbg-website from hotfix/MBG-185-fur-rechte-platze-offset-max-seat-count to develop-reservation
85bcbe7 - implemented hard reset for event creation
64175c1 - fixed default reservation design - included seat offset for right block
4511570 Merge pull request #237 in MBG/mbg-website from hotfix/MBG-186-im-header-vllt-was-sinnvolleres-anzeigen-als-datum-und-uhrzeit to develop-reservation
ed797fc - improved header
ea1a262 Merge pull request #236 in MBG/mbg-website from feature/MBG-180-implementierung-im-backend to develop-reservation
683d7be - implemented bubble styling
26f5259 Merge pull request #235 in MBG/mbg-website from feature/MBG-167-abholung-reservierung to feature/MBG-180-implementierung-im-backend
de9c46b - fixed searchfields
cbaebc7 - fixed lang
b5020e5 - implemented reservation fetching for break sell
c6e8679 - updated piwik tracker to matomo tracker
9eecf2c Merge pull request #644 in SOREDIWEB/soredi-webservice from develop to master
5d255e3 Merge pull request #643 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-891-rhino-2-21-zoll to develop
aba66b4 - new rhino type
a4d21a6 Merge pull request #232 in MBG/mbg-website from feature/IBPG-60-livecounter-user-raus to develop
1386adb - remove user link (DSGVO)
7d8fa16 Squashed 'system/' changes from 1d311c9..7f17452
23772d5 Merge commit '7d8fa1663457648bbb8161aaaf86cd5f7ee8cbd4' into feature/IBPG-60-livecounter-user-raus
1455127 Merge pull request #231 in MBG/mbg-website from feature/MBG-166-schichtbeginn to feature/MBG-180-implementierung-im-backend
c62d7b1 - fixed search fields
33bc88e - implemented shift beginning and Ending
2cdad16 - fixed lang
af4dadb - fixed reservation backend creation
9e9b267 - updated default template - reservations can be cancelled, deactivated, activated in table - seat chart editor improved (enabeling or disabeling rows
7db953f - updated
0f48f07 - update
8c653b2 Merge pull request #642 in SOREDIWEB/soredi-webservice from develop to master
99e302d Merge pull request #641 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-887-rma-feld-wird-nicht-angezeigt to develop
54c00d7 - show as message
8e403a0 - remove option to manually set controller
0d0b7f4 Merge pull request #640 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-886-wartung-rausnehmen to master
d34b6b1 Merge pull request #639 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-886-wartung-rausnehmen to develop
cf4a432 - remove maintenance
825983f Merge pull request #230 in MBG/mbg-website from hotfix/MBG-179-funktionialitat-der-onlinereservierung-nach-umbau-herstellen to develop-reservation
bd4e2f8 - moved blocks.js to general templates (resEventPageBlocks.js) - fixed reservation - updated code for new setup - removed unnecessary class - implemented seat and reservation Status
dae545e Merge pull request #229 in MBG/mbg-website from feature/MBG-177-schlie-en-der-reservierung to develop-reservation
1198a15 - fixed lang
14f83da - fixed lang
c052683 - reservation can be deactivated/activated by day - activation resets auto deactivation if time has expired - information can be set in Control and Administration but everything else only in administration
52d5b70 - optimized add button
6d5646a Merge pull request #228 in MBG/mbg-website from MBG-165-sitzplankonfigurator to develop-reservation
7fe9c41 - improved synchronisation and toggle mode by using ::update()
385a7e8 Merge pull request #227 in MBG/mbg-website from MBG-165-sitzplankonfigurator to develop-reservation
2368639 - rows and seats counts can't be changed - if a day already exists rows and seats counts are fixed - implemented seating chart (overview) in day-editmode - implemented seating chart with syncing and dummy toggling function
b34e0e8 Merge pull request #226 in MBG/mbg-website from feature/MBG-163-eventeinstellung to develop-reservation
64a7106 - fixed search_fields
9e2b751 - fixed test
d02309b - fix test
542a501 - can create eventday - seats are created on day creation
a107e0b Merge pull request #225 in MBG/mbg-website from feature/MBG-162-erstellung-eines-neuen-events to develop-reservation
8e2ad79 - temporarely disabled class
0399d26 - updated func name
c4478d9 - included phpdoc
ac60ee5 - removed unnecessary test
4de441e - improved countdownselector - finished administration
006f5d0 - implemented CountdownSelector as FormField
cf60516 - fixed lang
ec2dbd2 - first implementation of event creation - implementation of countdown selector
ee9f6e5 Merge pull request #224 in MBG/mbg-website from feature/MBG-161-definition-geldbetrage to develop-reservation
df0c334 - added search_fields
8e0a5b4 - renamed pages - implemented fees
9e2011a Merge pull request #223 in MBG/mbg-website from feature/MBG-173-seitentyp-neuschreiben to develop-reservation
9f55dcd - copied page for later usage - resetted eventPage (but only on page allowed) - renamed files
a0fd3f9 Merge pull request #637 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-879-planz-keine-berechtigung-user-zu-schreiben-bei-ticketerstellung to develop
dd2ca7c Merge pull request #638 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-879-planz-keine-berechtigung-user-zu-schreiben-bei-ticketerstellung to master
a8fe6e8 - Second Try also needs update
3913dbe Merge pull request #634 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-842-support-e-mails-kommen-manchmal-nicht-an to develop
62728ab - add solution autor
c272b01 Merge pull request #631 in SOREDIWEB/soredi-webservice from develop to master
de9bd21 Merge branch 'master' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop
2c5479b Merge pull request #591 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-748-refactoring-alle-requests-in-jiracontroller-refactoren to develop
76733fd Merge pull request #627 in SOREDIWEB/soredi-webservice from feature/SOREDI-789-bei-ticketerstellung-hinzufugen to hotfix/SOREDI-748-refactoring-alle-requests-in-jiracontroller-refactoren
ab7ea22 - changed link to name
78d2e74 Merge pull request #221 in MBG/mbg-website from bugfix/MBG-78-vertretungsplan-doppelte-anzeige-der to develop
3cdcbb8 - improved Error code - forced orgaid to int - implemented actual creator field
f361c07 - cleared select from duplicates
742c57a Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into hotfix/SOREDI-748-refactoring-alle-requests-in-jiracontroller-refactoren
ed2be50 Merge pull request #626 in SOREDIWEB/soredi-webservice from feature/SOREDI-862-ankundigung-wartung to master
a410a88 - maintenance implementation
bd04f36 Merge pull request #621 in SOREDIWEB/soredi-webservice from develop to master
075d5b5 Merge pull request #620 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-853-ubersetzung-rma-nachricht-ticketsystem-fehlerhaft to develop
081d5ee - updated customer info
4aca7d3 Merge pull request #619 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-854-autocomplete-fur-extendeddropdown-deaktivieren to develop
7156ebb - disable autocomplete for chrome
b9d28b4 - update selectize
45f63c2 Merge pull request #616 in SOREDIWEB/soredi-webservice from bugfix/GOMA-218-uploads-no-writing-of-width-height-when-getting-property-from-image to develop
ed355fe Merge branch 'bugfix/GOMA-209-ev' into bugfix/GOMA-218-uploads-no-writing-of-width-height-when-getting-property-from-image
297cc28 - remove problematic pattern to write in getters
24e79c6 Merge pull request #615 in SOREDIWEB/soredi-webservice from bugfix/GOMA-209-ev to develop
f1e7e9d - fix problem
708944b - try/finally for test
6eaae26 - try/finally
4b76029 - two hunks
259835f test
01e5d34 - fix locking issues - fix uploads issues
9a84979 - error message
a629a6f - more suisticated error message
fb68db1 - fix issues
da8735d - add test for HasOneWriter - fix issue with HasOneWriter not setting field - Add endless loop detection
7930061 Merge pull request #614 in SOREDIWEB/soredi-webservice from develop to master
7529430 Merge pull request #613 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-834-anzeige-gewahrleistung-rma-falsch to develop
8a7b7ec Merge branch 'bugfix/SOREDI-834-anzeige-gewahrleistung-rma-falsch' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-834-anzeige-gewahrleistung-rma-falsch
419d8c3 - fixed variables
a934818 Merge pull request #612 in SOREDIWEB/soredi-webservice from develop to master
23ab52a Merge pull request #609 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-834-anzeige-gewahrleistung-rma-falsch to develop
406d748 - fixed styling - fixed variable call
97401ad Merge pull request #611 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-836-rma-geklickt-und-abbrechen-verandert-status to develop
8ad34ce - correct link
463397c Merge pull request #608 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-839-fehler-im-webservice-live to develop
35ec89e - should fix
5e29207 - fixed service creation
9ca1366 Merge pull request #604 in SOREDIWEB/soredi-webservice from feature/SOREDI-785-sdhc-einklappen to develop
9fe55f0 - fix unit-test
dbff229 - implement folding checkboxes
a0d454e Merge pull request #600 in SOREDIWEB/soredi-webservice from develop to master
bf972d3 Merge pull request #599 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-827-gerat-kann-nicht-angelegt-werden-weil-schon-existent to develop
56c21f6 - fix demo selection + add test
330db51 Merge pull request #598 in SOREDIWEB/soredi-webservice from develop to master
957da16 Merge pull request #597 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-825-schreibfehler-doku to develop
2b66576 - fix typo
846d0b1 - Should fix on uncached jira error
3ba7a02 - applied fixes (CR) - cached Jira connect error
5305952 - did todo where necessary - removed all buildRequest() dependencies from jira external classes - renamed JiraController to JiraService
e8bba71 Merge pull request #219 in MBG/mbg-website from bugfix/SOREDI-790-history-problematisch to develop
ad14e3e - show all history events - replace $user as of SOREDI-674
6274d9d Merge pull request #217 in MBG/mbg-website from bugfix/GOMA-210-correct-definition-of-argumentresult-in-form to develop
099b106 - permission field tests + fix notices in checkbox
8f435ac - restore correct behaviour - add some tests - validation if something gots wrong with setting permission
c3be690 Merge pull request #215 in MBG/mbg-website from bugfix/MBG-146-2-permissions-werden-nicht-sauber-nach-unten-durchgegeben to develop
bced0b7 - Form fix
d423f73 fix category view
55b1968 Merge pull request #214 in MBG/mbg-website from bugfix/MBG-146-permissions-werden-nicht-sauber-nach-unten-durchgegeben to develop
047b698 - fix propagation
1c98214 - fix permissions + add tests
b7a2aa6 - better exception
2cab6a3 Merge commit 'd4870ea4b6428f0c9cd91cfd1c5a9cec1102abcc' into bugfix/MBG-146-permissions-werden-nicht-sauber-nach-unten-durchgegeben
d4870ea Squashed 'system/' changes from 9a3e1d4..1d311c9
79f2462 Merge pull request #584 in SOREDIWEB/soredi-webservice from develop to master
ce50e0e Merge pull request #583 in SOREDIWEB/soredi-webservice from feature/SOREDI-709-support-login-formular-aktivieren to develop
9cacda9 activate support login form
e6c26b9 Merge pull request #581 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-787-ticket-erstellen-statt-fall-erstellen to develop
757f871 Merge pull request #582 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-787-ticket-erstellen-statt-fall-erstellen to master
121901e - correct link
04a26ba - rename ticket
e86d1ee Merge pull request #579 in SOREDIWEB/soredi-webservice from develop to master
965d39f Merge pull request #570 in SOREDIWEB/soredi-webservice from feature/SOREDI-773-anderung-layout to develop
97162cc Merge pull request #576 in SOREDIWEB/soredi-webservice from develop to master
997ae4f Merge pull request #575 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-782-reperatur-falle-konnen-nicht-angeklickt-werden to develop
1af4a86 - fixed js error
991a182 Merge pull request #574 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-781-javascript-error-in-device-table-soredi_support_ui to master
3b4c0b8 Merge pull request #573 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-781-javascript-error-in-device-table-soredi_support_ui to develop
6da8556 - fix issue with javascript on device with support tab
70f8f60 - finished design change
9e3f958 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-773-anderung-layout
f86f383 Merge pull request #568 in SOREDIWEB/soredi-webservice from bugfix/GOMA-207-many_many-selection-mit-mehreren-selektoren-and-funktioniert-nicht to develop
a63a72a - fix for OR conjunction
10d1154 - fix ManyManyGetter
9175765 - first implementation
922de19 - Add test for issue
06e1cd0 Merge pull request #565 in SOREDIWEB/soredi-webservice from develop to master
a8c9185 Merge pull request #564 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-731-filter-falle-nach-gerat-nur-zeigen-wenn-man-auch-zugriff-auf-gerate-hat to develop
33d75e8 - improved code
39635f1 - fixed if there's no user signed in
4d88ac8 - changed from Member to Permission - created userCanSeeDevices - replaced permcheck in FrontendController
a4d36a8 - set permissions for device filter
be3e589 Merge pull request #556 in SOREDIWEB/soredi-webservice from develop to master
90e32c5 Merge pull request #563 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-730-2-wenn-kein-zugriff-auf-gerate-aber-support-umleitung-zu-support to develop
d775e31 - correct permission - BASE_SCRIPT
de57dbe Merge pull request #562 in SOREDIWEB/soredi-webservice from feature/SOREDI-730-wenn-kein-zugriff-auf-gerate-aber-support-umleitung-zu-support to develop
6c10f4c - Redirect to Support if Support is available
228395c Merge pull request #561 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-728-doppelte-e-mail to develop
eca1c0e - prevent user from being created twice through sync
94e1b7c Merge pull request #560 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-729-issue-auf-anonym to develop
48d09ef - fix anonymous issues
7ae122e Merge pull request #559 in SOREDIWEB/soredi-webservice from feature/SOREDI-723-bei-neuer-fall-benutzer-erstellen to develop
f1e1196 - second try fix
3d6305e - integrated creation of users via ws form
fabea3e - fixed exception throwing
4af19a8 - fixed exception throwing
9dc0069 Merge pull request #558 in SOREDIWEB/soredi-webservice from master to develop
fcb97d3 Merge pull request #557 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-716-wenn-ein-nutzer-im-servicedesk-team-ist-schlagt-der to master
270851f - shouldfix
56ef0fd Merge pull request #555 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-727-neuer-fall-cleart-formular to develop
cf03f79 - do not clear form + jquery optimization
4eb4c83 Merge pull request #542 in SOREDIWEB/soredi-webservice from develop to master
a8a7f94 Merge pull request #554 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-724-cpu-wird-bei-duplizieren-nicht-ubernommen to develop
ba3eac3 - fix tests
9b9ee4b - optimize timeouts for CI SOREDI-726
941e7b5 - improve tests with validation check
3ee08f1 - better implementation for templates
11dc72d - correct required fields - remove support from login
ac0a828 Merge pull request #552 in SOREDIWEB/soredi-webservice from feature/SOREDI-721-netzteil-12-48 to develop
b1d3573 Merge pull request #553 in SOREDIWEB/soredi-webservice from feature/SOREDI-721-netzteil-12-48 to master
e1aea53 - correct power definition for label
a384fdc Merge pull request #551 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-712-fixes-synchronisation to develop
90253a7 - updated phpdoc
0e5c622 - added option to get back, restart and flush cache - error messages are now loaded after finishing sync
d2c5ce4 Merge pull request #549 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-720-edit-delete-wird-zu-fruh-gezeigt to master
22ab30e Merge pull request #550 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-720-edit-delete-wird-zu-fruh-gezeigt to develop
4b59344 - fix permission issues
8c8dc11 Merge pull request #547 in SOREDIWEB/soredi-webservice from feature/SOREDI-721-netzteil-12-48 to master
6ec9fc2 Merge pull request #548 in SOREDIWEB/soredi-webservice from feature/SOREDI-721-netzteil-12-48 to develop
f1a6356 - 12/48V Netzteil
4d56015 Merge pull request #545 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-719-software-soll-fur-kunden-sichtbar-sein to develop
2954cf0 Merge pull request #546 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-719-software-soll-fur-kunden-sichtbar-sein to master
d517196 - correct numbering
0da673c - doc
56cadb5 - add unit-tests for permissions
1f981ea - correct perms
65d5f18 Merge pull request #543 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-719-software-soll-fur-kunden-sichtbar-sein to develop
723031a Merge pull request #544 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-719-software-soll-fur-kunden-sichtbar-sein to master
6fa416e - new software permission
b64f0af Merge pull request #540 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-718-partner-sehen-keine-gerate to develop
b219ac3 Merge pull request #539 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-709-support-login-formular-aktivieren to develop
3b7bbae Merge pull request #541 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-718-partner-sehen-keine-gerate to master
c68b3e1 - fix view access problem
53b123a - reactivate
f12ecdb Merge pull request #538 in SOREDIWEB/soredi-webservice from develop to master
37f8a6f Merge pull request #537 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-716-wenn-ein-n to develop
b1bf011 - quick fix
8cab3fe Merge pull request #536 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-713-automatisch-sso-deaktivieren-bei-unsicherem-passwort to develop
cf17a33 - improvements
8c20998 - unsafe password fix for beta
afdcd86 - do not support sso with standard or unsafe password
926c832 Merge pull request #525 in SOREDIWEB/soredi-webservice from develop to master
dfbde84 Merge pull request #535 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-710-support-login-formular-temporar-deaktivieren to develop
22b080f - disable login support form for deployment
bab2659 Merge pull request #534 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-711-fixes-for-synchronisation to develop
bd85e5c - changed code - declared $users and $users_created als array
d524cd6 Merge pull request #533 in SOREDIWEB/soredi-webservice from feature/SOREDI-681-caching-von-project-data to develop
39c04db - fixed typo
9b3f2c2 - finished ajax - fixed caching
33ba02c - first implementation of ajax syncronisation
3df9ba6 - fixed pr comments
bb8910c - implemented Caching
44bfcdc Merge pull request #532 in SOREDIWEB/soredi-webservice from SOREDI-708-fix-remaining-issues to develop
bbecb94 - fixed group setting
fef8a42 Merge pull request #531 in SOREDIWEB/soredi-webservice from SOREDI-708-fix-remaining-issues to develop
61bd154 Merge branch 'SOREDI-708-fix-remaining-issues' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-708-fix-remaining-issues
69dbe96 - removed output
4067423 Merge pull request #530 in SOREDIWEB/soredi-webservice from SOREDI-708-fix-remaining-issues to develop
d0f3a0f - removed test output
1dda306 Merge pull request #529 in SOREDIWEB/soredi-webservice from SOREDI-708-fix-remaining-issues to develop
c82aa92 - updated output
e231c49 Merge pull request #528 in SOREDIWEB/soredi-webservice from SOREDI-708-fix-remaining-issues to develop
4e0f2aa - included test output
6888c9f - tryfix
de65a8f - fixed jiraController name
cc69872 - moved some code to JiraController - check if user has group before setting
05654ed Merge pull request #527 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-702-debug.2 to develop
d0a0ad6 - invert
0e4df5f Merge pull request #524 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-702-debug to develop
64df8ba Merge pull request #526 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-707-servicevertrag-nicht-sichtbar to develop
ae46827 - show contract in service
a6578f9 - Refactor updateUser - update calls
b97f307 - rest of TODOs
d686b92 - More refactoring / simplification - Added possible points to make stuff easier / more centralized
dc33041 - Update regarding PR - Some more Refactoring
4a10c6b Merge pull request #523 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-703-timeout-wenn-soredi-server-down to develop
114f823 - Refactored code to reduce duplication - Fixed problem with asking controller for permissions
38e7f65 - add CURL timeout
c46d11b Merge pull request #522 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-700-minor-fixes to develop
9e5a232 - Project key is now depending on settings in Soredi_User - optimized Code - removed unnecessary character - Support-Admin Group is not set on sync
88d481d Merge pull request #521 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-643-meine-falle-sortierung to develop
0c27cc4 - optimized Code - fixed sorting
46875ce Merge pull request #520 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-683-sync-also-all-companies-partners to develop
eb38ba9 - fixed CR Comments
11e9349 - updated sync message - You can work now while syncing - fixed syncing - optimized syncing
c418859 Merge pull request #519 in SOREDIWEB/soredi-webservice from feature/SOREDI-475-add-unit-tests to develop
1aab24d - allow hashValue queries on SQL
dfb227b - add test - draft to add hashValue querying
4063a15 - Add first tests for HasOneDropdownDataSet
082b371 - add some unit-tests for ExtendedDropdown
d7842af Merge pull request #518 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-684-syncjira-methode-sollte-nicht-im-framework-enthalten-sein to develop
649eeea - fixed white screen
74b77d2 - correct typo in invalidArgumentException
ba4aab6 - try implementation to application
2d93cfd - fix mail change
ab8c217 Merge pull request #517 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-687-gaste-seite-optimieren-soredi-raus to develop
49825fb - remove please login
545430c Merge pull request #516 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-687-gaste-seite-optimieren-soredi-raus to develop
bb1b734 - final guest page design
4f02b0d Merge pull request #514 in SOREDIWEB/soredi-webservice from feature/SOREDI-691-taskbook-prozessor-4xx1-91-ghz to master
699671d Merge pull request #515 in SOREDIWEB/soredi-webservice from feature/SOREDI-691-taskbook-prozessor-4xx1-91-ghz to develop
6607e25 - add taskbook 4x1,91
b1a1e2e - improvements guest page
f8f6008 Merge pull request #513 in SOREDIWEB/soredi-webservice from feature/SOREDI-683-sync-also-all-companies-partners to develop
c8e82c9 - add syncing of partners / companies
d8f7b06 Merge pull request #512 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-679-wenn-nutzer-keine-permission_admin-hat-wird-sein-eigener-name-aus- to develop
e5c4b47 - name now only removed if input is not disabled
df98a37 Merge pull request #511 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-681-project-keys-durch-variablen-ersetzen to develop
3766c54 - replaced project_keys - removed project_keys
8712f39 Merge pull request #510 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-682-fix-fatal-error-cannot-use-object-of-type to develop
10c2e0c - fixed fatal error
f0c8ee0 Merge pull request #509 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-677-setpassword-flow-falsch to develop
332ee77 Merge pull request #508 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-678-mail-adresse-andern-von-superuser-auf-users_manage-stellen to develop
a869bdb - changed permission
c5ce138 - fix typo
dad82ce Merge pull request #507 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-677-setpassword-flow-falsch to develop
78db25e - logging for user creation - language for user invitations - fixes for setPassword
10f4609 Merge pull request #506 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-676-problem-creating-user-in-ws to develop
43eb18d - only update jira if intended to be updated
8628a27 Merge pull request #505 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-675-project-not-found to develop
75888e2 - correct redirect
bb97c5e Merge pull request #504 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-675-project-not-found to develop
8302125 - jira projkey correct spelling
bc03f21 Merge pull request #503 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-675-project-not-found to develop
53ab93d - use projeky
6187a3b - key
783cc32 Merge pull request #501 in SOREDIWEB/soredi-webservice from bugfix/issues-null to develop
e3b0de1 Merge pull request #502 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-675-project-not-found to develop
da5226a - project key not found
a2ae401 - fix issues null
cddecfe Merge pull request #500 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-673-testkunde2--kann-fall-nicht-erstellen-weil-kein-nutzer-ausgewahlt to develop
8d38b01 - fixes for not making emails public - fix for user selection
3593aa4 Merge pull request #499 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-673-testkunde-kann-fall-nicht-erstellen-weil-kein-nutzer-ausgewahlt to develop
dd57c53 - correct impl
5585fd1 Merge pull request #498 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-663-zum-technischen-support-safari-komisch to develop
8c13b7d - styling for login page Safari
23683ff Merge pull request #497 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-666-keine-ubersetzung-fehlerhafte-funktion to develop
a1b5768 - correct translation
5899f50 Merge pull request #496 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-667-korrekte-gruppe to develop
27df99d - set jira core users for users who should see all issues but are no support agents
e3ee39d Merge pull request #495 in SOREDIWEB/soredi-webservice from feature/SOREDI-664-webservice-soll-bei-aktualisierung-auch-die-jira-gruppe-setzen to develop
0d829ef - set Group for Support-Admins
73f1bfc Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-354-group-notifications-evtl-broken
dca264f Merge pull request #494 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-659-ws-zum-ticketsystem-beachtet-basis-url-nicht to develop
02d598c - improved code - button link now conditional to settings
395ddf5 Merge pull request #493 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-660-etwas-ist-schief-gelaufen to develop
a8e18bc - fix conversion to string
8258dd3 Merge pull request #212 in MBG/mbg-website from feature/MBG-145-update-cover to develop
7b74e99 - update cover + fix sizing
e38ab6d - tryfix
3f7514b - tryfix
02a7e9c Merge pull request #491 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-642-mail-adressen-anderung-freigeben to develop
42a7b6f - changed permission
50c308b Merge pull request #489 in SOREDIWEB/soredi-webservice from feature/SOREDI-632-set-password-anpassen-es-soll-mit-jira-token-klappen to develop
d4c8d05 CR - better handling of MySQL - Add expiry of requess - change language
25154a3 - Verbesserungen Code Review
dffc250 - correct field to get user from goma - add documentation
b216804 - Set Password extension
ad19097 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-632-set-password-anpassen-es-soll-mit-jira-token-klappen
191fbc2 Merge pull request #488 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-644-falsche-loginurl to develop
a8a373a - UI optimisations
528170a - correct login url for guest support page
beba52c Merge pull request #454 in SOREDIWEB/soredi-webservice from develop-ticket to develop
25bc395 Merge pull request #487 in SOREDIWEB/soredi-webservice from feature/SOREDI-634-bei-user-update-auf-duplikate-prufen to develop-ticket
7eb7816 - blocked duplicated mail addresses
b661d9b Merge pull request #486 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-640-fix-pr-comments-3 to develop-ticket
e8d5501 - fixed comments
84fcd0e - Add controller for setPassword - Add settings to store jira mysql settings
7994841 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
8a53745 Merge pull request #484 in SOREDIWEB/soredi-webservice from feature/SOREDI-631-endpunkt-auf-ws-seite-anpassen to develop-ticket
016fb89 Merge pull request #485 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-637-windows-sso-deaktivierbar to develop
6b9e73f - random password after sso user creation
82c8116 - add option to disable sso
45e05c4 - Integrate sending + parameter to prevent sending
0cb385f Merge pull request #483 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-638-onafterpublish-wird-zu-oft-getriggered to develop-ticket
ac89f90 - Fix syling issue - fix duplicate jira send issues
47cd246 Merge pull request #482 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-625-fix-pr-comments-2 to develop-ticket
3c4f1f7 - tryfix trigger Pending - fix form error js - fix redirection
bab042b - optimized Settings
a208fdd - customfieldids are now setable in settings - when serial is set os and type should be aswell
51525e9 - removed duplicated js code
5dab90d - log jira errors - commented getLastIssuesData
774f5ff - documented filterdeviceservice and filterdevicesupport
1393362 - documented OrganisationExistsInJira - documented and secured getUserOrganisations
020466b - merged duplicate jquery Selectors to variable
627dba2 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
3f9e06e Merge pull request #480 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-608-warum-wird-der-nutzer-aktualisiert-wenn-man-sich-einloggt to develop
6eb1690 - fix issue with references
9ed51f8 - change test
6193b14 Merge pull request #481 in SOREDIWEB/soredi-webservice from add-dev-url to develop-ticket
e0f91c2 - added ibpg url
ed6f6a0 - changes to wasChanged
01377df Merge pull request #479 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-624-ticket-cr-implementation to develop-ticket
cd8f6a1 - included logging
2b26067 - added logging if issueid was not found
a8d46df - removed unnecessary code - improved saveFormInformationFromJira and addServiceFromJira
e63b401 Merge pull request #478 in SOREDIWEB/soredi-webservice from feature/SOREDI-622-designvorschlag-support-gaste-seite to develop-ticket
4ddecb3 - full path for redirect url
efb0a5b - Improved design - Improved Texts - Improved redirect URL
4906927 - improved design - possibility for changing language
cde26ef Merge pull request #477 in SOREDIWEB/soredi-webservice from feature/SOREDI-576-etwas-ist-schief-gelaufen-logging to develop-ticket
f1d7fa0 - optimized code - exception logging if jira connection failes - exception logging if ticket creation failes
db38264 Merge pull request #476 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-621-neuer-fall-nicht-anzeigbar-nach-filter-falle-nach-gerat to develop-ticket
00a0983 - updated SupportController PhpDoc - divided deviceFilter into Form and Result - deviceFilterForm only vanishes - after switching Tab deviceFilter will be reset
9b36f04 Merge pull request #475 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-586-loading-indikator-bei-filter-falle-nach-gerat-hinzufugen to develop-ticket
148faf6 - Verbesserungen Loading
5838cef - jira errors are now displayed if creation of ticket failes
029ea1b - if support issue creation failed - user is going to be rewritten and then it's tried again
34189fd - optimized indicator vanishing - fixed getLastIssuesData if there's no company
3c342e4 - finished support guest page
7e7a445 - second fix getLastIssuesData
c68243e - fix getLastIssuesData
22d3caa - fixed active status of service finishing page - finishing page is now displaying linked issue - inserted comment on service case creation
d0bde38 - support issue description will automatically included in service
f43a785 - service is also active in detail view
7f25987 - lowercased service in url
bdc336c - remove support without device
ff15800 - first draft of support guest page - jira issue now linked in service case detail
cb81af3 - fix Soredi-322 1) and 2)
4a1f561 - tryfix NaN
a817a1b - reincluded displa non setter - renamed setAutorsTag to setAuthorstag - documented sendIssue function - added new saveFormInformaitonFromJira function - updated addServiceFromJira function
8e4eb55 - correct order of exception handling in member.php
52877c9 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
a1a0eec Merge pull request #473 in SOREDIWEB/soredi-webservice from add-dev-url to develop
cc947f9 - added dev as valid sso callback url
b74660a Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
2a4ad0f - first try
d256925 Merge pull request #472 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-577-nan-duplikat-check-safari to develop-ticket
9e2cc8d - implemented moment.js - updated js date reformatting - tryfix bugfix
394e01f Merge pull request #471 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-603-fix-pr-comments to develop-ticket
5b81a54 - fix class call
7c6be08 - fixed CR issues
cb53c34 Merge pull request #210 in MBG/mbg-website from bugfix/MBG-144-mbg-theater-integration to develop
ea5ebbe - correct name for test
453c801 - new design
b749aaa Merge pull request #470 in SOREDIWEB/soredi-webservice from develop to master
45a0619 Merge pull request #469 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-598-pagination-konfigurator-broken to develop
07299bb - fix pagination configurator
015a9ec Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
9981119 Merge pull request #468 in SOREDIWEB/soredi-webservice from develop to master
bb540d5 Merge pull request #467 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-597-br-b-fatal-error-b-call-to-a-member-function-getimage-on-null-in to develop
ecdcf0a - improve stability
3ea0448 Merge pull request #465 in SOREDIWEB/soredi-webservice from develop to master
0379329 Merge pull request #466 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-572-endpunkt-auf-ws-seite-der-die-nutzer-erstellt to develop
f0ee70f - secret required
bce79df Merge pull request #464 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-595-mobile-durch-flexbox-geht-scrolling-mobil-teilweise-nicht-mehr to develop
995a0b2 - fixes for flexbox
ac94307 Merge pull request #463 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-596-sperrung-screen-ohne-design to develop
c022af1 - fixes for lock design
49648ab Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
1368d9c Merge pull request #462 in SOREDIWEB/soredi-webservice from feature/SOREDI-572-endpunkt-auf-ws-seite-der-die-nutzer-erstellt to develop
082b69d - response
e765387 - new API endpoint for creating users and setting passwords
8c61a92 Merge pull request #461 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-591-logout-auf-get-umstellen to develop
8d5d641 - implement logout endpoint for JIRA
5269c19 Merge pull request #460 in SOREDIWEB/soredi-webservice from develop to master
592dac5 - fix for localhost as valid callback
7674edc - added localhost as valid callback
7024d9c Merge pull request #459 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-498-9-label-wird-nicht-gedruckt to develop
e4dbf5e - 9. Label fix
522f0df Merge pull request #458 in SOREDIWEB/soredi-webservice from SOREDI-489-es-sollte-nutzer-geben-die-nur-auf-jira-eigenes-profil-zugriff-haben to develop-ticket
c6a816a - added canSeeDevices and canSeeSoftware in Frontent Controller - you can only see Devices or Software if you have Permission to - even if you access it directly - now you can only see what you are permitted for - bugfix: if you access profile/{id} while beeing not logged in you're now forwarded - if you have no Permission to access the home page you're forwarded to your profile
acbaac6 Merge pull request #457 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-578-nicht-neu-laden-bei-fehlern to develop-ticket
23786c1 - no reload but closing of panels
d8e9c9d Merge pull request #456 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-575-mobile-anpassung-duplikat-check-und-nan to develop-ticket
dc71a8c - improved mobile design
f304bd4 Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
1665508 Merge pull request #455 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-573-wenn-keine-falle-zum-duplikat-check- to develop-ticket
57a329e - no manual check if there are no issues to confirm
5ef1c3a Revert "- no manual check if there are no issues to confirm"
d38d4ce - no manual check if there are no issues to confirm
187e49e Merge pull request #453 in SOREDIWEB/soredi-webservice from feature/SOREDI-569-implementierung-der-uberprufung to develop-ticket
9b9d9fc - implemented department check for companies
2534b22 Merge pull request #452 in SOREDIWEB/soredi-webservice from feature/SOREDI-550-implementierung to develop-ticket
d8c5cc5 - implemented duplication check before sending request
3fa4c4b Merge pull request #450 in SOREDIWEB/soredi-webservice from develop to master
a79a982 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
7df500e Merge pull request #451 in SOREDIWEB/soredi-webservice from framework-merge-171213 to develop
bdb0035 - correct calls for ownRecord
6d1e7f4 - correct clearing
e4ef195 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
3f1d211 Merge pull request #449 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-567-manymany-dropdown-bei-suche-probleme-mit-seiten to develop
e61a3e7 - add method to SQL class
4bbf23a - integrate correct SQL Class - add doc for request getFullPath
9bb2733 - merges from v3
b6161db - fix for ManyMany
42d6969 Squashed 'system/' changes from b78eef1..2d88b0f
212a2ea Merge commit '42d6969f6b959d1b904f55e4048b6a4b0f25fd53' into bugfix/SOREDI-567-manymany-dropdown-bei-suche-probleme-mit-seiten
2be0dd8 Merge pull request #448 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-562-webhook-an-pending-setzen-um-post-request-zu-senden to develop-ticket
b015549 Merge branch 'bugfix/SOREDI-562-webhook-an-pending-setzen-um-post-request-zu-senden' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-562-webhook-an-pending-setzen-um-post-request-zu-senden
8f3f861 - fix post expectations
bfb1378 Merge pull request #447 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-562-webhook-an-pending-setzen-um-post-request-zu-senden to develop-ticket
35d98c2 - fix allowed actions on api
988049e Merge branch 'bugfix/SOREDI-562-webhook-an-pending-setzen-um-post-request-zu-senden' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-562-webhook-an-pending-setzen-um-post-request-zu-senden
0037551 - implemented API for triggerPending
ff0ec8e Merge pull request #446 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-562-webhook-an-pending-setzen-um-post-request-zu-senden to develop-ticket
8725ea9 Merge branch 'bugfix/SOREDI-562-webhook-an-pending-setzen-um-post-request-zu-senden' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-562-webhook-an-pending-setzen-um-post-request-zu-senden
d1bcf31 - removed unnecessary code
79249ab Merge pull request #445 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-562-webhook-an-pending-setzen-um-post-request-zu-senden to develop-ticket
b6f725b - tryfix triggerPending
2473eaf Merge pull request #208 in MBG/mbg-website from bugfix/MBG-141-firefox-macht-probleme-beim-drucken to develop
39f6406 - fix for firefox
803bf94 Merge pull request #206 in MBG/mbg-website from bugfix/MBG-140-categoryview-auf-flexbox-umstellen to develop
ebce7b7 - onBeforeManipulate fixes
9e9fa2e Squashed 'system/' changes from bc5509b..9a3e1d4
5b17464 Merge commit '9e9fa2e7804170e4736b44021c975b97fec93634' into bugfix/MBG-140-categoryview-auf-flexbox-umstellen
dafd33f - flex for categoryview
98185e4 Merge pull request #444 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-525-pending-workflow-soll-reperaturfall-auslosen to develop-ticket
46c00eb - fix status set for jira
af0aa85 Merge pull request #443 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-525-pending-workflow-soll-reperaturfall-auslosen to develop-ticket
da87a31 - fix serial
2a0ea9e Merge pull request #442 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-525-pending-workflow-soll-reperaturfall-auslosen to develop-ticket
af5896b - fix link to service contract
936c16b - fix service creation with deviceid
7b1353c Merge pull request #441 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-528-bei-closing-des-rma-falles-jira-issue-closen to develop-ticket
b66be89 - jira issue is now closed by return of device
200421c Merge pull request #440 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-527-link-generierung-in-jira-zum-webservice to develop-ticket
b6766a3 - fix link generation
83d8f2d Merge pull request #439 in SOREDIWEB/soredi-webservice from feature/SOREDI-527-link-generierung-in-jira-zum-webservice to develop-ticket
8e913c1 - finish link Generation
155a063 Merge branch 'feature/SOREDI-525-pending-workflow-soll-reperaturfall-auslosen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-527-link-generierung-in-jira-zum-webservice
96d0b7e - update link generation
25cb0cd - fix issue update
c7b7d1d Merge pull request #204 in MBG/mbg-website from bugfix/Sendmail to develop
6496c19 - send one mail per second at max.
bbce93d Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-525-pending-workflow-soll-reperaturfall-auslosen
48bae4b - update aonAfterPublish: Service-Link, rma nr
3dc1a41 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
e335ba3 Merge commit 'bf51db29a63c48a47c629d831e5de71202d33e83' into develop
bf51db2 Squashed 'system/' changes from 9754983..b78eef1
890ad3d Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
19af903 Merge pull request #438 in SOREDIWEB/soredi-webservice from bugfix/GOMA-200-onafterpublish-wrong-callextending to develop
9969b63 - correction for onAfterPublish
198f3f3 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
7f09003 - auto close of issue on finishing of service case - creation of rma with link - add. support if no device is available
5b7eb09 Merge pull request #437 in SOREDIWEB/soredi-webservice from feature/GOMA-198-model-events-vereinheitlichen-und-dokumentieren to develop
5d0fe2d - Event fixes
3997de0 - doc
b1753d1 - Add test
80500ff - fix API for Events
1427d4d - Better API for Manipulation Events
8c0ce09 - add pass by reference test
64a3ac9 - fix call by reference
9318904 - Calling parent in framework
7357d56 - Simplify events
7c08eb5 - Better impl
64bbd02 Squashed 'system/' changes from 32a43e9..9754983
1e234e0 Merge commit '64bbd029fbbb46712bd41bc47a9bb63faea86706' into feature/GOMA-198-model-events-vereinheitlichen-und-dokumentieren
77eed27 - Streamline events for DataObject
c8ef3f5 Merge pull request #436 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-503-serialdropdown-suche-nach-monat-etc to develop-ticket
0f734db Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-503-serialdropdown-suche-nach-monat-etc
5673072 Merge pull request #435 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-560-error-des-hasone-dropdown-der-reparaturen to develop-ticket
288340e Fix Problem with non-lowercase-has-one-relationships in ExtendedDropdown
e0b2e08 - first implementation of pending workflow solution
d3545a7 Merge pull request #434 in SOREDIWEB/soredi-webservice from feature/SOREDI-476-implement-endless-scroll to develop-ticket
ec28410 - fix for endless scrolling
344cc94 Merge pull request #433 in SOREDIWEB/soredi-webservice from feature/SOREDI-476-implement-endless-scroll to develop-ticket
161ffb8 - Implement Infinite Scrolling - Update interfaces regarding endless scrolling
9f0da31 Merge pull request #202 in MBG/mbg-website from bugfix/MBG-116-bilde to develop
a8ad647 - Upgrade FancyBox
78050a5 Merge pull request #432 in SOREDIWEB/soredi-webservice from feature/SOREDI-557-loading-spinner to develop-ticket
a676909 - White Space - Add Spinner to ExtendedDropdown
72829b6 - Fix problem with double encoding in HTML Node
154edd4 Merge pull request #200 in MBG/mbg-website from bugfix/MBG-137-addclass-macht-probleme to develop
2434fdb - change how to add class to flexbox
d4ee8c4 Merge pull request #431 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-503-serialdropdown-suche-nach-monat-etc to develop-ticket
37e4942 - recognition should be fixed - loading currently up do 4 seconds if sth is found (not instantly loading)
ee69418 Merge pull request #430 in SOREDIWEB/soredi-webservice from feature/SOREDI-556-jira-fur-admins-im-ws-einbinden to develop-ticket
aa69ea4 - Added jira_icon (free usage) - added link for admins to jira backend login - added link for users to jira customer login
1f48fa3 Merge pull request #198 in MBG/mbg-website from bugfix/GOMA-196-history-erweitert-sich-unendlich to develop
a7475c9 Squashed 'system/' changes from acefd8e..bc5509b
c3151b6 Merge commit 'a7475c98825264deca8215d4f9d9cc671a338530' into bugfix/GOMA-196-history-erweitert-sich-unendlich
fc2dc91 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
8f21e3e Merge pull request #429 in SOREDIWEB/soredi-webservice from bugfix/GOMA-196-history-erweitert-sich-unendlich to develop
440c923 - Use endless scrolling for history
cc4aa4c Merge pull request #428 in SOREDIWEB/soredi-webservice from SOREDI-547-onbeforewrite-wird-teilweise-ausgefuhrt-obwohl-keine-connection-definiert-ist to develop-ticket
d4a37ec - removed unnecessary comments - fixed onbeforewrite jira connection issue
a79e820 Merge pull request #427 in SOREDIWEB/soredi-webservice from SOREDI-338-sync-aller-ws-nutzer-mit-jira to develop-ticket
73d2440 - implemented soredi user syncrhonisation for jira
26349b3 - outsourced right panel of overview - improved file structure of admin overview
375593f - outsourced overview
19983df Revert "- outsourced overivew"
df6b12f - outsourced overivew
1d23525 Merge pull request #426 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-549-wenn-fehler-bei-ws-supportformular-angezeigt to develop-ticket
9ec6981 - form opens automatically on error
048a694 Merge pull request #425 in SOREDIWEB/soredi-webservice from feature/SOREDI-522-geratelinks-umsetzung-im-webservice to develop-ticket
fb232c9 - support for device link field in jira - fix support form
7d0d61c Merge pull request #424 in SOREDIWEB/soredi-webservice from feature/SOREDI-470-partner-kunden-sollten-vom-namen-einzigartig-sein to develop-ticket
a83eb7b - no duplicate on partner/company possible anymore
64e3f24 - removed unnecessary organisation code - fixed DO-filter on get_one
3a43fe6 Merge pull request #423 in SOREDIWEB/soredi-webservice from feature/SOREDI-462-onbeforewrite-user-jira-aktualisieren to develop-ticket
2f475be - fixed no loggedin user
0b72399 - refactor toArray
e8cbd6e - try fix jira-connection error throwing
c680432 - onBeforeWrite on Soredi_user - onBeforeWrite on Company and Partner
a67675e Merge pull request #422 in SOREDIWEB/soredi-webservice from SOREDI-539-id-aus-liste-von-support-fallen-entfernen to develop-ticket
b9382c5 - removed id from all support case tables - fixed search by device serial
c1c67b3 Merge pull request #421 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-537-fix-auto-fill-on-issue-creation-with-device-id to develop-ticket
87ad132 - Improve getPossibleValuesAsync (SOREDI-538)
e7f9597 - fix setValue and getValue for ExtendedDropdown - Fix getPossibleValuesAsync for ExtendedDropdown (SOREDI-538)
6256fb3 - removed console.logs
08b9adc - try fix auto fill
1f74d4f - fixed auto fill on auto issue creation - removed test logs js
c08db96 Merge pull request #420 in SOREDIWEB/soredi-webservice from framework-171122 to develop
5087c59 Merge commit '0ffd01d1648c93c9458469103c55c672ba393d5f' into framework-171122
0ffd01d Squashed 'system/' changes from 5cac92b..32a43e9
40eaf0a Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
8f01874 Merge pull request #417 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-518-auto-creation-for-device-problem-with-extended-dropdown to develop-ticket
62b4ba3 Merge pull request #418 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-481-gerate-vorlagen-alphabetisch-sortieren to develop
74d4255 - device templates are sorting now by template_name
45ed003 - Fix for Auto Selecting Device Serial from URL
607f536 Merge pull request #416 in SOREDIWEB/soredi-webservice from feature/SOREDI-532-wenn-man-ein-gerat-bearbeitet-sollte-man-support-fall-erstellen-konnen to develop-ticket
e0356cd - removed test js-log - now can create support issue while editing a device
3eb7149 Merge pull request #415 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-512-support-liste-innerhalb-des-gerates-zeitlich-absteigend-sotieren to develop-ticket
2a37546 - ordered by updated then created
d52c83f Merge pull request #414 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-535-betriebssystem-device-type-kein-pflichtfeld to develop-ticket
89a9ff9 - device type and os are now inputs - both fields are now optional
cb17588 Merge pull request #197 in MBG/mbg-website from feature/MBG-136-selectsqlfield-verbessern to develop
819c369 - JSON fix
bfa01ee - more specific exception
43bd07b - fixes for Select + Radios
e064acb Merge pull request #413 in SOREDIWEB/soredi-webservice from SOREDI-512-support-liste-innerhalb-des-gerates-zeitlich-absteigend-sotieren to develop-ticket
5d693b1 - ordered list by created field
5d64614 Merge pull request #412 in SOREDIWEB/soredi-webservice from hotfix/SOREDI-530-uc-version-entfernen to develop-ticket
9ab2c13 - Removed Field UC-Version
44da27b Merge pull request #196 in MBG/mbg-website from bugfix/MBG-135-checkbox-problem to develop
846043a - Fixed for conversion of field types to SQL Types and castings
ae8a0a7 Merge commit 'f05938d549cacc4b35dfcfd2f72bae8194d7d458' into bugfix/MBG-135-checkbox-problem
f05938d Squashed 'system/' changes from 9ae4cd9..acefd8e
6861664 Merge commit 'c6188cf956751bc95439f2ed837304cd183a393a' into bugfix/MBG-135-checkbox-problem
c6188cf Squashed 'system/' changes from 6b17385..9ae4cd9
90f64dc - fix template issue
f180f29 Merge pull request #410 in SOREDIWEB/soredi-webservice from feature/SOREDI-443-druck-tausch-zweier-felder-bei-sh-labels to develop
b59294f Merge pull request #411 in SOREDIWEB/soredi-webservice from feature/SOREDI-443-druck-tausch-zweier-felder-bei-sh-labels to master
cf0b06f - tausch von Typ / Serial
d6b1941 Merge pull request #409 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-511-serialdropdown-fuhrt-zu-performance-problemen to develop-ticket
80eb7f2 - improved code by replacing for with foreach
7581bc7 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
b05bb8a Merge pull request #408 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-473-datetime-null-does-not-cast-to-datetimesqlfield to develop
f0db32f - correct generation
41feb0f - db field stability
57c3aff - HTMLNode merged
d30eed2 Merge pull request #407 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-510-extendeddropdown-fur-die-devicetypes-bei-der-value-die-klam to develop-ticket
ced3f05 - fix for problem with quots
ddc7c99 - Improved Performance - Improved Error Message
0317eab Merge pull request #406 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-503-serialdropdown-suche-nach-monat-etc to develop-ticket
d38de09 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
cf7e2bf - fix bug on serial select
2d047af Revert "- fix bug on serial select"
f728f6f - fix bug on serial select
f5db79f Merge pull request #405 in SOREDIWEB/soredi-webservice from feature/SOREDI-503-serialdropdown-suche-nach-monat-etc to develop-ticket
101cfcf - Serial Recognition for all devices
a85ce93 - tried first implementation of serial recognition
dd5a361 Merge pull request #404 in SOREDIWEB/soredi-webservice from upgradeframework-20171117 to develop
d1983ea - merge
c06f66b Squashed 'system/' changes from af36248..5cac92b
858dd66 Merge commit 'c06f66baad4f129b989fbfaec6404e53c6e31db2' into upgradeframework-20171117
469a156 Squashed 'system/' changes from ec5e7e2..af36248
543aad7 Merge commit '469a156ef3a2e7ba69bf0f38f5b586307fd3536e' into upgradeframework-20171117
f629c90 Merge pull request #402 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
96b762a - form opens when issue's created by device
93feaf7 - fix design dropdown
47a9ca0 - finished device-filter update
a574fe1  - updated device-filter - improved code - deleted unused functions
0ff69d2 - update
336fa45 - stronger disabled mode SOREDI-501
a2a7f26 - fix SOREDI-504 Placeholder for Select
38ffe95 Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
c4e4f43 - update
03eeb73 - add option to set a placeholder for Select
f078f0e - Add placeholder to HasOneDropdown - Fix Notice for HTMLNode
c58372c Merge pull request #401 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-500-clearoptions-und-removeoption-uberprufen to SOREDI-384-weitere-anpassungen
ec15eeb Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
53acdf6 - update
4008e10 Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-500-clearoptions-und-removeoption-uberprufen
19ba17b Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
95d2ad5 Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into bugfix/SOREDI-500-clearoptions-und-removeoption-uberprufen
0239331 Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
d2e597a - update
8687542 Merge pull request #400 in SOREDIWEB/soredi-webservice from feature/SOREDI-478-styling to develop-ticket
c75362c - styling
4c90578 Merge pull request #399 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
c7863a4 - Refresh Options after removing
18a8bdb Merge pull request #398 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-499-backslashes-in-css-class-ersetzen to SOREDI-384-weitere-anpassungen
ba9333c - reformat clusterformfield - remove _ajax in ID
e25eda1 - fix backslash issue - add InvalidArgument for HTMLNode backslash in classname - add tests for that
e61ec2e Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
b883e83 - update
49e2044 Merge pull request #397 in SOREDIWEB/soredi-webservice from feature/SOREDI-494-api-von-select-um-setoptions-addoption-removeoptions-removeopti to SOREDI-384-weitere-anpassungen
c2310d3 - add better API
7456572 - Improve Resource Handling
f600b46 Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
22f05fb - update
59f7a98 Merge pull request #396 in SOREDIWEB/soredi-webservice from feature/SOREDI-491-disable-enable to SOREDI-384-weitere-anpassungen
426d0cd - bind disable / enable to API
5a0b157 Merge pull request #394 in SOREDIWEB/soredi-webservice from feature/SOREDI-479-onchange-event to SOREDI-384-weitere-anpassungen
711ad03 - Add Hints for Julian - Improve API of ExtendedDropdown - When throwing an exception in onCreate, error is alerted.
bee2229 Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
5b66f7c - Add test for API of SOREDI-486
21b7fc5 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
24fb2c5 Merge pull request #392 in SOREDIWEB/soredi-webservice from develop to master
4b87c1f Merge pull request #390 in SOREDIWEB/soredi-webservice from develop to master
81270c2 - undo more
9b004f6 - undo getListDisplayFields limitation
d6cc1ea - tried implementation of dropdown
d3fba3f Merge pull request #388 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
0220cea Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
1eede87 Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
5f5bf28 - jira query now conditional to projectid
2a20bf1 Merge pull request #387 in SOREDIWEB/soredi-webservice from develop to master
3b145b5 Merge pull request #385 in SOREDIWEB/soredi-webservice from feature/SOREDI-474-add-to-hasonedropdown to develop-ticket
dfc4098 - fix problem
712ac0d - fix problem in HasOneDropdownDataSource with empty dropdown
4dac040 - Activation for HasOneDropdown
9cb2a11 Merge pull request #384 in SOREDIWEB/soredi-webservice from feature/SOREDI-452-implement-first-draft to develop-ticket
2877b23 - more on Extended Dropdown
febbecc Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-452-implement-first-draft
2e94f7d Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
53830ad Merge pull request #382 in SOREDIWEB/soredi-webservice from develop to master
a94dc31 - commit changes
b902d55 - Add test for failed
3abc9d0 Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-452-implement-first-draft
978f078 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
946115a - Add and enable more options
29ab654 Merge pull request #379 in SOREDIWEB/soredi-webservice from develop to master
87ecb92 Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-452-implement-first-draft
2e5b40d Merge pull request #378 in SOREDIWEB/soredi-webservice from feature/SOREDI-469-onafterwrite-onafterwritemanymany to SOREDI-384-weitere-anpassungen
818a772 - Docs
eb5d13c - call onAfterWriteManyMany only once
0d9182a - Vereinheitlichung Events
20d8b28 Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
711d02f - fix request problem $finished is request
5d4fcaf - fixed lang - fixed RMA naming
127c9b4 Merge pull request #376 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
2a8d49a - renamed "Reparatur-Fall" to "Reparatur-Auftrag - changed Support icon - removed baseuri in js
4c58081 - Fix namespace issue - Simplify printAddForm to generate Device Type
cea6197 - renamed support to service - added possibility to create issue from serial number
db30564 - Basic Searching
a50c333 Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-452-implement-first-draft
8cd1e09 Merge pull request #375 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
ff10126 - improved userFilter
912b2b8 - correct impl for repair list
2b712ac Merge pull request #374 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
ec42299 - fix permission
f53d31c Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
6b9392a - improved Filter device (full ajax)
5f21337 Merge pull request #373 in SOREDIWEB/soredi-webservice from develop to master
ba0c07a Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-452-implement-first-draft
000aa4c - en us merge
ee4bdd7 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
249e053 Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-452-implement-first-draft
af0403c Merge pull request #370 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-458-history-broken to develop
b978be5 - complete translation en-us
700c873 - count problem
8bc9881 Merge commit '54cd91637e762db8ffe116fc6d42795d6434efbc' into bugfix/SOREDI-458-history-broken
54cd916 Squashed 'system/' changes from 022ad65..7d25211
9339357 - fixes for history
0c2ad23 Merge pull request #369 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-444-arguments-with-dots-like-company.title to develop
23e0ef6 - Docs and Cleanup
5d1e3a3 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
4481382 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
7bd5c70 Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into feature/SOREDI-452-implement-first-draft
6c4e5da - fix class naming
9bd480f - dupl
d74a1e3 - add support for rhino
0d1a08d - remove dupl
49c5aca - Permission fixes
3e8ea73 Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
69c55f7 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
19babc9 - add disable options preps
46bff30 - Coding guidlines - Add on and off for form
02aa4c1 - remove unused api
44eae85 Merge pull request #364 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
42b57a3 - implemented Support panel in device overview for admin and user
994192a Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
7dc0f3c Merge pull request #363 in SOREDIWEB/soredi-webservice from develop to master
aeed488 - switch to selectize as select engine
d924ad1 - remove comment
70052cd - Add Selectsize - Add more Interface work - Try selectize for select input
6787e31 - push
9312014 - First interface definition
c4da8c6 Merge pull request #361 in SOREDIWEB/soredi-webservice from develop to master
623c071 Merge pull request #359 in SOREDIWEB/soredi-webservice from develop to master
d4f235b Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
6038b3b Merge pull request #357 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
16e240e - fix Name check
77d46be Merge pull request #356 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
763c9f0 - fix user check
dca8d67 Merge pull request #354 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
e421050 - auto-removing ending slash from jira_url
f2ae43e Merge pull request #353 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
f38dd6f Merge branch 'SOREDI-384-weitere-anpassungen' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
bc5d3c1 - implemented critical error - implemented JiraConnectionTest on Startup - implemented error message if creation fails - undo DeviceController changes - imroved serial check
28673c5 Merge pull request #352 in SOREDIWEB/soredi-webservice from develop to master
e10b8d6 Merge pull request #350 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
37dfa2a Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
881a0b1 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
4a4e97c Merge pull request #349 in SOREDIWEB/soredi-webservice from develop to master
b0e8f56 Merge pull request #347 in SOREDIWEB/soredi-webservice from develop to master
0a5806b Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
dc443a6 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
2a670d0 - Documentation + correct variable naming
8ac0872 - update
f8a7e4a - finish orgas - converted sync calls to async
f4bedac - Change resolve/reject - Add function body
9693ed6 - Fix JSON Issue
897d79e Merge branch 'develop-ticket' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into SOREDI-384-weitere-anpassungen
ac3826f Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
5ff2415 Merge pull request #341 in SOREDIWEB/soredi-webservice from develop to master
5f71a71 Merge pull request #344 in SOREDIWEB/soredi-webservice from feature/SOREDI-432-netzteil-110-230-vac-120-w to master
3ebf61e - update
f2afefb Merge pull request #337 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
0d44482 - fix listonly return false
3314352 - documentation - removed console.log
e35a173 - fix login check - add TODOs for SOREDI-424
8b618c7 Merge pull request #334 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-418-wenn-ein-nutzer-nur-fur-sich-support to develop-ticket
b663af0 - Example for Async SOREDI-417
5b228b7 Merge pull request #333 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-420-fix-notice-und-andere-verbesserungen to develop-ticket
052abbc - Add TODOs - Some Documentation - Fix Notice
fc280b8 Merge pull request #332 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-419-wenn-nutzer-ausgeloggt-dann-kommt to develop-ticket
814b11b Merge branch 'bugfix/SOREDI-416-fix-validation' into bugfix/SOREDI-419-wenn-nutzer-ausgeloggt-dann-kommt
5c01a60 - use request->userHasPermission instead of Member::$loggedIn->hasPermission
7d16a71 Merge pull request #330 in SOREDIWEB/soredi-webservice from bugfix/SOREDI-416-fix-validation to develop-ticket
557287a - fix validation notice
2f29c97 Merge pull request #328 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
8cf409e - fix user creation and data saving on non-input forms
41e796e - email change
2ae1389 Merge branch 'develop' of https://repo.goma-cms.org/scm/sorediweb/soredi-webservice into develop-ticket
d94277f Merge pull request #325 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
52ad054 - fix undefined error on empty uc field - fix renaming after user creation
47bebc0 Merge pull request #324 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
6276874 - update Mobile
c5ae617 Merge pull request #323 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
8394c8e - undo spaceship op
dd07161 Merge pull request #322 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
2deea58 - final fixes & update
4c50c0c - update
a6f0dae - organisations working
56f032a - update
fdb9870 Merge pull request #321 in SOREDIWEB/soredi-webservice from SOREDI-384-weitere-anpassungen to develop-ticket
b7a7edd - renamed skeys to uc version - autofill form on serial-number input
c023eb0 Merge pull request #319 in SOREDIWEB/soredi-webservice from develop to develop-ticket
f4cddc3 Merge pull request #315 in SOREDIWEB/soredi-webservice from develop to develop-ticket
3d2e8df - update
4db97e2 - removed unnecessary code
fc110fa Merge pull request #311 in SOREDIWEB/soredi-webservice from SOREDI-357-erstellung-einer-schnittstelle to develop-ticket
aa5e838 - update
1e10ef4 - update
66572d4 - customername and serial verification now by ajax
b1436b8 - update
9c20be1 - update
872076e - update
cc40828 Merge pull request #310 in SOREDIWEB/soredi-webservice from master to develop-ticket
cc7abe5 - update
41c1a62 - implemented JiraController
871173e Merge pull request #306 in SOREDIWEB/soredi-webservice from feature/SOREDI-366-erstellung-von-support-modulen to develop-ticket
073e2b3 - view Permission in main menu: canSeeSupport for Support, canSeeService for Service (CHANGE!) - new possibility to get all available devices in Soredi_DeviceController::generate_edit_table() - repaired active select in main menu - new Permissions for SupportController - implemented Support in Webservice based on permissions - improved form-style
9a5034f Merge pull request #305 in SOREDIWEB/soredi-webservice from develop to develop-ticket
3065930 no message

git-subtree-dir: system
git-subtree-split: fd409041f3a56b35e688f7f41e7f25506fe49b94

Jira issues

IssueDescriptionStatus
286 more issues…
Unknown Issue TypeGOMA-196Could not obtain issue details from Jira
Unknown Issue TypeGOMA-198Could not obtain issue details from Jira
Unknown Issue TypeGOMA-200Could not obtain issue details from Jira
Unknown Issue TypeGOMA-207Could not obtain issue details from Jira
Unknown Issue TypeGOMA-209Could not obtain issue details from Jira

Shared artifacts

Artifact File size
DB Config 372 bytes
Config 579 bytes
MySQL Dump 277 KB
Framework 15 MB
CMS 489 KB