Merging edx-release into master - #32

Merged

e-kolpakov merged 29 commits into

merge-candidate

May 13, 2015

Commits on Apr 9, 2015

Merge pull request #3 from open-craft/dashboard-pb
bradenmacdonald
committed
555d524
Removed custom deserialization code from questionnaire, tweaked tip deserialization to rely on field parser rather than custom parsing

e-kolpakov
authored and
bradenmacdonald
committed
ea81a91
Added explicit test_requirements and included them in Travis build

e-kolpakov
authored and
bradenmacdonald
committed
45ca8c7
Merge reviewed removal of custom serialization code
bradenmacdonald
committed
9ce9a4d
Make travis work for all branches.

Kelketek
authored and
bradenmacdonald
committed
552b5ba
Minor pylint fix
bradenmacdonald
committed
ea2875f

Commits on Apr 16, 2015

Fix: spacing around question titles/text in Firefox
bradenmacdonald
committed
dc4a43a
Merge pull request #9 from open-craft/hotfix
bradenmacdonald
committed
4817f9d

Commits on Apr 23, 2015

Hotfix: mentoring and problem_builder should not both use the same db table
bradenmacdonald
committed
94cc894
Data migration
bradenmacdonald
committed
7bb7d2b

Commits on Apr 24, 2015

Presentation updates:
e-kolpakov
committed
0cf055d
Merge pull request #16 from open-craft/presentation-updates
e-kolpakov
committed
b3cab3a
Merge pull request #18 from open-craft/hotfix-oc-639
bradenmacdonald
committed
d7ab348
Fix travis builds following xblock-sdk PR 56 change
bradenmacdonald
committed
51a820e
Allowed overriding average labels per mentoring

e-kolpakov
authored and
Kelketek
committed
5646645
Merge pull request #19 from open-craft/presentation-updates
Kelketek
committed
eb63e06

Commits on May 6, 2015

Presentation updates, batch 2:
e-kolpakov
committed
7ea0c4e
Accessibility updates - using sr and aria-hidden for better screen reader experience
e-kolpakov
committed
60713fd
Dashboard export HTML updates
e-kolpakov
committed
a4703a2
Added ability to override feedback messages title
e-kolpakov
committed
e2f8c7a
Fixed tests and improved floaitng format output
e-kolpakov
committed
e889b9b
Suppressed logging in tests - selenium driver messages flood the console so it's hard to see which tests have failed and stacktraces
e-kolpakov
committed
3523e75
Fix Travis build

bradenmacdonald
authored and
e-kolpakov
committed
45b3609

Commits on May 7, 2015

Merge pull request #29 from open-craft/presentation-updates
e-kolpakov
committed
2b6e570

Commits on May 12, 2015

Merge remote-tracking branch 'remotes/origin/edx-release' into merge-candidate
e-kolpakov
committed
85d12cc