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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
198e9c7c0e Do a better job translating "Program Manager" 2014-12-18 14:33:12 -05:00
Calen Pennington
e88c00a25c Make bok_choy tests clean up test files before executing 2014-12-18 14:08:20 -05:00
Ben Patterson
f2293b9508 Quiet analytics.init stderr output for tests. 2014-12-18 13:21:52 -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
Jesse Zoldak
7a227bb2b9 Merge pull request #6292 from edx/zoldak/default-xml-test-dir 
for tests change the default xml data dir
 2014-12-18 09:45:04 -05:00
Renzo Lucioni
ca8faf92cd Merge pull request #6294 from edx/renzo/split-verification-analytics 
Split payment/verification business intelligence analytics
 2014-12-18 09:39:14 -05:00
wwj718
90f32134f0 Update AUTHORS 2014-12-18 19:24:55 +08:00
Waheed Ahmed
c1de1001a6 Merge pull request #6192 from edx/waheed/tnl920-fix-code-mirror-editor-view-height 
Fixed CodeMirror editor view height in studio.
 2014-12-18 14:28:31 +05:00
Waheed Ahmed
2ffe6032bf Fixed CodeMirror editor view height in studio. 
TNL-920
 2014-12-18 11:42:18 +05:00
wwj718
cbfca0afe6 Update AUTHORS 2014-12-18 11:00:52 +08: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
Fred Smith
66ab165594 Merge pull request #6291 from edx/hotfix/2014-12-17 
Hotfix/2014 12 17
 2014-12-17 17:08:30 -05:00
Renzo Lucioni
f2e83bf57f Split payment/verification business intelligence analytics 
Track verify now and verify later choices, image captures, image retake, and name changes, as well as virtual pageviews for every step in the new flow(s).
 2014-12-17 17:08:10 -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
a07df1a645 Merge pull request #6202 from edx/dhm/xmlms_asides 
Make XmlModuleStore handle asides
 2014-12-17 15:42:16 -05:00
Jesse Zoldak
94f3596d21 Merge pull request #6288 from edx/zoldak/update-django-nose 
Update django-nose version
 2014-12-17 15:40:31 -05:00
Will Daly
5109a862e0 Preserve the contribution amount specified on the track selection page. 2014-12-17 15:35:31 -05:00
Don Mitchell
de5e88561f Make XmlModuleStore handle asides 
PLAT-221
 2014-12-17 13:51:10 -05:00
Adam Palay
4d2df01d7d update ora version 2014-12-17 13:47:39 -05:00
Waheed Ahmed
208ee26c2f Added test for OpenAssessmentBlock mixin. 
TNL-1022
 2014-12-17 13:47:38 -05:00
Jesse Zoldak
40aaf5de6d for tests change the default xml data dir to a place where it will get cleaned up 2014-12-17 12:24:15 -05:00
John Jarvis
128d763047 Merge pull request #6218 from edx/jarv/env-revision-override 
optionally using environment variable for edx-platform hash
 2014-12-17 11:37:13 -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
Diana Huang
18deda9342 Merge pull request #6270 from edx/diana/track-refunds 
Add tracking for refunds.
 2014-12-17 10:44:53 -05:00
Will Daly
df46e843c1 Merge pull request #6271 from edx/will/show-receipt-take-two 
Add payment information to payment confirmation page
 2014-12-17 10:01:50 -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
Jesse Zoldak
e5a2742d6f Merge pull request #6275 from edx/zoldak/update-lettuce 
Update to the latest lettuce and install from pypi
 2014-12-17 09:34:13 -05:00
Jesse Zoldak
2df2f60a32 Update django-nose version 2014-12-17 09:33:46 -05: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
a643f6d806 Merge pull request #6229 from edx/waheed/tnl527-fix-unicode-error-for-non-utf8-transcript 
Fixed unicode problem if transcript file is not UTF-8 encoded.
 2014-12-17 14:48:19 +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
Will Daly
2ea2b8f674 Add JSON end-point for shoppingcart receipt information 
Add enrollment confirmation page

Fix progress update

Add order info to the payment confirmation page.
 2014-12-16 20:40:13 -05:00
John Eskew
28fb3c8e69 Merge pull request #6180 from edx/jeskew/import_export_asset_xml_pt_2 
Import/export modulestore-stored asset metadata as XML from/to exported course.
 2014-12-16 17:14:48 -05:00
Stephen Sanchez
402b8b1547 Merge pull request #6261 from edx/sanchez/add-activate-account 
Add the activate account step to the verified workflow.
 2014-12-16 16:56:06 -05:00
Diana Huang
26fd9d23e8 Remove Segment events from courseware. 2014-12-16 16:53:06 -05:00
Jesse Zoldak
eb465b3034 Update to the latest lettuce and install from pypi 2014-12-16 15:54:22 -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
Stephen Sanchez
2341bf1d1b Merge pull request #6272 from edx/sanchez/change-skip-step-logic 
Positive filtering which steps can be skipped.
 2014-12-16 15:38:30 -05:00
stephensanchez
96e22097b2 Add the activate account step to the verified workflow. 
Changing approach such that email activation is not a step.

Removing stale line of code.

Update activate account step according to new UI changes.

Adding new test for activation.
 2014-12-16 20:24:50 +00:00
Diana Huang
f3c26c895e Add tracking for refunds. 2014-12-16 15:23:28 -05:00
John Jarvis
a9d731165c optionally using environment variable for edx-platform hash 2014-12-16 15:13:08 -05:00