Robert Raposa
b76981234d
Merge pull request #10484 from edx/robrap/TNL-2646
...
TNL-2646: Escape json in Studio
2015-11-04 14:28:25 -05:00
Peter Fogg
acf5bb57cb
Merge pull request #10509 from edx/peter-fogg/course-pacing-label-changes
...
Course pacing template changes.
2015-11-04 14:11:49 -05:00
Robert Raposa
3682fac832
Add json escaping to Studio
...
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates
TNL-2646: Escape json.dumps
2015-11-04 13:34:42 -05:00
Eric Fischer
24ee5a68f5
Merge pull request #10490 from edx/release
...
Release 4 November 2015 to master
2015-11-04 13:19:09 -05:00
Sarina Canelake
e46b43963c
Merge pull request #10416 from louyihua/underscore_ngettext
...
Fix underscore extraction error
2015-11-04 12:17:01 -05:00
Peter Fogg
13f20d5649
Update cert_info docstring with correct return type.
2015-11-04 10:29:27 -05:00
Peter Fogg
5bd6e829e7
Merge pull request #10465 from edx/peter-fogg/fix-spec-helpers-closure
...
Fix `withData` and `withConfiguration` helpers.
2015-11-04 10:21:30 -05:00
Peter Fogg
b98c89117c
Course pacing template changes.
...
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.
ECOM-2794
ECOM-2800
2015-11-04 09:59:58 -05:00
Renzo Lucioni
2f0e663581
Use ugettext_noop instead of lambdas assigned to the underscore
...
Replaces instances of an old hack with the more clear ugettext_noop.
2015-11-04 09:17:18 -05:00
louyihua
c78b306a30
Fix a underscore extraction error
...
ngettext and its parameters should not be separated into multiple lines.
2015-11-04 15:03:29 +08:00
Eric Fischer
dc469ea5ec
Fix cert_status None. Add GeneratedCertificate to admin
2015-11-03 21:54:48 -05:00
Adam Palay
bc6caea6a6
add test for disabling check button while clicking save
2015-11-03 14:02:37 -05:00
Giulio Gratta
99cca05730
Disable submit button on save click
2015-11-03 14:01:21 -05:00
Sarina Canelake
1172a49580
Merge pull request #10445 from stvstnfrd/chat
...
Remove chat feature
2015-11-03 11:11:23 -05:00
Matt Drayer
fc77a6eae7
Merge pull request #10363 from edx/saleem-latif/SOL-1315
...
SOL-1315: Add Cert Exception UI on Instructor Dash
2015-11-03 10:09:19 -05:00
Jesse Zoldak
81782c4ecf
Merge pull request #10283 from edx/zoldak/SOL-1160
...
Fix for flaky asset test SOL-1160
2015-11-03 10:07:39 -05:00
Christina Roberts
a943fbef6a
Merge pull request #10462 from edx/christina/tnl-3725
...
Fix flaky video test
2015-11-03 09:56:52 -05:00
Jesse Zoldak
71ecb6c9f2
Fix for flaky asset test SOL-1160
2015-11-03 09:22:08 -05:00
Saleem Latif
99bd47e9a8
Add Cert Exception UI on Instructor Dash
2015-11-03 12:52:22 +05:00
Bill DeRusha
6123827ab1
Compare all refund dates in UTC
2015-11-02 20:00:06 -05:00
stv
3a2c0e37dc
Remove chat feature
...
This was originally contributed upstream by Stanford, circa 2013.
We neither use nor support this feature in its current implementation,
and in fact, we may never have used this production. Until recently, we
had additional chat/Jabber code [1] (in the form of a Jabber djangoapp in
LMS); context there suggests this feature may have never been more than
a prototype. The original author is no longer on the team, so I can't directly
confirm this on our end.
Do you use this feature?
Stanford had already abandoned this Jabber-backed chat implementation,
in favor of an IRC backend, by the time I joined the team in early 2014.
[1] dbe52a6b13
2015-11-02 14:08:58 -08:00
Peter Fogg
759a3c4f1f
Fix withData and withConfiguration helpers.
...
Both of them dynamically generate specs which close over the iteration
variable of a for loop. Closures capture *references*, not values, and
so when the variable is mutated on loop iteration its new value is
used when the spec is called. This means that instead of running a
spec with n different values, we run the spec n times with the same
value. This is bad.
2015-11-02 16:34:06 -05:00
cahrens
f94459dde2
Provide time for the display of video speed to change.
...
TNL-3725
2015-11-02 13:33:59 -05:00
Bill DeRusha
572ea25678
Convert segment country to unicode.
2015-11-02 11:59:47 -05:00
Clinton Blackburn
847797da5f
Merge pull request #10460 from edx/clintonb/enrollment-admin
...
Removed read-only fields from enrollment admin
2015-11-02 10:20:49 -05:00
Matt Drayer
b900221ca4
Merge pull request #10394 from edx/asadiqbal08/SOL-1292
...
asadiqbal08/SOL-1292 Entrance Exam is not imported with an imported course
2015-11-02 10:14:47 -05:00
Christina Roberts
67f649a2d7
Merge pull request #10435 from edx/christina/flaky-bio
...
Remove flaky flag from profile bok choy test
2015-11-02 09:59:03 -05:00
Clinton Blackburn
c34dfac1ff
Removed read-only fields from enrollment admin
...
The read-only protection is more hassle than it's worth when testing locally and on stage. It's a solution to a problem we don't actually have, so I have reverted the changes.
2015-11-02 09:25:56 -05:00
asadiqbal
bf0affc25d
SOL-1292
2015-11-02 14:33:12 +05:00
Eric Fischer
e6226d1365
Merge pull request #10447 from edx/cdodge/mark-test-as-flakey2
...
mark test_can_reset_attempts as flakey as it sporadically fails
2015-11-01 18:17:38 -05:00
Eric Fischer
923917c033
Merge pull request #10452 from edx/bderusha/rc-2015-11-03-bug
...
Fix dashboard page load error when cert_status is None
2015-11-01 18:17:21 -05:00
Bill DeRusha
62f3cf9c46
Fix cert_status None bug
2015-11-01 18:16:16 -05:00
jsa
c68af9d21e
Show xseries upsell even if the course is not yet in session
...
ECOM-2780
2015-11-01 15:54:33 -05:00
cahrens
65a0994ca6
Remove flaky flag-- passed 30 times.
...
TNL-3679
2015-10-30 16:22:45 -04:00
Chris Dodge
cb4901431d
mark test_can_reset_attempts as flakey as it sporadically fails
2015-10-30 15:46:13 -04:00
Nimisha Asthagiri
6ab20b71c0
Merge pull request #10388 from edx/nimisha/course-factory
...
Add SampleCourseFactory and ToyCourseFactory
2015-10-30 13:23:05 -04:00
Eric Fischer
c4c5effb7b
Merge pull request #10438 from edx/efischer/flaky_test
...
Marking flaky test
2015-10-30 13:07:49 -04:00
Christina Roberts
d1aa7e2cc6
Merge pull request #10436 from edx/christina/remove-comments
...
Move comments within the script block.
2015-10-30 12:57:51 -04:00
Eric Fischer
74906f248b
Marking flaky test
...
common.test.acceptance.tests.video.test_video_module.YouTubeVideoTest.test_video_component_stores_speed_correctly_for_multiple_videos
is flaky, see for details.
2015-10-30 12:12:55 -04:00
Ahsan Ulhaq
c47311b11f
Add the html and css and backend changes required for the xseries.
2015-10-30 20:59:26 +05:00
cahrens
9aecd10ab3
Move comments within the script block.
2015-10-30 11:44:30 -04:00
chrisndodge
7868067879
Merge pull request #9744 from edx/cdodge/timed-exams
...
Timed Exams
2015-10-30 11:03:59 -04:00
Bill DeRusha
1f77810fad
Add configurable refund window
...
Add configuration model for enrollment refunds.
Use order info from otto in refund window calculation
Delete dupe tests. Extend tests to include window tests
Move ecom client from lib to djangoapps in openedx
2015-10-30 09:01:53 -04:00
Nimisha Asthagiri
ce466619e4
Add SampleCourseFactory and ToyCourseFactory
2015-10-30 08:52:29 -04:00
Muhammad Shoaib
9476898df0
Add Timed Exams as a feature to edx-platform
2015-10-30 08:44:33 -04:00
Zubair Afzal
fed0964c51
Merge pull request #10304 from edx/zub/story/ecom-2578-basic-programs-api-client-setup
...
basic programs api setup and dashboard integration
2015-10-29 22:21:12 +05:00
Christina Roberts
3382a955c9
Merge pull request #10378 from edx/christina/fix-mathjax-preview
...
Disable Fast Preview for version 2.5.
2015-10-29 12:41:30 -04:00
cahrens
deb4e35f92
Disable Fast Preview for version 2.5.
...
Except for the Discussion Tab.
TNL-3693, TNL-3365
2015-10-29 11:56:08 -04:00
David Ormsbee
87ded08d49
Merge pull request #10389 from edx/mobile/handler-url
...
Changes to handler URL generation
2015-10-29 11:39:35 -04:00
Sarina Canelake
2206b8a056
Merge pull request #10324 from stvstnfrd/debt/circuit
...
Remove circuit djangoapp from LMS
2015-10-29 11:15:15 -04:00
