Merge branch 'master' into dev/perf
Conflicts:
plugins/kolab_tags/lib/kolab_tags_engine.php
Description
Description
Details
Details
- Provenance
machniak Authored on Dec 19 2018, 9:52 AM machniak Pushed on May 16 2019, 8:52 AM machniak Pushed on Dec 19 2018, 12:27 PM - Parents
- rRPK4fbe264facdb: Fix obvious typo in regexp
rRPK7d1b199034a3: Performance: Load tags UI (and initialize configuration folder/cache) on when… - Branches
- Unknown
- Tags
- Unknown
- Build Status
Buildable 21756
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- 4fbe264facdb Fix obvious typo in regexpAuthor
- 00e04d2f95b6 Update translationsAuthor
- b5dceb45aa11 Fix small regressionAuthor
- 868d15c4a23f Fix PHP 7.3 warningAuthor
- 6d66212f5d77 Add margin to SSO buttonsAuthor
- 37b89deb34d8 Bump version numbers to 3.4.1Author
- a857b3cd29ac Remove duplicate label referencesAuthor
- 645e62bf966c Elastic: Small sizeing issueAuthor
- 78dce88a9c19 Merge branch 'dev/sso'Author
- cf50715f4f1c SSO: Skip redundant session updateAuthor
- 3c0d00ef6768 SSO: Add some more documentationAuthor
- 359f76e9d288 SSO + LDAP (global addressbook)Author
- 2efad4865753 SSO + SMTPAuthor
- a53f1283f5c1 Kolab SSO plugin - initial commitAuthor
- 207d21e78ec9 Bump Chwala versionAuthor
- 581df74e8300 Use Chwala's autocomplete serviceAuthor
Very Large Commit
This commit is very large, and affects more than 1000 files. Changes are not shown.