Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch 3.0 #1628

Merged
merged 14 commits into from May 13, 2019

Conversation

Projects
None yet
2 participants
@cornelinux
Copy link
Member

commented May 13, 2019

We fixed all open issues for 3.0.1, so we can merge it again into master.

Well, in master we will probably set the version in setup.py to 3.1dev1 then.

cornelinux and others added some commits May 12, 2019

Open all accordions when filtering
when filtering in the policy details starting to filter
will open all accordions.

The filter is not case-insensitive.

Closes #1558
Merge pull request #1622 from privacyidea/1558/open-all-accordions
Open all accordions when filtering
Merge pull request #1621 from privacyidea/1620/custom-templates-language
Allow to use the browserLanguage in custom templates
Merge pull request #1627 from privacyidea/1626/hide-links-in-menu
Hide the support-links also in the menu

@cornelinux cornelinux requested a review from fredreichbier May 13, 2019

Show resolved Hide resolved Changelog Outdated
Show resolved Hide resolved doc/conf.py Outdated
@codecov

This comment has been minimized.

Copy link

commented May 13, 2019

Codecov Report

Merging #1628 into master will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1628      +/-   ##
==========================================
+ Coverage   96.94%   96.98%   +0.04%     
==========================================
  Files         148      148              
  Lines       17738    17842     +104     
==========================================
+ Hits        17196    17304     +108     
+ Misses        542      538       -4
Impacted Files Coverage Δ
privacyidea/api/auth.py 95.95% <0%> (+0.22%) ⬆️
privacyidea/lib/eventhandler/base.py 98.65% <0%> (+2.65%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0a21fd1...656fe46. Read the comment docs.

@fredreichbier
Copy link
Member

left a comment

Thanks! Will merge when Travis is done.

@fredreichbier

This comment has been minimized.

Copy link
Member

commented May 13, 2019

Travis has run successfully, but github doesn't know. Merging!

@fredreichbier fredreichbier merged commit d01b573 into master May 13, 2019

1 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
ci/circleci Your tests passed on CircleCI!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.