muhammad-ammar
f55f9af891
Fix RemovedInDjango19Warning
2015-11-11 13:58:07 +05:00
Ned Batchelder
680271d466
Correct the darklang migration, since many darklang configs can exist.
2015-11-10 21:04:25 -05:00
Usman Khalid
6cb62f2697
Rebase upgrade Django to v1.8.5
...
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
Adam
e042ee2325
Merge pull request #10546 from edx/revert-disable-check-button-on-save
...
Revert disable check button on save
2015-11-06 13:22:19 -05:00
Andy Armstrong
a3ff4d50e8
Merge pull request #10534 from edx/andya/fix-studio-videos
...
Fix optimizing of draggabilly and json2
2015-11-06 12:12:44 -05:00
Adam Palay
33d9185d5d
Revert "Disable submit button on save click"
...
This reverts commit 99cca05730
2015-11-06 11:34:33 -05:00
Adam Palay
bc87ec15a9
Revert "add test for disabling check button while clicking save"
...
This reverts commit bc6caea6a6
2015-11-06 11:33:52 -05:00
Andy Armstrong
7a1469633f
Fix optimizing of draggabilly and json2
2015-11-06 09:40:20 -05:00
Clinton Blackburn
afd682e224
Fixed admin issues
...
- Using raw ID field for user fields for enrollment and user profile admin
- Including user data in enrollment admin queryset
2015-11-06 01:49:22 -05:00
Nimisha Asthagiri
0698076440
Transformer: StudentViewTransformer
2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
cbf90677b7
Merge pull request #10412 from edx/mobile/course-blocks-app
...
Course Blocks App MA-1556
2015-11-05 17:14:32 -05:00
Nimisha Asthagiri
a78b94d83a
Transformer: ContentLibraryTransformer
2015-11-05 16:22:06 -05:00
Ben Patterson
7e8d3fdae5
Merge pull request #10519 from edx/benp/chrome-fix-certs
...
Fixes for chrome automation:
2015-11-05 15:24:38 -05:00
Christine Lytwynec
468864a314
add paver test_a11y and a11y_coverage commands
2015-11-05 13:55:35 -05:00
Clinton Blackburn
b5718289dd
Merge pull request #10525 from edx/clintonb/zendesk-logging
...
Updated Zendesk error handling
2015-11-05 13:35:41 -05:00
Clinton Blackburn
bb0effb75c
Updated Zendesk error handling
...
Properly logging exceptions so we have the complete stacktrace.
ECOM-2792
2015-11-05 11:52:53 -05:00
Andy Armstrong
0785aeb959
Merge pull request #10426 from edx/andya/update-draggabilly
...
Upgrade draggabilly.js to fix Firefox iframe bug
2015-11-05 11:01:35 -05:00
Andy Armstrong
18dabc3312
Upgrade draggabilly.js to fix Firefox iframe bug
...
TNL-3627
2015-11-05 10:10:39 -05:00
Ben Patterson
947538bb1f
Merge pull request #10507 from edx/benp/mp-learner-profile-events
...
Refactor for multiprocessing.
2015-11-05 09:18:48 -05:00
Ben Patterson
ef17e0b9a1
Fixes for chrome automation:
...
* We do not need to click the upload button twice (typo?)
* Using a non-unique name for the upload image is causing GridFS indexing errors when
run too closely together (which happens with Chrome's speed)
2015-11-05 08:36:40 -05:00
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
Ben Patterson
8f05878e2e
Refactor for multiprocessing.
2015-11-04 10:34:36 -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
