Merge remote-tracking branch 'upstream/dev' into patch-4 (681cb29a) · Commits · Hexang 息壤平台 / persona · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

persona
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

681cb29a

Commit 681cb29a authored 12 years ago by Thomas Grainger

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/dev' into patch-4

Conflicts:
	automation-tests/run.py

parents 480dfb89 1c40039e

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
ChangeLog 3 additions, 1 deletion

ChangeLog
README.md 1 addition, 0 deletions

README.md
automation-tests/README.md 12 additions, 3 deletions

automation-tests/README.md
automation-tests/browserid/conftest.py 0 additions, 15 deletions

automation-tests/browserid/conftest.py
automation-tests/browserid/pages/account_manager.py 2 additions, 0 deletions

automation-tests/browserid/pages/account_manager.py
automation-tests/browserid/tests/check_sign_in.py 10 additions, 8 deletions

automation-tests/browserid/tests/check_sign_in.py
automation-tests/run.py 90 additions, 75 deletions

automation-tests/run.py
lockdown.json 274 additions, 0 deletions

lockdown.json
package.json 2 additions, 1 deletion

package.json
scripts/browserid.spec 1 addition, 1 deletion

scripts/browserid.spec
scripts/lockdown 191 additions, 0 deletions

scripts/lockdown

with 587 additions and 104 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment