Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,604 Commits 1 Branch 0 Tags
519d55585cffc2593b05e4e2875bcf7bbd68ebcd
Commit Graph

10051 Commits

Author SHA1 Message Date
chrisndodge
77c68b7dbd Merge pull request #6037 from edx/cdodge/microsite-aware-session-middleware 
Allow for Microsite middleware to change cookie domains
 2014-12-30 23:43:24 -05:00
Jim Abramson
2eab51ab26 Merge pull request #4786 from aboudreault/inline-discusssion-cohorting 
Add always_cohort_inline_discussions in course settings
 2014-12-30 13:11:37 -05:00
David Baumgold
4ec0295bab Improve i18n on the LMS dashboard course listing page 
Adding translator comments to the dashboard.

Updating alt text to verification pending ribbon.

fix tests
 2014-12-30 14:24:15 +00:00
Chris Dodge
b80b347ed0 Make SessionMiddleware Microsite aware 2014-12-29 12:06:24 -05:00
Jonathan Piacenti
6e4ccfb7bd Added Jasmine tests for always_cohort_inline_discussions. 2014-12-26 18:03:51 +00:00
Alan Boudreault
68fcdcc030 Add always_cohort_inline_discussions in course settings 2014-12-26 18:03:50 +00:00
cahrens
6846e25bbb Revert #6192. It was causing a JS error on devstack. 
TNL-1070
 2014-12-23 16:13:45 -05:00
John Eskew
0d874def09 Merge pull request #6350 from edx/jeskew/asset_md_contract_fix 
Change contracts to allow user_id with type long().
 2014-12-23 11:11:05 -05:00
Fred Smith
cc0789a104 Merge pull request #6355 from edx/release 
Release
 2014-12-23 08:32:58 -05:00
John Eskew
1ad08cc303 Change contracts to allow user_id with type long(). Add tests. 2014-12-22 17:08:54 -05:00
Will Daly
d3459be05a Add Jasmine tests for the payment/verification flow. 2014-12-22 13:25:49 -05:00
Will Daly
30549bd7ad Send the user to the login page if registering with a linked but inactive account 2014-12-22 13:23:29 -05:00
Don Mitchell
5ef2770391 Merge pull request #6329 from edx/dhm/bug_split_index 
Fix get_courses to handle inflight changes
 2014-12-19 17:10:42 -05:00
Don Mitchell
e1035aa844 Fix get_courses to handle inflight changes 
more rigorously.
 2014-12-19 15:27:23 -05:00
Renzo Lucioni
c42c2573b0 Merge pull request #6259 from edx/renzo/split-verification-payment-hookup 
Hook up new payment and verification flow
 2014-12-19 13:29:13 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release 
Release
 2014-12-19 13:23:22 -05:00
Nimisha Asthagiri
ad7a67da2b Update segment.io shim for mobile event syntax change. 2014-12-19 12:39:39 -05:00
Brian Wilson
2faff29a21 Fix PureSystem so that runtime.publish() works for a pure XBlock. 
Fix extracted from https://github.com/edx/edx-platform/pull/6035.
 2014-12-19 09:00:32 -05:00
Don Mitchell
d73eca48ba Merge pull request #6296 from edx/dhm/studio_asides 
make asides render in studio
 2014-12-18 15:41:58 -05:00
Stephen Sanchez
0e58e7cb23 Merge pull request #6216 from edx/sanchez/cleanup-restful-layer 
Enrollment API Cleanup
 2014-12-18 11:00:23 -05:00
stephensanchez
22a18e350d Updating the design of the DRF views for enrollments. 
Consolidate PUT and POST on the RESTful Layer.

Change URLs for API

Test cleanup.

Adding a course details URL to the enrollment API.

Change student to user

Change to v1, remove feature flag from API URLs

Updating student to user in tests

Re-ordering redirect urls to be evaluated last.

Adding pagination and testing.

Adding Django REST settings for pagination.

Revert "Re-ordering redirect urls to be evaluated last."

This reverts commit 4c9502daa383e49b46f8abec5456c271e5e24ccb.

Re-ordering redirect urls to be evaluated last.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding Django REST settings for pagination."

This reverts commit 9f8a54c41f34caa24818c88f1e75ac59f6ce5259.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding pagination and testing."

This reverts commit 0b2d46262abb78f5ad170700205e7fd28b6af942.

Additional testing, logging, and error messages.
 2014-12-18 15:39:01 +00:00
Waheed Ahmed
2ffe6032bf Fixed CodeMirror editor view height in studio. 
TNL-920
 2014-12-18 11:42:18 +05:00
chrisndodge
f733d1d8bd Merge pull request #6234 from edx/afzaledx/WL-172-order-history 
WL-172 Show a Order History list on the Student Dashboard for any PaidCo...
 2014-12-17 20:46:54 -05:00
Afzal Wali
872dbb874b WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased 2014-12-17 16:19:06 -05:00
Don Mitchell
4360a78142 Studio render XBlockAside views 
PLAT-280
 2014-12-17 15:44:49 -05:00
Don Mitchell
de5e88561f Make XmlModuleStore handle asides 
PLAT-221
 2014-12-17 13:51:10 -05:00
Diana Huang
cb7f725d2d Merge pull request #6282 from edx/diana/kill-courseware-bi-events 
Remove Segment events from courseware.
 2014-12-17 11:26:06 -05:00
Waqas Khalid
c7fde04433 Merge pull request #6067 from mlkwaqas/waqas/tnl107-changing-pages-not-reposition 
In user profile changing page should reposition window to top
 2014-12-17 19:58:28 +05:00
Oleg Marshev
8260bee9c3 Merge pull request #6266 from mitocw/fix_lti_callback 
OAuth signature should be verified against URL provided to the tool.
 2014-12-17 16:53:48 +02:00
Waqas Khalid
efbeb9212b Merge pull request #5993 from mlkwaqas/waqas/tnl752-discussion-id-should-be-unique 
Advanced settings discussion category ids should be unique.
 2014-12-17 18:25:36 +05:00
Ivica Ceraj
daa1797fc4 OAuth signature should be verified against URL provided to the tool. 
There is possibility that a proxy will change URL along the way (for
example protocol from https to http) which would invalidate signature.
Supporting LTI_1 and LTI_2 use case.
 2014-12-17 08:11:11 -05:00
Waqas Khalid
0eab14a334 In user profile changing page should reposition window to top 
When we change the page using pagination in the user
profile page the data gets updated but the position
of the window remains at pagination. It should change
position of window to top.

TNL-107
 2014-12-17 17:22:10 +05:00
Waqas Khalid
d9d8775757 Advanced settings discussion category ids should be unique. 
If the ids in the adnvaced setting discussion category are
not unique then threads under categories with different name
will come in every category with same id. Ids should be unique
inorder to differentiate between different categories.

TNL-752
 2014-12-17 17:20:48 +05:00
Waheed Ahmed
d23e772dd0 Fixed unicode problem if transcript file is not UTF-8 encoded. 
TNL-527
 2014-12-17 13:19:47 +05:00
Renzo Lucioni
a268c91236 Hook up new payment/verification flow to dashboard, track selection page, and upgrade 2014-12-16 23:32:17 -05:00
Diana Huang
26fd9d23e8 Remove Segment events from courseware. 2014-12-16 16:53:06 -05:00
John Eskew
b518cfa0a0 Add wrapper class that enables storage of Mongo document id separately 
from dictionary of all asset metadata by asset type.
 2014-12-16 15:42:38 -05:00
John Eskew
94ea35d3be Export modulestore-stored asset metadata as XML to exported course. 
Import asset metadata XML into modulestore.
Optimize importing many items of asset metadata by avoiding multiple
round-trips to MongoDB.
 2014-12-16 15:42:38 -05:00
John Eskew
e66cb05c03 Return empty values and log a warning instead of raising NotImplemented 
exceptions for XML modulestore asset metadata methods.
 2014-12-16 15:42:38 -05:00
zubair-arbi
5371d17312 Merge pull request #6246 from edx/zub/bugfix/plat-332-location-revison-error 
fix location revision error for multi parent draft
 2014-12-16 19:39:27 +05:00
Greg Price
ee103659dc Merge pull request #6257 from edx/mobile/video-pipeline-squashed 
Add video upload feature to Studio
 2014-12-15 15:18:52 -05:00
Ben Patterson
a0629003ae Merge pull request #6240 from edx/benp/fix-analytics-init 
Mock out the underlying segment-io call.
 2014-12-15 13:44:54 -05:00
Greg Price
61cb51596d Add front end for Studio video upload feature 
Co-authored-by: Chris <crodriguez@edx.org>
Co-authored-by: Mark Hoeber <hoeber@edx.org>
 2014-12-15 13:09:59 -05:00
Nimisha Asthagiri
0687a62a8f Add back end for Studio video upload feature 
This feature allows upload of video assets to S3. This requires that the
VIDEO_UPLOAD_PIPELINE setting be properly configured and that each
course be configured with a token issued by the media team for their
processing purposes (e.g. linking the video with a YouTube channel).

Co-authored-by: Greg Price <gprice@edx.org>
 2014-12-15 13:09:59 -05:00
zubair-arbi
99b86d7b0f fix location revision error for multi parent draft 
PLAT-332
 2014-12-15 17:32:48 +05:00
zubair-arbi
1d6d2f2a7f set position to default value if POST request don't have position argument 
TNL-922
 2014-12-15 11:59:52 +05:00
Calen Pennington
822eaa20c6 Make ErrorDescriptor more resistent to errors 2014-12-13 08:26:28 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00
Ben Patterson
7be7b50ba9 Mock out the underlying segment-io call. 
TE-532
 2014-12-12 21:47:43 -05:00
Calen Pennington
ccbff2dafc Make a generic django field for storing OpaqueKey classes 2014-12-12 21:45:21 -05:00