Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,843 Commits 1 Branch 0 Tags
b34255fcdb80ac11983d016414b8d3f03b1db52e
Commit Graph

29843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cewing
b34255fcdb MIT CCX: Fix display of CCXs on dashboard 
repairs https://openedx.atlassian.net/browse/TNL-2007 and https://openedx.atlassian.net/browse/TNL-2009

Original Commit Messages:

Update ccx dashboard display to match new course display

Fix display of CCX dates on dashboard to use dates from the CCX instead of the related course.

The fix is implemented by providing date- and course-related APIs on the CCX object itself.  These APIs are mimicked from the same APIs available on a course descriptor.

bring the methods for printing start and end datetimes into line with course by adding UTC under the proper circumstances

add test coverage for new APIs defined on the CCX model

fix quality violation
 2015-04-23 15:59:58 -07:00
Sarina Canelake
1f8f8bbfb6 Merge pull request #7795 from edx/sarina/update-i18ntools 
Update i18n tools to the latest version
 2015-04-23 16:46:52 -04:00
Sarina Canelake
8080d31348 Update i18n tools to the latest version 2015-04-23 15:43:29 -04:00
Ned Batchelder
ced607d5e4 Merge pull request #7793 from edx/ned/pep8-needs-to-ignore-dotgit 
PEP8 needs to ignore .git
 2015-04-23 15:41:20 -04:00
Ned Batchelder
283521e62f PEP8 needs to ignore .git 2015-04-23 14:42:20 -04:00
David Baumgold
d419eb0efa Merge pull request #7623 from edx/move-github-reqs-to-github.txt 
Move github dependencies into github.txt
 2015-04-23 14:24:35 -04:00
Sarina Canelake
8006227aa6 Merge pull request #7667 from applecool/L10N_bugfix 
Fix to LOC-66
 2015-04-23 10:48:15 -04:00
zubair-arbi
d794192367 Merge pull request #7774 from edx/zub/story/ecom-1437-reverification-lms-fixes 
fix reverification link in lms
 2015-04-23 19:13:41 +05:00
zubair-arbi
05068f1b94 fix reverification link in lms 
ECOM-1437
 2015-04-23 17:58:33 +05:00
Awais Jibran
0b66dc4b42 Merge pull request #7718 from edx/aj/tnl1921-forgot-password-model-not-showing 
Forgot password model not visible when user clicks 'Forgot Password' link on CMS.
 2015-04-23 16:53:06 +05:00
Aamir
a900e1f7ec Merge pull request #7660 from edx/aamir-khan/ECOM-1396/checkoint-name-field 
Aamir khan/ecom 1396/checkoint name field
 2015-04-23 12:06:09 +05:00
applecool
3f11df3f34 Fix to LOC-66 2015-04-22 20:45:44 -05:00
Diana Huang
2f3ff43e3f Merge pull request #7786 from edx/release 
Merge release back into master
 2015-04-22 17:51:34 -04:00
Diana Huang
00b75f0119 Merge pull request #7783 from edx/hotfix/2015-04-22 
Change image upload input name and not make duplicate of file in data.
 2015-04-22 17:45:50 -04:00
Diana Huang
09d6bb3ee1 Merge pull request #7784 from edx/andya/hotfix-default-profile-image 
Fix default profile images for edx.org
 2015-04-22 17:02:12 -04:00
Andy Armstrong
4f5a2e1bc8 Fix default profile images for edx.org 
TNL-2054
 2015-04-22 16:33:00 -04:00
Usman Khalid
e82735f79d Change image upload input name and not make duplicate of file in data. 
TNL-2052
 2015-04-22 14:33:30 -04:00
David Baumgold
437725311a Merge pull request #7714 from edx/enable-pdb-debugging 
Enable --pdb debugging
 2015-04-22 13:41:55 -04:00
Chris
b81c6d9169 Merge pull request #7768 from edx/clrux/UX-1724-RTL-sequence-nav-buttons 
RTL-ifies the sequence nav buttons
 2015-04-22 13:10:06 -04:00
cahrens
6e47664cfd Merge branch 'release' 2015-04-22 12:27:52 -04:00
David Baumgold
daf8320763 Remove extra spaces from paver commands 2015-04-22 12:17:43 -04:00
aamir-khan
d606ae97fb ECOM-1396: added the function to check is the xblock published 2015-04-22 19:23:33 +05:00
David Baumgold
d8ff61f6f6 Move github dependencies into github.txt 2015-04-22 10:07:48 -04:00
David Baumgold
60795564c2 Merge pull request #7764 from edx/parse-time-as-standalone-function 
_parse_time_str can be a standalone function
 2015-04-22 10:05:01 -04:00
David Baumgold
8524677992 Update paver tests to ignore trailing whitespace 2015-04-22 10:03:39 -04:00
Chris Rodriguez
b9a30b226e RTL-ifies the sequence nav buttons 2015-04-22 09:52:12 -04:00
Awais Jibran
8bd09d4057 Forgot password model not visible when user clicks 'Forgot Password' link on CMS. 
TNL-1921
 2015-04-22 18:06:36 +05:00
Sarina Canelake
6050d07d95 Merge pull request #7741 from edx/sarina/upgrade-django1.4.18-20 
Upgrade Django 1.4 to latest point release
 2015-04-22 09:04:17 -04:00
David Baumgold
220a86efa9 Merge pull request #7705 from edx/adjust-test_only_expected_fields_are_displayed 
Simplify test_only_expected_fields_are_displayed
 2015-04-22 09:01:55 -04:00
Brian Talbot
a0feb2118b Merge pull request #7770 from edx/talbs/rc/2015-04-22/fix-breakpoints 
Fix: edx.org and Open edX breakpoint clash - ECOM-1457
 2015-04-22 08:42:57 -04:00
Chris
4de7b8a4b1 Merge pull request #7766 from edx/clrux/UX-1634-sidebar-header-rtl 
RTL-ifying the sidebar title in Handouts
 2015-04-22 08:16:55 -04:00
Awais Qureshi
75d3759158 Merge pull request #7740 from edx/awais786/ECOM-1439-skip-icrv-model 
ECOM-1439 adding new model and migration.
 2015-04-22 12:19:28 +05:00
Clinton Blackburn
dc07943534 Merge pull request #7762 from edx/commerce-checkout-cancel 
Added Payment Cancellation Page
 2015-04-21 23:46:05 -04:00
Sarina Canelake
b57bf4b25a Upgrade Django 1.4 to latest point release 2015-04-21 20:41:34 -04:00
Christina Roberts
8a211b48df Merge pull request #7769 from edx/christina/eventing_fix 
Don't event first_name and last_name.
 2015-04-21 17:00:43 -04:00
Brian Talbot
ded6c4dbb0 fix: resolving edx.org and Open edX breakpoint clash 
* simplifying edx.org breakpoints to use min-width
* creating -bp-* centric Sass variables
* converting all existing edx.org centric media queries to use new Sass variables

ECOM-1457
 2015-04-21 16:44:32 -04:00
Clinton Blackburn
0f84749d4f Added Payment Cancellation Page 
This commit creates a new page intended only for use when the user cancels payment. The previous implementation relied on the CyberSource callback page, which is not useful for orders placed with the E-Commerce Service.
 2015-04-21 16:43:15 -04:00
cahrens
4af79d6f76 Don't event first_name and last_name. 
TNL-2044
 2015-04-21 16:03:59 -04:00
Chris Rodriguez
f1d2231146 RTL-ifying the sidebar title in Handouts 2015-04-21 15:39:41 -04:00
David Baumgold
764d5e6e89 _parse_time_str can be a standalone function 2015-04-21 13:38:37 -04:00
Muzaffar yousaf
d50ed75f36 Merge pull request #7754 from edx/usman/tnl1660-fixes 
Accessibility tweaks for account settings and profile pages.
 2015-04-21 20:39:26 +05:00
Will Daly
4df2bd3329 Merge pull request #7756 from edx/will/ecom-1408-take-two 
Expose course start/end date in the enrollment API
 2015-04-21 10:50:33 -04:00
Usman Khalid
a14e6f0a7e Accessibility tweaks for account settings and profile pages. 
TNL-1660
 2015-04-21 19:42:50 +05:00
Sarina Canelake
72dc54708e Merge pull request #7758 from edx/sarina/20150421-translations-update 
Update translations (autogenerated message)
 2015-04-21 10:08:49 -04:00
Sarina Canelake
9bdb820fa7 Update translations (autogenerated message) 2015-04-21 10:07:28 -04:00
Calen Pennington
97d9a19052 Merge pull request #7710 from cpennington/relax-context-contract 
Fix contract on context argument
 2015-04-21 10:01:24 -04:00
Will Daly
e065a9c947 Mark test_split_test_LMS_staff_view as flaky 2015-04-21 09:38:53 -04:00
Muhammad Ammar
7babb3efed Merge pull request #7696 from edx/ammar/tnl1740-add-simplified-and-traditional-chinese-transcript-language-options 
Add Simplified and Traditional Chinese as Transcript language options
 2015-04-21 18:28:17 +05:00
Will Daly
fc918fb3d1 Expose course start/end date in the enrollment API 2015-04-21 08:41:42 -04:00
Nimisha Asthagiri
9dfb68c2f1 Merge pull request #7676 from edx/mobile/notifications-backend 
Mobile/notifications
 2015-04-18 17:46:40 -04:00