Commit Graph

33620 Commits

Author SHA1 Message Date
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
Bill DeRusha
dd5a6acfc1 Merge pull request #10444 from edx/bderusha/mailchimp-country
Convert country to unicode before sending to segment
2015-11-02 13:59:38 -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
Bill DeRusha
572ea25678 Convert segment country to unicode. 2015-11-02 11:59:47 -05:00
Sarina Canelake
1804ee77a6 Merge pull request #10456 from open-craft/unenroll-course-name-bugfix
Fix bugs in course unenroll popup
2015-11-02 11:58:52 -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
42ce6b96a3 Merge pull request #10446 from edx/peter-fogg/hide-studio-due-date
Hide Xblock due dates in studio for self-paced courses.
2015-11-02 11:04:44 -05: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
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
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
Peter Fogg
709758e433 Hide Xblock due dates in studio for self-paced courses. 2015-11-02 09:35:58 -05:00
Syed Hasan raza
cdd5a6f8fb Merge pull request #7016 from edx/shr/bug/TNL-1355-Studio-username-field-area-alignment
set max width for nav-account-user for long characters
2015-11-02 06:30:33 -08:00
Syed Hassan Raza
f582d1a832 adjusment for long usernames 2015-11-02 16:14:53 -08: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
Awais Jibran
2587ebc931 Merge pull request #10355 from edx/aj/tnl2324-xblocksaveerror-exception
Updating edx-platform for XBlock#323
2015-11-02 19:22:30 +05:00
Awais Jibran
6319142a86 Updating edx-platform for XBlock#323 2015-11-02 18:17:47 +05:00
asadiqbal
bf0affc25d SOL-1292 2015-11-02 14:33:12 +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
Ned Batchelder
365e497c17 Merge pull request #10443 from edx/ned/fix-edx-oauth2-provider-installation
Egg name needs to match setup(name=..) to get installed properly
2015-10-31 12:34:10 -04: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
Ned Batchelder
e79ff7b06d Egg name needs to match setup(name=..) to get installed properly 2015-10-31 07:51:45 -04: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
cahrens
65a0994ca6 Remove flaky flag-- passed 30 times.
TNL-3679
2015-10-30 16:22:45 -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
Sarina Canelake
02744481ae Merge pull request #10441 from edx/sarina/20151030-update-translations
Update translations (autogenerated message)
2015-10-30 13:50:12 -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
Eric Fischer
c4c5effb7b Merge pull request #10438 from edx/efischer/flaky_test
Marking flaky test
2015-10-30 13:07:49 -04:00
Jesse Zoldak
e4aa1fa5be Merge pull request #10437 from jzoldak/zoldak/quiet-circle-pylint
Increase the test output timeout and quiet the pylint output.
2015-10-30 13:07:41 -04:00
Sarina Canelake
7301ea77c4 Update translations (autogenerated message) 2015-10-30 13:02:31 -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
Awais Qureshi
0e88668e2b Merge pull request #10372 from edx/awais786/ECOM-2451-xseries-to-dashboard
Add the html and css changes required for XSeries
2015-10-30 21:51:05 +05: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
Eric Fischer
dbbc64ff88 CohortMembership Race Condition Test
By using the before_after library, we can force a race condition to reliably
occur in the CohortMembership.save() method. This unit test will do just that,
and ensure that our race-condition-handling code functions as it should.
2015-10-30 11:07:25 -04: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
Eric Fischer
83163e58f8 CohortMemberships Code Changes
The code changes needed to get CohortMembership functioning properly.

The key of this change is twofold: first, CohortMemberships are unique
per-user, per-course. This is enforced at the database level. Secondly,
the updates are done using a select_for_update, which ensures atomicity.
2015-10-30 11:07:25 -04:00
Eric Fischer
56d49e7390 CohortMemberships Migrations
These are the migrations needed for CohortMembership to function.
0005 establishes the table, 0006 will be used to move existing data
into the table as needed.

Per product guidance, we can just arbitrarily reassign problem users.
Implementing that decision, as well as the remainder of the data migration.

Also including a short script to re-run the 0006 migration after code changes
are live, to prevent a potential issue where the database become out-of-sync.
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
Jesse Zoldak
f4df2ac1ca Increase the test output timeout and quiet the pylint output. 2015-10-30 10:47:25 -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