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

28621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Boudreault
ac445d6eff Add ENABLE_DISCUSSION_EMAIL_DIGEST feature, to enable discussion emails digest by default for all users 2015-02-19 14:34:10 +08:00
Sarina Canelake
c6aa4416c4 Merge pull request #7012 from edx/sarina/validate-update 
Update i18n-tools to fix dummy generation
 2015-02-17 21:42:28 -05:00
Sarina Canelake
b1d2c5c396 Update i18n-tools to fix dummy generation 2015-02-17 17:42:11 -05:00
David Baumgold
e5c650d394 Merge pull request #7006 from stvstnfrd/dead 
Remove dead code paths
 2015-02-17 16:44:17 -05:00
Clinton Blackburn
6b56ae6ae6 Merge pull request #6154 from edx/clintonb/courses-api 
Courses API
 2015-02-17 14:19:40 -05:00
Clinton Blackburn
2854bb9524 Added Course Structure API 2015-02-17 13:23:34 -05:00
Sarina Canelake
2a8b71486b Merge pull request #7005 from edx/sarina/20150217-translation-update 
Update translations (autogenerated message)
 2015-02-17 12:56:49 -05:00
Sarina Canelake
793a472628 Merge pull request #6962 from Stanford-Online/giulio/course-price-bugfix 
BUGFIX: shopping_cart_enabled + cosmetic price
 2015-02-17 12:56:16 -05:00
Sarina Canelake
f6e8867457 Update translations (autogenerated message) 2015-02-17 11:54:13 -05:00
Will Daly
cec3484184 Merge pull request #6969 from edx/will/ecom-1055 
ECOM-1055: Add messaging for when a student's verification will expire before the deadline
 2015-02-17 10:57:57 -05:00
Giulio Gratta
6a037d05f7 BUGFIX: shopping_cart_enabled + cosmetic price 
- pass through registration price for use in template
- change conditional for add-to-cart to use registration price
- change conditional for sidebar price field to also include registration price
- remove expected failure in test
- add test for shopping_cart + course without mode
 2015-02-17 07:50:59 -08:00
Waqas Khalid
d6efd1285c Merge pull request #6996 from edx/waqas/tnl1390-missing-discussion-blackout 
Missing discussion blackout throwing exception
 2015-02-17 20:23:40 +05:00
Will Daly
6796b07d56 Add messaging for when a student's verification will expire before the deadline. 2015-02-17 09:55:29 -05:00
Muzaffar yousaf
4dd9cd2c19 Merge pull request #6978 from edx/muzaffar/mongo-split-fix-tnl1185 
Adding the support for '$exists' into the get_items for split mongo.
 2015-02-17 18:18:46 +05:00
muzaffaryousaf
f0cfc93a5a Adding the support for '$exists' into the get_items for split mongo. 
TNL-1451
 2015-02-17 17:13:51 +05:00
Usman Khalid
618d8ba33c Merge pull request #6980 from edx/usman/ora-release-2014-02-12 
Update edx-ora2 to release-2015-02-12T15.27.
 2015-02-17 17:00:32 +05:00
stv
01bd96512a Remove shadowed class declaration 
It looks like one version of the class was first added [1] and then a
few days later, another was written [2]. The newer declaration appeared
lower in the file, allowing it to hide the other.

This removes the first, hidden declaration.

[1] commit 7aa493ec85
    Date:   Fri Mar 1 10:36:20 2013 -0500
[2] commit f62dad2f57
    Date:   Tue Mar 5 16:31:02 2013 -0500
 2015-02-16 22:55:22 -08:00
stv
91eb723946 Remove obsolete management command 
While this may have served a purpose at one point, it's now been broken
for more than 2 years [1]; a critical code path makes a call to a
function which is no longer imported.

[1] commit 84cb0ce99b
    Date:   Fri Dec 21 13:15:37 2012 -0500
 2015-02-16 22:50:11 -08:00
stv
971713d0c2 Remove unreferenced mustache_helpers code 
I can't seem to find any references to this code outside of the library
and the tests themselves.
 2015-02-16 22:50:11 -08:00
Waqas Khalid
a730f81132 Missing discussion blackout throwing exception 
When the list is empty in discussion blackout
on studio side it causes the exception on lms
side when we try to access the discussion. We
were expecting the values and try to parse it
in two values start and end date whereas parsing
empty values to two values causing the exception.
Now values will be parse when value exists. Empty
value will be ignored.

TNL-1390
 2015-02-16 19:43:03 +05:00
Piotr Mitros
7aea582ab0 Merge pull request #6973 from edx/pmitros/add-video-events 
Adds events to video player for CC menu
 2015-02-14 22:22:11 -05:00
John Eskew
eb22e1ba23 Merge pull request #6994 from edx/jeskew/skip_mongo_call_count_test 
Skip import/export mongo call count test - off by one call sometimes.
 2015-02-13 16:49:52 -05:00
John Eskew
e15435ebef Skip import/export mongo call count test - off by one call sometimes. 2015-02-13 16:48:48 -05:00
Chris
48b50fa097 Merge pull request #6971 from edx/clrux/rtl-1630-fix 
RTLifying the forgot password link
 2015-02-13 15:15:24 -05:00
Will Daly
62b91d6fcc Merge pull request #6982 from edx/will/update-linkedin-field-name 
LinkedIn Add to Profile source parameter
 2015-02-13 14:03:10 -05:00
Clinton Blackburn
052fa8eafc Merge pull request #6935 from edx/clintonb/course-structure 
Generating Course Structure Asynchronously on Course Publish
 2015-02-13 13:37:05 -05:00
Chris Rodriguez
a1143d45ba RTLifying the forgot password link 2015-02-13 13:25:20 -05:00
Sarina Canelake
0217f50f12 Merge pull request #6986 from edx/sarina/fix-link 
Fix translator's guide link
 2015-02-13 12:53:55 -05:00
John Eskew
d0c9daa4f8 Merge pull request #6920 from edx/jeskew/eager_loading_xblocks_to_depth 
Improve performance of import/export and course traversal with Split modulestore.
 2015-02-13 12:37:25 -05:00
Will Daly
a18e0c6bc7 Rename LinkedIn configuration field to "company_identifier" 
Add "source" parameter to LinkedIn add-to-profile URL.

Add platform name to certification name.

Style changes for linked in sharing on dashboard
 2015-02-13 12:23:51 -05:00
Clinton Blackburn
92ca64fa2a Finishing async course structure work 
- Added tests
- Updated model field specification
- Fixed issue of multiple event emission
- Updated admin page
- Added management command to manually generate course structures
 2015-02-13 12:21:51 -05:00
Martyn James
3a28c5709c Merge pull request #6896 from edx/mjevtic/fixing-video-module-tests-for-search 
Fixed a test_video issue regarding settings
 2015-02-13 12:14:34 -05:00
Muzaffar yousaf
5d4e84eb37 Merge pull request #6984 from edx/muzaffar/studio-group-config-tnl1446 
Applying unicode to the content experiment display name.
 2015-02-13 20:58:41 +05:00
Will Daly
29c769bc2f Merge pull request #6987 from edx/will/country-access-feature-flag-fixup 
Skip country access check if feature flag is disabled
 2015-02-13 10:55:02 -05:00
Sarina Canelake
eb04ba2e9b Fix translator's guide link 
various pylint fixes
 2015-02-13 10:51:58 -05:00
Chris
2c8698c087 Merge pull request #6970 from edx/clrux/rtl-1629-fix 
Adding new logistration Sass partial to RTL compiled
 2015-02-13 10:46:54 -05:00
Chris
7766ed64a3 Merge pull request #6972 from edx/clrux/rtl-1631-fix 
RTL-ifying footer
 2015-02-13 10:45:16 -05:00
Piotr Mitros
dc227cb525 Added events for showing and hiding cc menu in videos with translations 2015-02-13 10:30:57 -05:00
Chris
9c82195808 Merge pull request #6880 from edx/clrux/lms-navigation-icon-update 
Adding markup for icon fonts; adding custom styles for said icons
 2015-02-13 09:59:17 -05:00
Chris Rodriguez
23557b9800 RTL-ifying footer 2015-02-13 09:44:17 -05:00
Chris Rodriguez
be7b3f2949 Adjusting RTL styles for UX-1628 2015-02-13 09:44:17 -05:00
Will Daly
125f6957fc Skip country access check if feature flag is disabled 2015-02-13 08:57:37 -05:00
Sarina Canelake
1b07bcdf67 Merge pull request #6949 from stvstnfrd/gettext/empty 
Remove superfluous empty string check
 2015-02-13 08:31:31 -05:00
muzaffaryousaf
bff205579b Minor refactoring. 
TNL-1146
 2015-02-13 14:56:33 +05:00
muzaffaryousaf
4189bd19f7 Applying unicode to the usage label with test. 
TNL-1146
 2015-02-13 14:54:34 +05:00
Will Daly
7da15ea1d2 Merge pull request #6957 from edx/will/country-access-part-3 
Finish Country Access (Part 3 of 3): Block enrollment from third party auth
 2015-02-12 22:25:07 -05:00
Chris Rodriguez
bed9d2f5da Adjusting line height and labels 2015-02-12 18:53:20 -05:00
Chris Rodriguez
7c02782f90 Adding new logistration Sass partial to RTL compiled 2015-02-12 18:53:20 -05:00
Chris
7e2d4decd9 Merge pull request #6966 from edx/clrux/rtl-1628-fix 
Adjusting RTL styles for UX-1628
 2015-02-12 18:51:44 -05:00
Chris Rodriguez
0326c1917a Adding markup for icon fonts; adding custom styles for said icons 2015-02-12 18:50:47 -05:00