Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,719 Commits 1 Branch 0 Tags
17c8fa81f52b7708643a97c8d774b439337c00a7
Commit Graph

4077 Commits

Author SHA1 Message Date
Jesse Zoldak
76517de87d Disable intermittently failing annotation acceptance test TNL-353 2014-09-15 12:23:47 -04:00
Renzo Lucioni
1fbccdaa20 Merge pull request #5183 from edx/renzo/new-audit-track-selection 
Prepare track selection page for new audit track
 2014-09-15 10:09:26 -04:00
chrisndodge
0bb4ddef32 Merge pull request #5209 from edx/cdodge/allow-to-pass-override-cancel-URL 
pass along an extra parameter to CyberSource to sepcify a callback URL i...
 2014-09-15 09:34:29 -04:00
Jim Abramson
9fc4fbc12a Merge pull request #5172 from edx/jsa/tnl24 
test that group_id attribute is present and correct in LMS responses
 2014-09-12 15:58:50 -04:00
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
jsa
d3d4d33064 Ensure group info is present in LMS responses. 
TNL-24
 2014-09-12 13:47:05 -04:00
Chris Dodge
68cdf3a59d pass along an extra parameter to CyberSource to sepcify a callback URL if the user clicks cancel 
typo
 2014-09-11 15:38:28 -04:00
Andy Armstrong
82675b2baa Merge pull request #5176 from edx/andya/lms-ux-reference-templates 
Add support for UX reference templates in LMS
 2014-09-11 14:32:25 -04:00
Andy Armstrong
7683cba2c3 Add support for UX reference templates in LMS 2014-09-11 13:52:48 -04:00
cahrens
020094b8fb Create auto cohorts when list_cohorts is called and return number of users per cohort. 
TNL-186
 2014-09-11 13:51:34 -04:00
Waheed Ahmed
5fd1ade766 Fixed 404 on courseware when users last visited subsection becomes unpublished. 
LMS-6492
 2014-09-11 18:35:58 +05:00
Daniel Friedman
95a06d92ae Merge pull request #5088 from edx/dan-f/test-lms-passes-group-id 
Ensure LMS passes correct group_id when querying content
 2014-09-10 17:18:28 -04:00
Daniel Friedman
4d9517b456 Ensure LMS passes correct group_id when querying content 2014-09-10 16:43:06 -04:00
Don Mitchell
8f90e39626 Merge pull request #5149 from edx/mongo/bulk_operation 
Generalize bulk_operations logic
 2014-09-10 16:16:40 -04:00
Don Mitchell
4faed64859 Generalize bulk_operations logic 
LMS-11366
 2014-09-10 15:35:28 -04:00
Ben Patterson
e05f7770e3 Merge pull request #5161 from edx/benp/solano2-lms-failures 
Acceptance tests (lettuce): hardcode sleeps to fix flakiness
 2014-09-10 15:32:59 -04:00
Clinton Blackburn
9f8e2cf5aa Merge pull request #5132 from edx/insights-message-update 
Updated Analytics Dashboard Message
 2014-09-10 15:11:59 -04:00
Diana Huang
484f13c3cf Merge pull request #5154 from edx/diana/pass-along-course-id 
Pass along course id to CyberSource
 2014-09-10 14:58:26 -04:00
Ben Patterson
dc75f6870a Acceptance tests (lettuce): hardcode sleeps to fix flakiness 
This is a quick fix (because the long fix was taking far too long
due to animation). The truer fix is to port these tests to bok-choy.
 2014-09-10 13:44:49 -04:00
Will Daly
a9389747df Merge pull request #5155 from edx/will/fix-cybersource-unicode-error 
Fix a unicode error in CyberSource2
 2014-09-10 11:17:53 -04:00
Will Daly
5759a3fd29 Fix a unicode error in CyberSource2 2014-09-10 11:07:01 -04:00
Will Daly
b6474304db Merge pull request #5122 from edx/will/ecom-218 
Change shopping cart status once sent to Cybersource (ECOM-218)
 2014-09-10 11:03:28 -04:00
Will Daly
2388e7b8cb Fix a unicode error in CyberSource2 2014-09-10 10:47:38 -04:00
Will Daly
c47673bb8b Add a test for the course ID merchant defined field data 2014-09-10 10:08:07 -04:00
Carson Gee
6b95ec8de2 Corrected NameError for invalid variable 2014-09-08 21:45:14 -04:00
Diana Huang
4f67f0dad9 Add course_id as merchant defined data 2014-09-08 15:43:44 -04:00
Clinton Blackburn
ee036ecaa6 Updated Analytics Dashboard Message 
Message to dashboard now includes the name of the application.
 2014-09-08 15:37:34 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Will Daly
a9c73d2490 Set order status to "paying" before redirecting to the external payment processor. 2014-09-08 10:51:51 -04:00
Adam
58e6dcf79c Merge pull request #5107 from edx/adam/resolve-merge-conflicts 
Adam/resolve merge conflicts
 2014-09-05 14:55:24 -04:00
Waqas Khalid
14d0ac014e Merge pull request #5038 from mlkwaqas/waqas/tnl151-closed-thread-flag-post-error 
Flagging posts in closed thread causes an error
 2014-09-05 22:29:44 +05:00
Adam Palay
cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
 2014-09-05 13:20:15 -04:00
Waqas Khalid
ac2436f520 User can flag the post whether thread is closed or open 
When the thread is closed user can't able to report
the thread and it gives the error. User can now report
thread even it is closed.

TNL-151
 2014-09-05 20:58:10 +05:00
Waqas Khalid
32d9234b39 Merge pull request #3880 from mlkwaqas/waqas/lms2646-create-order-list-index-error 
Handle the indexerror exception on create_order
 2014-09-05 17:07:46 +05:00
Nimisha Asthagiri
041d72ccc6 Update mongo counts. 2014-09-04 18:14:13 -04:00
Don Mitchell
b28af4fdaa Temporarily disable bulk operations b/c old mongo 
does too much work on exit and doesn't handle nesting
 2014-09-04 17:28:17 -04:00
Andy Armstrong
8349dbfa42 Implement forum cohort visibility labels correctly 
TNL-25
 2014-09-04 13:47:48 -04:00
Daniel Friedman
15c0531945 Merge pull request #5026 from edx/dan-f/test-lms-passes-group-id 
Test passing `group_id` in thread creation
 2014-09-04 10:34:10 -04:00
Don Mitchell
afa57f505b Remove client side parsing of module_id 
in analytics dashboard.
LMS-11209
 2014-09-03 21:59:29 -04:00
Daniel Friedman
25cbda6638 Test passing group_id in thread creation 2014-09-03 18:14:37 -04:00
chrisndodge
c5fc9b2fc8 Merge pull request #4771 from edx/cdodge/ecommerce-invoicing 
Cdodge/ecommerce invoicing
 2014-09-02 15:32:41 -04:00
Calen Pennington
1e2d5ffe03 Merge pull request #5031 from edx/andya/merge-hotfix-2014-08-29 
Merge hotfix-2014-08-29 to master
 2014-09-02 15:32:05 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic 
Updating EX-60 logic
 2014-09-02 13:03:24 -04:00
Stephen Sanchez
8eeb091de8 Merge pull request #5036 from edx/sanchez/fix_django_header_tests 
Sanchez/fix django header tests
 2014-09-02 10:44:16 -04:00
Calen Pennington
fb56588090 Tweak mongo count numbers 2014-09-02 10:29:23 -04:00
Alexander Kryklia
9a0d9f70c4 Merge pull request #4501 from htareque/lti_revision_3 
username and email request for lti module
 2014-09-02 17:11:24 +03:00
Waqas Khalid
d11aaec3a1 Handle the indexerror exception on create_order 
LMS-2646
 2014-09-02 19:08:53 +05:00
Calen Pennington
880673b97f Merge remote-tracking branch 'edx/master' into andya/merge-hotfix-2014-08-29 2014-09-02 09:38:25 -04:00
Stephen Sanchez
2f4fb30592 Cleaning up ddt syntax for new footer test. 2014-09-02 13:14:28 +00:00
htareque
3f159ea52b username and email request for lti module 
added username and email functionality, so that username and email can be passed to the lti third party app

rev2: added customizable text box

rev3: added revisions from auraz
 2014-09-02 08:12:36 -04:00