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

27538 Commits

This Branch
This Branch
All Branches
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
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
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
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
Calen Pennington
1cf5aa0c16 Merge pull request #6325 from cpennington/update-db-for-cms 
Make paver update_db run against both LMS and Studio models
 2014-12-19 13:18:59 -05:00
Adam
dbc6166f7e Merge pull request #6306 from edx/hotfix/2014-12-18 
Tender widget inavailability stops loading studio page
 2014-12-19 12:34:06 -05:00
Ben Patterson
59eba9599d Merge pull request #6324 from edx/benp/remove-tddium 
Remove Solano artifacts, Solano-only logic.
 2014-12-19 12:20:52 -05:00
Calen Pennington
519b0f5e14 Make paver update_db run against both LMS and Studio models 2014-12-19 11:56:38 -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
Ben Patterson
106fba70cf Remove Solano artifacts, Solano-only logic. 2014-12-19 10:13:00 -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
Waqas Khalid
e653af4da2 Tender widget inavailability stops loading studio page 
When tender_widget.js is inavailable studio page stops
loading becuase of error in the requirejs. It is
dependency in the requirejs so when it doesn't load
it cause other dependencies to stop loading.

TNL-1018
 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
Christopher Lee
cff12eea1d Merge pull request #6317 from edx/hotfix/val-error 
updated commit hash for VAL
 2014-12-18 18:41:22 -05:00
Renzo Lucioni
1e4f890120 Send confirmation email on successful photo submission 2014-12-18 18:27:05 -05:00
christopher lee
7bf8221b89 updated commit hash for VAL 2014-12-18 17:04:19 -05:00
David Baumgold
708fd87bb6 Merge pull request #6310 from edx/studio-translate-program-manager 
Do a better job translating "Program Manager"
 2014-12-18 16:10:43 -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
Calen Pennington
8e14c9f05d Merge pull request #6313 from cpennington/bok-choy-clean-mako 
Make bok_choy tests clean up test files before executing
 2014-12-18 15:38:30 -05:00
Don Mitchell
d49c82f9bd Add configuration to studio for asides 2014-12-18 14:43:22 -05:00
Ben Patterson
3b8b6a33a7 Merge pull request #6307 from edx/benp/clean-analytics-init 
Quiet analytics.init stderr output for tests.
 2014-12-18 14:39:23 -05:00
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