Skip to content

Commit 9da33d4

Browse files
adobeDanadobeDan
authored
Merge pull request #219 from adobe-apiplatform/v2
prepare for 2.1.1rc2 build
2 parents 06f1784 + d546256 commit 9da33d4

File tree

227 files changed

+11850
-1971
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+11850
-1971
lines changed

‎Makefile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1+
USE_WHEEL := no
12
RM := rm -rf
2-
MKDIR := mkdir
3-
python_ldap_requirements := misc/build/python-ldap-requirements.txt
43

54
ifeq ($(OS),Windows_NT)
65
output_file_extension = .pex
76
rm_path := $(shell python -c "import distutils.spawn; print(distutils.spawn.find_executable('rm'))")
87
ifeq ($(rm_path),None)
98
RM := rmdir /S /Q
10-
endif
11-
mkdir_path := $(shell python -c "import distutils.spawn; print(distutils.spawn.find_executable('mkdir'))")
12-
ifeq ($(mkdir_path),None)
13-
MKDIR := md
149
endif
1510
python_arch := $(shell python -c "import platform; print platform.architecture()[0]")
1611
ifeq ($(python_arch),64bit)
1712
python_ldap_requirements := misc/build/Win64/python-ldap-requirements.txt
13+
USE_WHEEL := yes
1814
endif
1915
endif
2016

@@ -24,15 +20,21 @@ output_filename = user-sync
2420
pex:
2521
pip install --upgrade pip
2622
pip install pex requests wheel
27-
pip wheel -w wheelhouse -r $(python_ldap_requirements)
28-
-$(MKDIR) wheelhouse
2923
-$(RM) $(output_dir)
24+
ifeq ($(USE_WHEEL),yes)
25+
pip wheel -w wheelhouse -r $(python_ldap_requirements)
3026
pex \
3127
-v -o $(output_dir)/$(output_filename)$(output_file_extension) -m user_sync.app \
3228
-f wheelhouse \
3329
--disable-cache \
3430
--not-zip-safe .
3531
-$(RM) wheelhouse
32+
else
33+
pex \
34+
-v -o $(output_dir)/$(output_filename)$(output_file_extension) -m user_sync.app \
35+
--disable-cache \
36+
--not-zip-safe .
37+
endif
3638

3739
test:
3840
nosetests --no-byte-compile tests

‎RELEASE_NOTES.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ These notes apply to v2.1.1rc1 of 2017-06-06.
44

55
## New Features
66

7-
There are no new features in this release; bug fixes only.
7+
To address [Issue 198](https://github.com/adobe-apiplatform/user-sync.py/issues/198), we have added support for [private key encryption](https://github.com/kjur/jsrsasign/wiki/Tutorial-for-PKCS5-and-PKCS8-PEM-private-key-formats-differences) in both PKCS#5 and PKCS#8 formats, and allowed the passphrase for an encrypted private key to be stored in the platform secure credential store. See [the docs](https://adobe-apiplatform.github.io/user-sync.py/) for details on the new feature.
88

99
## Bug Fixes
1010

@@ -14,8 +14,6 @@ User Sync no longer crashes if a user's LDAP email address is present but empty:
1414

1515
The proper packages were not present for secure credential storage on Linux platforms: [Issue 199](https://github.com/adobe-apiplatform/user-sync.py/issues/199).
1616

17-
Still to come: a fix for secure key storage on Windows: [Issue 198](https://github.com/adobe-apiplatform/user-sync.py/issues/198).
18-
1917
## Compatibility with Prior Versions
2018

21-
This version is fully backward-compatible with version 2.1.
19+
This version is fully backwards-compatible with version 2.1.

‎docs/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# You can create any custom variable you would like, and they will be accessible
1515
# in the templates via {{ site.myvariable }}.
1616
title: User Sync
17-
email: [email protected]
17+
email:
1818
description: > # this means to ignore newlines until "baseurl:"
1919
User Sync is a tool for synchronizing Adobe customer directories
2020
with their Adobe Admin Consoles via the User Management API.

‎docs/_includes/footer.html

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +0,0 @@
1-
<footer class="site-footer">
2-
3-
<div class="wrapper">
4-
5-
<h2 class="footer-heading">{{ site.title | escape }}</h2>
6-
7-
<div class="footer-col-wrapper">
8-
<div class="footer-col footer-col-1">
9-
<ul class="contact-list">
10-
<li>
11-
{% if site.author %}
12-
{{ site.author | escape }}
13-
{% else %}
14-
{{ site.title | escape }}
15-
{% endif %}
16-
</li>
17-
{% if site.email %}
18-
<li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
19-
{% endif %}
20-
</ul>
21-
</div>
22-
23-
<div class="footer-col footer-col-2">
24-
<ul class="social-media-list">
25-
{% if site.github_username %}
26-
<li>
27-
{% include icon-github.html username=site.github_username %}
28-
</li>
29-
{% endif %}
30-
31-
{% if site.twitter_username %}
32-
<li>
33-
{% include icon-twitter.html username=site.twitter_username %}
34-
</li>
35-
{% endif %}
36-
</ul>
37-
</div>
38-
39-
<div class="footer-col footer-col-3">
40-
<p>{{ site.description | escape }}</p>
41-
</div>
42-
</div>
43-
44-
</div>
45-
46-
</footer>

‎docs/_includes/header.html

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
<header class="site-header" role="banner">
2+
<div>
3+
<div class="wrapper-header">
24

3-
<div class="wrapper">
5+
<a class="site-title" href="{{ "/" | relative_url}}">{{ site.title | escape }}</a>
46

5-
<a class="site-title" href="{{ "/" | relative_url}}">{{ site.title | escape }}</a>
7+
<nav class="site-nav">
68

7-
<nav class="site-nav">
8-
<span class="menu-icon">
9-
<svg viewBox="0 0 18 15" width="18px" height="15px">
10-
<path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
11-
<path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
12-
<path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
13-
</svg>
14-
</span>
15-
16-
<div class="trigger">
17-
{% for my_page in site.pages %}
18-
{% if my_page.advertise %}
19-
<a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.advertise | escape }}</a>
20-
{% endif %}
21-
{% endfor %}
22-
</div>
23-
</nav>
9+
<div class="trigger">
10+
{% for my_page in site.pages %}
11+
{% if my_page.advertise %}
12+
{% comment %}<a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.advertise | escape }}</a>{% endcomment %}
13+
{% endif %}
14+
{% endfor %}
15+
</div>
16+
</nav>
2417

18+
</div>
2519
</div>
2620

2721
</header>

‎docs/_includes/post-nav-area.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<hr/>
2+
<ul>
3+
{% capture lang %}/{{page.lang}}/{%endcapture%}
4+
<li><a href="{{page.url | relative_url | replace: lang, '/de/'}}">Deutsch</a></li>
5+
<li><a href="{{page.url | relative_url | replace: lang, '/en/'}}">English</a></li>
6+
<li><a href="{{page.url | relative_url | replace: lang, '/es/'}}">Español</a></li>
7+
<li><a href="{{page.url | relative_url | replace: lang, '/fr/'}}">Français</a></li>
8+
<li><a href="{{page.url | relative_url | replace: lang, '/jp/'}}">日本語</a></li>
9+
</ul>

‎docs/_layouts/default.html

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<!DOCTYPE html>
2+
<html lang="{{ page.lang | default: site.lang | default: "en" }}">
3+
4+
{% include head.html %}
5+
6+
<body>
7+
8+
{% include header.html %}
9+
10+
<main class="page-content" aria-label="Content">
11+
12+
<div>
13+
<div class="nav-area">
14+
<ul>
15+
16+
{% assign current_level = 1 %}
17+
{% assign page_list = (site.pages) %}
18+
{% assign filtered_list = page_list | where_exp: 'page', "page.nav_level > 0" %}
19+
{% for my_page in filtered_list %}
20+
{% comment %}---{{my_page.lang}} --- {{my_page.url}} --- {{my_page.nav_order}}<br/>{% endcomment %}
21+
{% endfor %}
22+
23+
{% assign final_list = filtered_list | sort: 'nav_order' %}
24+
{% capture lang %}/{{ page.lang }}/{% endcapture %}
25+
{% for my_page in final_list %}
26+
{% if my_page.nav_link and my_page.nav_link != blank and my_page.lang and my_page.lang != blank and my_page.url contains lang %}
27+
{% if my_page.nav_level > current_level %}
28+
<ul>
29+
{% assign current_level = my_page.nav_level %}
30+
{% elsif my_page.nav_level < current_level %}
31+
</ul>
32+
{% assign current_level = my_page.nav_level %}
33+
{% endif %}
34+
{% if my_page.url == page.url %}
35+
<li><a class="page-link selected-page-link" href="{{ my_page.url | relative_url }}">{{ my_page.nav_link | escape }}</a></li>
36+
{% else %}
37+
<li><a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.nav_link | escape }}</a></li>
38+
{% endif %}
39+
{% endif %}
40+
{% endfor %}
41+
</ul>
42+
{% include post-nav-area.html %}
43+
</div>
44+
<div class="wrapper">
45+
{{ content }}
46+
</div>
47+
</div>
48+
</main>
49+
50+
{% include footer.html %}
51+
52+
</body>
53+
54+
</html>

‎docs/_layouts/home.html

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
layout: default
3+
---
4+
5+
<div class="home">
6+
7+
<h1 class="page-heading">Posts</h1>
8+
9+
{{ content }}
10+
11+
<ul class="post-list">
12+
{% for post in site.posts %}
13+
<li>
14+
{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
15+
<span class="post-meta">{{ post.date | date: date_format }}</span>
16+
17+
<h2>
18+
<a class="post-link" href="{{ post.url | relative_url }}">{{ post.title | escape }}</a>
19+
</h2>
20+
</li>
21+
{% endfor %}
22+
</ul>
23+
24+
<p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | relative_url }}">via RSS</a></p>
25+
26+
</div>

‎docs/_layouts/page.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
layout: default
3+
---
4+
<article class="post">
5+
6+
<header class="post-header">
7+
<h1 class="post-title">{{ page.title | escape }}</h1>
8+
</header>
9+
10+
<div class="post-content">
11+
{{ content }}
12+
</div>
13+
14+
</article>

‎docs/_layouts/post.html

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
layout: default
3+
---
4+
<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
5+
6+
<header class="post-header">
7+
<h1 class="post-title" itemprop="name headline">{{ page.title | escape }}</h1>
8+
<p class="post-meta">
9+
<time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">
10+
{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
11+
{{ page.date | date: date_format }}
12+
</time>
13+
{% if page.author %}
14+
• <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>
15+
{% endif %}</p>
16+
</header>
17+
18+
<div class="post-content" itemprop="articleBody">
19+
{{ content }}
20+
</div>
21+
22+
{% if site.disqus.shortname %}
23+
{% include disqus_comments.html %}
24+
{% endif %}
25+
</article>

0 commit comments

Comments
 (0)