Commits · cc01391ac55c85d3e0c5b684bdc7dc34e9bc7e65 · edx / edx-platform

28 Jan, 2016 2 commits
- Merge pull request #11362 from edx/hotfix/2016-01-28 · cc01391a
```
HOTFIX for PHX-245 Updated proctored/timed exam text
```
  Douglas Hall committed Jan 28, 2016
  cc01391a Browse Files
- Updated proctored/timed exam header bar text; Upgraded edx-proctoring to pull in… · 2447540d
```
Updated proctored/timed exam header bar text; Upgraded edx-proctoring to pull in additional text changes
```
  Douglas Hall committed Jan 28, 2016
  2447540d Browse Files
27 Jan, 2016 1 commit
- Merge pull request #11340 from edx/hotfix/2016-01-26 · 233deb27
```
Hotfix for MA-1981 and safe sessions
```
  Nimisha Asthagiri committed Jan 27, 2016
  233deb27 Browse Files
26 Jan, 2016 4 commits
- Specially handle login redirect for mobile apps · e76e05fa
  Nimisha Asthagiri committed Jan 26, 2016
  
  e76e05fa Browse Files
- Safe Session Cookies Middleware · f3cb6924
  Nimisha Asthagiri committed Jan 26, 2016
  
  f3cb6924 Browse Files
- Reorder transformers to fix MA-1981. · 3a6fbae6
  Nimisha Asthagiri committed Jan 26, 2016
  
  3a6fbae6 Browse Files
- Merge pull request #11309 from edx/rc/2016-01-26 · 55b7fa49
```
Release Candidate rc/2016-01-26
```
  Adam committed Jan 26, 2016
  55b7fa49 Browse Files
25 Jan, 2016 8 commits
- resolve quality violation · 46066c04
  Adam Palay committed Jan 25, 2016
  
  46066c04 Browse Files
- Merge pull request #11328 from edx/revert-migration-rc · d7c154d9
```
Revert migration rc
```
  Adam committed Jan 25, 2016
  d7c154d9 Browse Files
- Revert "Merge pull request #11302 from edx/ahsan/ECOM-3486-add-organization-api" · cfab793c
```
This reverts commit 8bc8b6ca, reversing
changes made to c2255ef0.
```
  Adam Palay committed Jan 25, 2016
  cfab793c Browse Files
- Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" · bb2d75d8
```
This reverts commit 46df4545, reversing
changes made to 039e6cdf.
```
  Adam Palay committed Jan 25, 2016
  bb2d75d8 Browse Files
- Revert "Merge pull request #11311 from edx/jsa/fail-safe-reverse" · 6b937a8d
```
This reverts commit 0d1765e1, reversing
changes made to d2eaa633.
```
  Adam Palay committed Jan 25, 2016
  6b937a8d Browse Files
- Revert "Merge pull request #11324 from edx/ahsan/rc-add-service-user-in-cms" · c9c8116d
```
This reverts commit a84b8111, reversing
changes made to 0d1765e1.
```
  Adam Palay committed Jan 25, 2016
  c9c8116d Browse Files
- Merge pull request #11324 from edx/ahsan/rc-add-service-user-in-cms · a84b8111
```
Ahsan/rc add service user in cms
```
  Ahsan Ulhaq committed Jan 25, 2016
  a84b8111 Browse Files
- Add service username in cms settings · 31ec8ef7
  Ahsan Ulhaq committed Jan 25, 2016
  
  31ec8ef7 Browse Files
22 Jan, 2016 18 commits
- Merge pull request #11311 from edx/jsa/fail-safe-reverse · 0d1765e1
```
ensure reverse migration to delete a specific row won’t fail.
```
  Adam committed Jan 22, 2016
  0d1765e1 Browse Files
- ensure reverse migration to delete a specific row won’t fail. · f65c5b9c
  jsa committed Jan 22, 2016
  
  f65c5b9c Browse Files
- Merge pull request #11308 from edx/revert-11295-bump-problem-builder · d2eaa633
```
Revert "Bump Problem Builder Hash"
```
  Adam committed Jan 22, 2016
  d2eaa633 Browse Files
- Merge pull request #11296 from edx/peter-fogg/fix-certs-migrations · 6cd12f9f
```
[wip] Reintroduce generated certificate changes, with updates to not require a giant migration.
```
  Peter Fogg committed Jan 22, 2016
  6cd12f9f Browse Files
- Merge pull request #11298 from edx/benp/bok-choy-0410 · 15ff497f
```
Upgrade to bok-choy 0.4.10
```
  Ben Patterson committed Jan 22, 2016
  15ff497f Browse Files
- Merge pull request #11305 from edx/ned/fix-flaky-test · 106a822d
```
Add @flaky
```
  Ned Batchelder committed Jan 22, 2016
  106a822d Browse Files
- Merge pull request #11303 from… · 8b24d638
```
Merge pull request #11303 from edx/raees/chrome-bokchoy-test-can-create-edit-signatories-of-certificate

Fixed test can create and edit signatories of certificate failing on …
```
  raeeschachar committed Jan 22, 2016
  8b24d638 Browse Files
- Merge pull request #11299 from edx/ned/updated-translations · 6d1abbad
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Jan 22, 2016
  6d1abbad Browse Files
- Revert "Bump Problem Builder Hash" · f3159e40
  Adam committed Jan 22, 2016
  
  f3159e40 Browse Files
- Disable audit certificates for new audit enrollments. · 96cc3895
```
Two new certificate statuses are introduced, 'audit_passing' and
'audit_notpassing'. These signal that the GeneratedCertificate is not
to be displayed as a cert to the user, and that they either passed or
did not. This allows us to retain existing grading logic, as well as
maintaining correctness in analytics and reporting.

Ineligible certificates are hidden by using the
`eligible_certificates` manager on GeneratedCertificate. Some places
in the coe (largely reporting, analytics, and management commands) use
the default `objects` manager, since they need access to all
certificates.

ECOM-3040
ECOM-3515
```
  Peter Fogg committed Jan 22, 2016
  96cc3895 Browse Files
- Merge pull request #11302 from edx/ahsan/ECOM-3486-add-organization-api · 8bc8b6ca
```
Update edx-organization version and organization URL
```
  Ahsan Ulhaq committed Jan 22, 2016
  8bc8b6ca Browse Files
- Add @flaky · 30209b14
  Ned Batchelder committed Jan 22, 2016
  
  30209b14 Browse Files
- Update edx-organization version and organization URl · 4f94b50c
```
ECOM-3486
```
  Ahsan Ulhaq committed Jan 22, 2016
  4f94b50c Browse Files
- Merge pull request #11226 from edx/aj/ecom3384-course-image-breaking · c2255ef0
```
 Studio - Schedule & Details tab broken
```
  Awais Jibran committed Jan 22, 2016
  c2255ef0 Browse Files
- Merge pull request #11241 from edx/feature/credentials-phase-1 · 46df4545
```
Feature/credentials phase 1
```
  Ahsan Ulhaq committed Jan 22, 2016
  46df4545 Browse Files
- Fixed test can create and edit signatories of certificate failing on Chrome · 8dbf66fb
  raeeschachar committed Jan 22, 2016
  
  8dbf66fb Browse Files
- Studio breaks DEFAULT_COURSE_ABOUT_IMAGE_URL is not set in settings in cms · 8a6699a4
```
ECOM-3384
```
  Awais Jibran committed Jan 22, 2016
  8a6699a4 Browse Files
- Add jwt auth in LMS · bcb8afb2
```
ECOM-3419
```
  Ahsan Ulhaq committed Jan 22, 2016
  bcb8afb2 Browse Files
21 Jan, 2016 7 commits
- Merge pull request #11300 from edx/efischer/ora2_release · 039e6cdf
```
ORA2 Weekly Release
```
  Eric Fischer committed Jan 21, 2016
  039e6cdf Browse Files
- edx-ora2 weekly release version update · 71cb070a
  Eric Fischer committed Jan 21, 2016
  
  71cb070a Browse Files
- Update translations (autogenerated message) · bf951b4e
```
Update translations (autogenerated message)

Update translations (autogenerated message)
```
  Ned Batchelder committed Jan 21, 2016
  bf951b4e Browse Files
- Merge pull request #11295 from edx/bump-problem-builder · 3cc11d1b
```
Bump Problem Builder Hash
```
  Kelketek committed Jan 21, 2016
  3cc11d1b Browse Files
- Upgrade to bok-choy 0.4.10 · 3c3f9296
```
This will provide us with backwards-compatibility options for an upcoming browser upgrade. See changelog for more.
```
  Ben Patterson committed Jan 21, 2016
  3c3f9296 Browse Files
- Merge pull request #11229 from edx/pmitros/minor-studio-settings-cleanup · 3b2e0ddb
```
Minor cleanup of Studio settings
```
  Piotr Mitros committed Jan 21, 2016
  3b2e0ddb Browse Files
- Merge pull request #11260 from eduNEXT/Bound3R/minwidth_layout · 7c9a65d8
```
Replace property min-width value
```
  Ned Batchelder committed Jan 21, 2016
  7c9a65d8 Browse Files