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

9772 Commits

Author SHA1 Message Date
Awais Qureshi
cf83a3cc2c Merge pull request #6323 from edx/awais786/ECOM-759 
ECOM-759  if course is none return 404 error code.
 2014-12-22 20:39:35 +05:00
Renzo Lucioni
1fa1d357ee Merge pull request #6326 from edx/renzo/split-verification-dashboard-analytics 
Split verification dashboard analytics
 2014-12-22 09:34:44 -05:00
Awais
9d9f0c2f75 ECOM-759 if course is none return 404 error code. 2014-12-22 14:48:32 +05:00
Sarina Canelake
ccb5bfbc9a Merge pull request #6244 from wwj718/patch-1 
variable name error
 2014-12-19 17:41:00 -05:00
Renzo Lucioni
aeeb45cf57 Update virtual pageview event categories, general polish 2014-12-19 17:03:14 -05:00
Renzo Lucioni
3d717a895a Track upsell copy interaction, upgrade button and verify now button clicks on the dashboard 2014-12-19 17:03:14 -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
Adam
526bc9637b Merge pull request #6231 from edx/adam/fix-unenroll-enroll-inst-dash 
fix enrollment issue in instructor dash (ECOM-776)
 2014-12-19 11:53:53 -05:00
Calen Pennington
84a2eeb812 Merge pull request #6209 from edx/plat/fix-pure-system 
Fix PureSystem so that runtime.publish() works for a pure XBlock.
 2014-12-19 10:19:42 -05:00
Renzo Lucioni
988785545e Merge pull request #6311 from edx/renzo/photo-submission-confirmation-email 
Send confirmation email on successful photo submission
 2014-12-19 09:51:54 -05:00
Jesse Zoldak
60bfb13b1a for tests change the default xml data dir to a place where it will get cleaned up 2014-12-19 09:22:34 -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
Calen Pennington
61ba910255 Add a test of pure xblock and xmodule event publishing 2014-12-19 08:55:42 -05:00
Will Daly
368dbf2ed8 Merge pull request #6293 from edx/will/set-donation-amount 
Preserve the contribution amount specified on the track selection page.
 2014-12-19 08:44:07 -05:00
Renzo Lucioni
1e4f890120 Send confirmation email on successful photo submission 2014-12-18 18:27:05 -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
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
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
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
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
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
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
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
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
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
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
stephensanchez
c84a604949 Positive filtering which steps can be skipped. 2014-12-16 18:20:41 +00:00
Renzo Lucioni
cdcd5d79fe Fix unit test failure due to stale urls.py 2014-12-16 12:09:01 -05:00
Will Daly
b4a8302e66 Merge pull request #6268 from edx/will/simplify-template-loading 
Inline underscore templates; add pre render step
 2014-12-16 11:42:06 -05:00
Renzo Lucioni
9faddd9b64 Merge pull request #6267 from edx/renzo/remove-webcam-approve-button 
Remove webcam capture approval button (checkmark)
 2014-12-16 11:15:49 -05:00
Renzo Lucioni
dfcbcd5435 Add a verification reminder to order confirmation emails 2014-12-16 10:28:33 -05:00
Renzo Lucioni
94b22bcde9 Remove webcam capture approval button (checkmark) 2014-12-16 10:01:55 -05:00
Will Daly
80f5d4216a Inline underscore templates; add pre render step 2014-12-16 08:38:28 -05:00
chrisndodge
cb1058ac00 Merge pull request #6142 from edx/muhhshoaib/WL-106-MIT-Course-Information-Page-side-bar 
MIT: Course Information Page side bar
 2014-12-15 20:46:22 -05:00
AlasdairSwan
70c2adb9ef Merge pull request #6264 from edx/alasdair/dashboard-prof-ed-banner 
ECOM-728 updated dashboard course banners so all types of course are now...
 2014-12-15 16:14:09 -05:00
chrisndodge
c46c247e46 Merge pull request #6262 from edx/cdodge/also-sort-in-courses-list 
also apply sorting rules overrides to the /courses view
 2014-12-15 15:34:39 -05:00