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

5858 Commits

Author SHA1 Message Date
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
6c06f8ce5d Fix Pylint: C1001(old-style-class) 2015-03-13 20:20:04 -07:00
stv
90b3318d01 Fix Pylint: I0010(bad-inline-option) 2015-03-13 20:20:03 -07:00
Nimisha Asthagiri
28ad138829 Merge pull request #7311 from edx/mobile/MA-345-FB-URL 
MA-345 Mobile Enrollment API: add course' Facebook URL.
 2015-03-13 13:56:42 -04:00
Matt Drayer
16e63c9e1e Added Certficates Web/HTML View 2015-03-13 12:16:13 -04:00
Nimisha Asthagiri
e77bcab571 MA-345 Mobile Enrollment API: add course' Facebook URL 2015-03-13 11:13:33 -04:00
alawibaba
5107d463c7 Merge branch 'master' into release 
Conflicts:
	lms/envs/common.py (RESOLVED)
 2015-03-12 13:20:45 -04:00
alawibaba
cdc81c8894 Fixed ID bug in China CDN experiment, added default, changed graphite metric name, and exposed CDN monitoring ENVs. 2015-03-11 14:28:20 -04:00
Kelketek
1bd3652af3 Merge pull request #6846 from open-craft/content_libraries/import-export 
Content Libraries Import/Export
 2015-03-11 09:27:45 -05:00
Mark Hoeber
86930b9d27 Merge pull request #7135 from edx/markhoeber-studio-template-updates 
Studio template updates
 2015-03-11 09:16:40 -04:00
Mark Hoeber
12e3cc9d62 Update IFrame, Zooming Image, and Full Screen Image Templates 2015-03-10 20:58:01 -04:00
Jonathan Piacenti
8ad4d081fb Added library import and export via .tar.gz'd XML files. 2015-03-10 21:29:29 +00:00
Martyn James
af14d222fc Merge pull request #7085 from edx/dcikatic/SOL-258 
SOL-258 Removing preview and content type from search list for sequence ...
 2015-03-10 11:55:33 -04:00
zubair-arbi
61890e7a5e return proper 404 for assets of some invalid course from split modulestore 
PLAT-456
 2015-03-10 15:00:14 +05:00
Dino Cikatic
bfa625ea78 SOL-258 Removing preview and content type from search list for sequence type 2015-03-09 16:28:04 +01:00
Corey Goldberg
1fc9c83726 Added listener and beacon for video cdn eval. 2015-03-06 16:46:41 -05:00
Xavier Antoviaque
7338cc1286 Merge pull request #7148 from open-craft/library-selector 
Show a select box when editing a library content block (SOL-123)
 2015-03-06 09:16:02 +01:00
E. Kolpakov
c225d86e83 SettingsService for accessing server-wide settings from XBlock 2015-03-05 18:24:47 +03:00
Braden MacDonald
2e0beac378 Update some strings to reflect the new behaviour 2015-03-04 13:38:55 -08:00
Braden MacDonald
93e5a56d79 Show a select box when editing a library content block 2015-03-04 13:32:15 -08:00
Alison Hodges
5acc13269a Merge pull request #7133 from edx/ahodges/hackathon 
Alison's Hackathon9 changes
 2015-03-02 09:38:30 -05:00
Alison Hodges
4666caa63d Fixes DOC-1472, DOC-1713, DOC-1613, DOC-1714, DOC-1715 2015-02-27 16:22:01 -05:00
John Eskew
80b5f38239 Upon import, only raise when none of multiple parents are found for a 
block.
 2015-02-27 18:01:09 +05:00
Ned Batchelder
dd436ed8f9 Fix sentences jammed together. 2015-02-25 12:22:32 -05:00
Martyn James
8acdf532fc Merge pull request #7066 from edx/dcikatic/SOL-259 
SOL-259 Change HTML content listed type in index from HTML Content to Te...
 2015-02-24 16:06:48 -05:00
John Eskew
4e7ed93b3e Rollback eager definition loading. 
Pass 'lazy' parameter down properly into low-level definition caching.
Adjust mongo call numbers in tests and add missing bulk_op wrapper.
Avoids the loading of all definitions in a large course when only
specific, filtered definitions are needed to be loaded for an endpoint.
 2015-02-23 10:33:43 -05:00
Dino Cikatic
a643397275 SOL-259 Change HTML content listed type in index from HTML Content to Text 2015-02-23 13:30:14 +01:00
Sarina Canelake
6900bd27fe Merge pull request #7013 from stvstnfrd/pylint/low 
Fix Pylint violations (easy)
 2015-02-20 16:36:52 -05:00
Jesse Zoldak
cc71f63b5d Skip intermittently failing test test_course_publish_signal_firing PLAT-449 2015-02-20 13:15:15 -05:00
polesye
f9738b9259 TNL-439: Fix flaky jasmine tests. 2015-02-20 18:20:51 +02:00
muzaffaryousaf
a31e38416d Adds content group "Delete" and "Usage" functionality to group configurations page on cms. 
TNL-1185
 2015-02-20 14:56:22 +05:00
stv
d21fdaac27 Fix Pylint: E0101(return-in-init) 2015-02-19 19:56:52 -08:00
stv
3ffa967af8 Fix Pylint: W0105(pointless-string-statement) 2015-02-19 19:56:52 -08:00
stv
e17504d7b8 Fix Pylint: E0012(bad-option-value) 2015-02-19 19:56:51 -08:00
stv
ee2404c0d2 Fix Pylint: E0110(abstract-class-instantiated) 2015-02-19 19:56:51 -08:00
stv
2e1400f842 Fix Pylint: W0613(unused-argument) 2015-02-19 19:56:51 -08:00
stv
75aaf0d4a7 Fix Pylint: C0326(bad-whitespace) 2015-02-19 19:56:51 -08:00
Sarina Canelake
73c309935b Merge pull request #6679 from open-craft/problem-tooltips 
Support for inline explanatory popups in problem XML
 2015-02-18 08:37:03 -05:00
Shrhawk
24a63dadf9 Merge pull request #6694 from edx/shr/bug/TNL-1202-HD-button-not-working-properly 
Hd button on for default high resolutions
 2015-02-18 14:11:27 +05:00
Syed Hassan Raza
44468f840e Hd button on for default high resolutions 
TNL-1202
 2015-02-18 12:49:27 +05:00
Clinton Blackburn
2854bb9524 Added Course Structure API 2015-02-17 13:23:34 -05: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
muzaffaryousaf
f0cfc93a5a Adding the support for '$exists' into the get_items for split mongo. 
TNL-1451
 2015-02-17 17:13:51 +05: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
e15435ebef Skip import/export mongo call count test - off by one call sometimes. 2015-02-13 16:48:48 -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
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
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