cahrens
05cae8c684
Deprecate end_of_course_survey_url until it can be removed.
2015-10-21 10:36:13 -04:00
Christina Roberts
125930cf59
Merge pull request #10223 from edx/christina/upgrade-mathjax
...
Upgrade to MathJax 2.5.
2015-10-21 09:44:44 -04:00
Ned Batchelder
a0c25f88c3
Merge pull request #10279 from edx/ned/cleaner-django-meta
...
No need for docstrings on "class Meta"
2015-10-21 09:35:40 -04:00
Jesse Zoldak
2e6880f69e
Merge pull request #10228 from edx/zoldak/fix-acceptance-select-helpers
...
Fix the helpers for Select objects by wrapping them in promises
2015-10-21 09:14:46 -04:00
Arbab Nazar
034ac1c808
Merge pull request #10271 from edx/arbab/enrollment-user-list
...
take the list of users for enrolment change
2015-10-21 08:24:48 -04:00
Ned Batchelder
322ca34b20
Remove pylint pragmas from "class Meta"
...
Also remove useless docstrings where they were added to keep pylint
quiet.
2015-10-21 07:37:00 -04:00
Sarina Canelake
105d611cc9
Create distinct terms for gender, education sign up terms
2015-10-20 18:55:51 -04:00
arbabnazar
85e67bea4a
help updated
2015-10-20 15:37:09 -04:00
arbabnazar
b3e37e54ba
remove the append action
2015-10-20 15:30:06 -04:00
arbabnazar
361035c098
change the help text
2015-10-20 14:51:18 -04:00
arbabnazar
c4dc624c7f
take the list of users for enrolment change
2015-10-20 14:00:59 -04:00
Jesse Zoldak
6263356035
Merge pull request #10225 from edx/zoldak/improve-learner-profile-test-code
...
Improve acceptance test code for visiting the learner profile page
2015-10-20 13:48:48 -04:00
cahrens
fbaa4e5e63
Wait for MathJax to render.
2015-10-20 11:54:10 -04:00
cahrens
90b61f8ef8
Upgrade to MathJax 2.5.
...
TNL-3495
2015-10-20 11:54:09 -04:00
Afeef Janjua
713689dffe
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
...
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[98d2415] added better log info message
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated
2015-10-20 18:32:21 +05:00
Adam
ab78069a33
Merge pull request #10246 from edx/merge-release-into-master
...
Merge release into master
2015-10-19 11:13:49 -05:00
Matt Drayer
1eab25f292
mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations
...
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
2015-10-19 10:11:59 -04:00
Matt Drayer
c30960cc85
Merge pull request #10215 from edx/ziafazal/SOL-1317
...
SOL-1317: check MILESTONES_APP also when checking prerequisite courses enabled
2015-10-19 09:47:20 -04:00
Matt Drayer
b4ff9f882b
Merge pull request #10146 from edx/saleem-latif/SOL-1257
...
saleem-latif/SOL-1257: Resetting student history for Entrance Exam on instructor dashboard
2015-10-19 09:45:20 -04:00
Adam Palay
9b3841f62c
Merge remote-tracking branch 'origin/release' into merge-release-into-master
...
Conflicts:
lms/djangoapps/teams/views.py
lms/templates/courseware/progress.html
2015-10-19 08:35:33 -05:00
Christina Roberts
aed32a09fc
Merge pull request #10237 from stvstnfrd/noop-tests
...
Remove unused specs
2015-10-19 09:33:42 -04:00
Saleem Latif
12b245a386
Remove milestones when instructor clears a student's entry exam data
2015-10-19 12:39:22 +05:00
stv
ca99606f9f
Remove unused specs
...
These have been commented-out for more than 2 and a half years;
I can't think of a legitimate reason for keeping them around at this
point.
These were originally commented out here in
4740965413
2015-10-18 04:39:25 -04:00
Christina Roberts
300bd43172
Merge pull request #9845 from edx/christina/bio-hyperlink
...
Make HTML for non-editable views on leaner profile page more logical
2015-10-16 19:03:47 -04:00
Jesse Zoldak
6207de94c3
[fixup] fix quality violations
2015-10-16 14:49:21 -04:00
cahrens
c6ba747419
Make HTML for non-editable views more logical.
...
TNL-3297
2015-10-16 13:40:24 -04:00
Jesse Zoldak
cfe21a70fa
Fix the helpers for Select objects by wrapping them in promises
2015-10-16 13:39:07 -04:00
Adam Palay
9a79bf2ec9
skip LTIConfig test when third_party_auth is not installed
2015-10-16 12:22:54 -04:00
Jesse Zoldak
0f02744c41
Improve acceptance test code for visiting the learner profile page.
2015-10-16 12:13:22 -04:00
Zia Fazal
0f637fdc95
check MILESTONES_APP when checking prerequisite courses enabled
2015-10-16 12:53:55 +05:00
Ben Patterson
c54de688e7
Merge pull request #10129 from edx/benp/more-unique-cohort-bokchoy
...
Make these tests more unique for multiprocessing.
2015-10-15 17:56:14 -04:00
Matt Drayer
f1951df24e
Merge pull request #10154 from edx/saleem-latif/SOL-1297
...
saleem-latif/SOL-1297: updated message for 500 error on certificate preview
2015-10-15 13:58:05 -04:00
Christina Roberts
50fd135c61
Merge pull request #10193 from edx/christina/move-require-test
...
Clean up of common JS specs using RequireJS.
2015-10-15 12:53:09 -04:00
cahrens
b67f07afc1
Move main_requirejs to live with the requirejs files.
2015-10-15 11:19:27 -04:00
cahrens
a099ff86e5
Move edx.utils.validate.
...
The test was not running where it lived before.
2015-10-15 11:02:12 -04:00
Matt Drayer
3e5ad2989c
Merge pull request #10115 from edx/ziafazal/SOL-1254
...
ziafazal/SOL-1254: Student should see rest of courseware as soon as Entrance Exam is passed
2015-10-15 10:18:21 -04:00
Saleem Latif
466abcdce4
updated message for 500 error on certificate preview
2015-10-15 10:46:11 +05:00
raeeschachar
e72feeadc1
Merge pull request #10137 from edx/chrome-bok-choy-all-tests-in-own-learner-profile-page-test
...
Fixed all tests in OwnLearnerProfilePageTest that were failing on Chrome
2015-10-14 17:47:19 +05:00
Fred Smith
6f08eb0f15
Merge pull request #10131 from open-craft/fix-microsite-import
...
Fix staticfiles import in microsite.py.
2015-10-14 08:42:06 -04:00
Zia Fazal
2d1ff75ba0
added user’s pass status to problem_check response if problem is in
...
Entrance Exam.
unit test to check presence of entrance_exam_passed
changed based on Matt's feedback
changes after Asad's feedback
2015-10-14 15:38:18 +05:00
Ben Patterson
7adb02ee79
Make these tests more unique for multiprocessing.
2015-10-13 11:41:49 -04:00
raeeschachar
b0fd47131e
Fixed all tests in OwnLearnerProfilePageTest that were failing on Chrome
2015-10-13 19:36:44 +05:00
Matt Drayer
82a1989a4b
Merge pull request #10112 from edx/saleem-latif/SOL-1281
...
SOL-1281: Setup/conduct automated testing for SOL-1196
2015-10-13 10:24:54 -04:00
raeeschachar
0369a2454e
Merge pull request #10132 from edx/chrome-bok-choy-test-as-student-in-alpha-plus-beta
...
Fixed test, test as student in alpha and beta failing on chrome
2015-10-13 19:16:33 +05:00
raeeschachar
b69cbfa100
Fixed test as student in alpha and beta failing on chrome
2015-10-13 15:50:46 +05:00
Saleem Latif
b55dee8f2e
Bok-Choy test added for SOL-1196 to verify no black box around view certificate note in Progress Tab
2015-10-13 15:13:28 +05:00
Matjaz Gregoric
a9d8678ed0
Fix staticfiles import in microsite.py.
...
django-staticfiles was replaced with django.contrib.staticfiles
in dbcd1bf430
2015-10-13 11:20:49 +02:00
Awais Jibran
884569a54c
Merge pull request #9862 from edx/aj/plat833-orphan-problem-with-preview-button
...
Orphans in split breaks preview button in Studio
2015-10-13 11:57:27 +05:00
wajeeha-khalid
39b9191456
Merge pull request #9784 from edx/jia/MA-1248
...
MA-1248 - Mobile API: return discussion URL in course enrollment API
2015-10-13 11:55:48 +05:00
raeeschachar
652d3466c1
Fixed test about me field test failing on chrome
2015-10-12 18:28:29 +05:00
