Commit Graph

12698 Commits

Author SHA1 Message Date
Matt Drayer
7a7cd6e660 Merge pull request #10459 from edx/ziafazal/SOL-1346
SOL-1346:convert string to bytestring before passing it to urllib.quote_plus
2015-11-04 17:07:46 -05:00
Mark Sadecki
aa1281456f Merge pull request #10347 from edx/cptvitamin/TNL-3675
Fixes invalid/improper microdata and attribute values in the header logo
2015-11-04 16:18:19 -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
Peter Pinch
01f1c3a160 Merge pull request #10478 from mitocw/enhancement/aq/disable_auto_enrol_ccx
Disabled auto enroll in ccx coach's enrollment tab
2015-11-04 11:28:01 -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
Amir Qayyum Khan
1f60e9696f Disabled auto enroll in ccx enrollment tab 2015-11-04 11:56:01 +05:00
Zia Fazal
fbc8a13410 convert string to bytestring before passing it to urllib.quote_plus
further improvement in handling of unicode data
2015-11-04 11:22:36 +05:00
Eric Fischer
dc469ea5ec Fix cert_status None. Add GeneratedCertificate to admin 2015-11-03 21:54:48 -05:00
Mark Sadecki
3be86ca891 Fixes invalid/improper microdata and attribute values in the header logo 2015-11-03 15:20:48 -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
Saleem Latif
99bd47e9a8 Add Cert Exception UI on Instructor Dash 2015-11-03 12:52:22 +05:00
David Ormsbee
0aa58f5033 New Relic transaction naming now ignores suffix most of the time.
The only time it should include the suffix is when the handler is
explicilty "xmodule_handler", meaning it's an old-style handler
that routes everything. For example, Capa uses one handler for
all its AJAX requests, and only differentiates actions based on
suffix ("get", "problem_check", etc.).

What prompted this change is that LTIDescriptor defines a handler
"lti_2_0_result_rest_handler" which encodes user-specific
information into the suffix. This is a perfectly valid thing to
do, but it blows out the number of named transactions in our
metrics.
2015-11-02 22:17:46 -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
David Baumgold
b921d995fc Fixed an incorrect revert
When I reverted the edx.org theme in 116ca29189,
I reverted this line incorrectly. It should be like this.
2015-11-02 16:16:36 -05:00
Peter Fogg
27be371a2c Merge pull request #10430 from edx/peter-fogg/date-summary-blocks
Date summary blocks.
2015-11-02 12:42:36 -05:00
Matjaz Gregoric
3320ecf418 Move unenroll messages into separate data attributes.
Having the messeges embedded into onclick attributes was fragile because
it could break if the translated string contained special characters
such as single quotes.

Rather than trying to escape the special characters inside the onclick handler,
move the translatable strings into separate h-escaped data attributes and interpolate
the values in the (already existing) jQuery click handler rather than in the
inline onclick handler.

This makes the javascript code more consistent as well as fixes the problem
where the popup would break if translation included single quotes.
2015-11-02 17:21:28 +01:00
Matjaz Gregoric
1037e6b551 Replace s placeholder with %()s in course listing.
The string is passed through the JS 'interpolate' function,
which expects %()s style placeholders.
2015-11-02 17:21:27 +01:00
Peter Fogg
d7417d62cc Date summary blocks on the course home page.
Enabled behind the
`SelfPacedConfiguration.enable_course_home_improvements` flag.

ECOM-2604
2015-11-02 10:49:18 -05:00
Sarina Canelake
42c5f2ff8c Merge pull request #10125 from open-craft/smarnach/course-number-class
Add a class to the course number in the page header to facilitate hiding it in a theme.
2015-11-02 09:55:30 -05:00
Ahsan Ulhaq
1c66fbc812 Merge pull request #10277 from edx/ahsan/ECOM-2338-adding-Messaging-and-text-improvements-unaffected-changes
Reimplemented text changes for dashboard
2015-11-02 11:34:25 +05:00
Bill DeRusha
62f3cf9c46 Fix cert_status None bug 2015-11-01 18:16:16 -05:00
Sven Marnach
610a0e0fbb Add a class to course number and name in the page header to facilitate hiding them in a theme. 2015-10-31 13:19:06 +01:00
Nimisha Asthagiri
3ac14fe3dd Merge pull request #10365 from edx/mobile/block-cache-framework
Block Cache framework (MA-1551)
2015-10-30 17:01:23 -04:00
Ahsan Ulhaq
bab065d825 Reimplemented text changes for dashboard 2015-10-30 23:53:22 +05:00
Nimisha Asthagiri
7f325aee73 Block Cache framework. 2015-10-30 14:24:57 -04:00
Christina Roberts
057ab71b7c Merge pull request #10052 from edx/andya/segmentio-performance
Upgrade segment.io and possibly improve its performance
2015-10-30 14:10:16 -04:00
Edward Zarecor
37f69c20a8 Merge pull request #10358 from edx/e0d/fix-consumer-secret
PR for discussing the right thing to do here.
2015-10-30 13:55:55 -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
e0380ad7ab Merge pull request #10295 from edx/efischer/cohort_membership_model
TNL-3478 Cohort Membership race condition fix
2015-10-30 13:08:56 -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
Eric Fischer
08ed3b547f CohortMemberships Unit Test Updates
Updating previously-existing unit tests to function with the new
CohortMembership model.
2015-10-30 11:07:25 -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
717f5dc5e8 Merge pull request #10384 from edx/bderusha/refund-window
Refund windows
2015-10-30 10:29:29 -04:00
Matt Drayer
90f1473bfc Merge pull request #10418 from edx/ziafazal/SOL-1340
SOL-1340: added vertical spacing around issued certificates section
2015-10-30 10:02:16 -04:00
Andy Armstrong
b66cbe3484 Upgrade segment.io to match documentation.
May improve performance.
TNL-3538
2015-10-30 09:24:20 -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
Zia Fazal
830b2e0ac5 added vertical spacing
wrapped issued certificates section with p tags to add some vertical
spacing

changes after feedback from frances

indent code
2015-10-30 12:01:39 +05:00
wajeeha-khalid
16ab4f4333 Merge pull request #10105 from edx/jia/MA-1189
MA-1189 - Discussion API: implemented GET comment children
2015-10-30 11:37:41 +05:00
chrisndodge
2301bcbf8f Merge pull request #10403 from edx/afzaledx/MAYN-149_survey_report
MAYN-149 Survey Report CSV upload for Professional Education courses.
2015-10-29 18:24:31 -04:00
Afzal Wali
5a11f75a48 Add the ability for self-service course survey reports 2015-10-29 13:26:28 -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