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

5834 Commits

Author SHA1 Message Date
Greg Price
c860f790c2 Merge pull request #7508 from edx/gprice/export-import-val 
Include VAL data in video module export/import
 2015-03-31 20:28:31 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import 
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
 2015-03-31 19:35:06 -04:00
Sarina Canelake
c1f3f558f2 Merge pull request #7524 from louyihua/underscore_extraction 
Fix string extraction error in underscore files
 2015-03-31 14:30:44 -04:00
louyihua
46342a3f48 Fix string extraction error in underscore files 
The written style ```interpolate(gettext('some text'), {...}, ...)``` will will cause the string inside gettext() not be extracted.
So a separate line is needed for ```gettext``` when gettext function is directly called inside a call to the interpolate function.
 2015-04-01 01:23:36 +08:00
Sarina Canelake
4a4478fd8b Merge pull request #7526 from delftswa2014/readmes 
added READMEs for top level directories
 2015-03-31 13:16:29 -04:00
Calen Pennington
8f133f6696 Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical 
Convert Vertical XModule to pure Vertical XBlock.
 2015-03-31 11:10:22 -04:00
Mayank Jain
cf7777a474 added READMEs for top level directories 2015-03-31 16:47:37 +02:00
louyihua
2c75b5d725 Fix two missing replacements of {studio_name} 
Located in ```howitworks.html``` and ```import.html```.
 2015-03-31 13:04:54 +08:00
Calen Pennington
1f17538d42 Clean up tests in preparation for switching Vertical from an XModule to an XBlock 2015-03-30 16:37:53 -04:00
louyihua
9d3b65282e Fix error when STUDIO_NAME uses non-ascii characters 
The replacement strings need to be unicode, so that when STUDIO_NAME contains non-ascii characters python can handle it correctly without raising exceptions.
Also, the value of STUDIO_SHORT_NAME can be read from cms.env.json.
 2015-03-28 21:47:59 +08:00
Adam
dad4b673e2 Merge pull request #7505 from edx/release 
Release
 2015-03-27 16:46:33 -04:00
Sarina Canelake
68ba17867f Merge pull request #7496 from open-craft/studio-display-name-consistency 
Consistently use display_name_with_default in Studio
 2015-03-27 14:57:22 -04:00
Clinton Blackburn
9a8ecc65a7 Removed invalid kwarg 2015-03-27 10:37:04 -04:00
Braden MacDonald
19bd7005e6 Consistently use display_name_with_default in Studio 2015-03-26 13:24:11 -07:00
John Eskew
34adb256a6 Add datadog counters everywhere a "VS[compat]" comment exists. 
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
 2015-03-26 16:18:15 -04:00
Christopher Lee
4423510807 Merge pull request #7480 from edx/clee/MA-169_MA-77 
Clee/ma 169 ma 77
 2015-03-26 13:31:49 -04:00
Adam
c2dcbd70d1 Merge pull request #7492 from edx/release 
Release
 2015-03-26 12:56:41 -04:00
christopher lee
e8dfac091b MA-77 Auto VAL clone course 
MA-77 Automatically adds the course id to the videos in VAL
when a course is rerun.
 2015-03-26 12:36:43 -04:00
Sarina Canelake
d66bb883ac Fix footer stylings for RTL 2015-03-26 10:15:51 -04:00
Brian Talbot
67168869f5 Adjust styling for Open edX footer details 2015-03-26 10:15:51 -04:00
David Baumgold
8abfe4a850 Put Open edX logo in CMS footer 2015-03-26 10:14:37 -04:00
Adam Palay
43abe399f1 default discussion modules' discussion_id field to xblock's UNIQUE_FIELD (TNL-1771) 2015-03-26 08:49:21 -04:00
Matt Drayer
8107f803f5 Merge branch 'release' 2015-03-25 13:38:43 -04:00
Eugeny Kolpakov
dadc78aabd Merge pull request #7336 from open-craft/eugeny/course-team-to-backbone 
Unified Course Team and Library Users page. Converted both to Backbone.
 2015-03-24 17:06:38 +03:00
E. Kolpakov
9a56b800ee Unified Course Team and Library Users page. Converted both to Backbone. 
Converted lettuce Course Team page tests to bok choy
 2015-03-24 12:09:19 +03:00
Greg Price
0f0ee6a394 Merge pull request #7455 from edx/aleffert/video_web_only 
Add web-only setting to video module
 2015-03-23 15:38:18 -04:00
Greg Price
438ce5f7a4 Add web-only setting to video module 
This is needed for courses that license video content where the license
allows only for viewing on the web, not on mobile apps.

JIRA: MA-307
 2015-03-23 14:45:17 -04:00
Ned Batchelder
a84735057d Move common/lib/*.py to openedx/core/lib 
This makes these files importable, and puts them into the new best guess
as to where files should live.
 2015-03-23 12:40:24 -04:00
Usman Khalid
6fb48eb159 Merge pull request #6706 from edx/ammar/tnl-181 
Allow Instructor To Rename Cohorts And Set Cohort Assignment Method.
 2015-03-23 19:49:03 +05:00
Usman Khalid
e07f45b5dd Removed cohort_config from advanced settings page. 
TNL-1258
 2015-03-23 09:58:25 +05:00
Dino Cikatic
2117d168a4 SOL-217 Adding basic analytics events logging for courseware search and index 2015-03-19 21:52:23 +00:00
Carol Tong
d182b8db99 Merge pull request #7411 from edx/carol/doc/ContentLibHelpLinks 
Content Libraries: Fix Help links in Import/Export templates
 2015-03-19 11:21:14 -04:00
Carol Tong
4e9e11e4c0 Add Help links and targets for import/export libraries 2015-03-19 10:11:16 -04:00
Carol Tong
d413e71b88 Merge pull request #7419 from edx/carol/doc/ContentLibUserAccessHelpLinks 
DOC: ContentLib Help links for user access
 2015-03-19 09:02:05 -04:00
Carol Tong
e749f4500b Update template and config.ini files for library user help 2015-03-18 17:43:54 -04:00
Ned Batchelder
6ac1b82bb2 Merge pull request #7356 from edx/ned/fix-or-remove-teardown 
Fix or remove tearDown methods that don't use super.
 2015-03-18 17:36:17 -04:00
Jonathan Piacenti
568acb56b0 Library setting for show/hide children previews + client-side code to toggle it. 2015-03-18 08:59:58 -05:00
Ned Batchelder
81d17c516e Fix or remove tearDown methods that don't use super. 
Update edx-lint to the version that checks if tearDown uses super.

Convert a number of tearDown methods into addCleanup.

Remove some unneeded tearDown methods: no need to call patch.stopall if
none of them were started with patch.start.
 2015-03-17 15:14:52 -04:00
Calen Pennington
de23d6defe Clear cached children when binding an XModuleDescriptor/XBlock to a particular user 2015-03-17 10:55:06 -04:00
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10:31 -04:00
Ned Batchelder
6e8d075dd7 Merge pull request #7355 from edx/ned/fix-capitalization 
Simple capitalization fix
 2015-03-16 14:45:36 -04:00
David Baumgold
c6992688ac Merge pull request #7314 from edx/load-tender-js-from-tenderapp-subdomain 
Define TENDER_SUBDOMAIN so that we can still use vanity URLs
 2015-03-16 10:44:00 -04:00
Jesse Zoldak
26afdf768c Revert "To support UNICODE xblock.location" 2015-03-16 10:15:41 -04:00
Waqas Khalid
a8457c4fb4 Merge pull request #6871 from edx/waqas/studio-mathjax-unit-problem 
Unit page doesn't load when mathjax is down
 2015-03-16 18:47:06 +05:00
Sarina Canelake
dadc47c22a Merge pull request #6167 from fmyzjs/patch-5 
To support UNICODE xblock.location
 2015-03-16 09:05:10 -04:00
Waqas Khalid
729dd24c82 Unit page doesn't load when mathjax is down 
When mathjax is down studio page doesn't work as
it wait for mathjax to load. I replaced the hard
dependency with soft dependency now unit page can
load with mathjax.
 2015-03-16 15:12:01 +05:00
Ned Batchelder
a8da7946b3 Simple capitalization fix 2015-03-14 19:43:43 -04:00
stv
181eed241f Silence unrelated warnings 2015-03-14 13:35:18 -07:00
stv
b9ed4b6561 Fix Pylint: E1305(too-many-format-args) 2015-03-13 20:20:04 -07:00
stv
83fec5d092 Fix Pylint: W0109(duplicate-key) 2015-03-13 20:20:04 -07:00