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

8918 Commits

Author SHA1 Message Date
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
Sarina Canelake
ed97d98be7 Merge pull request #5158 from edx/sarina/update-transifex-langs 
Transifex config: add Swedish and Swahili language codes
 2014-09-10 13:11:02 -04:00
Sarina Canelake
f0c8139ad8 Transifex config: add Swedish and Swahili language codes 2014-09-10 11:48:45 -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
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
Brian Talbot
f77466d0b3 LMS: resolves focus background-color issue of 3rd party login buttons 2014-09-09 12:49:28 -04:00
Gabe Mulley
c606c295e1 Merge pull request #5002 from mulby/gabe/add-segmentio-hook 
Add event tracking endpoint to be called by segment.io
 2014-09-09 09:17:07 -04:00
Gabe Mulley
7900e8d346 Add event tracking endpoint to be called by segment.io 2014-09-09 07:25:54 -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
Renzo Lucioni
ba7ff67a55 Merge pull request #5113 from edx/renzo/remove-unused-js 
Remove unused analytics JS left over by 3rd party auth changes
 2014-09-08 15:36:05 -04:00
Sarina Canelake
b0c2b73d80 Merge pull request #5112 from edx/sarina/quality-clean 
Quality cleanup
 2014-09-08 13:48:57 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Piotr Mitros
a12c795944 Merge pull request #5120 from edx/pmitros/aws-djpyfs 
AWS settings for XBlocks to have filesystem-like storage
 2014-09-08 11:59:23 -04:00
Greg Price
3cf2481e6c Merge pull request #5077 from edx/gprice/forum-cohort-selector-test 
Test cohort selector in NewPostView
 2014-09-08 11:54:30 -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
Piotr Mitros
31176aeb37 AWS settings for XBlocks to have filesystem-like storage 
Upgrades to latest pyfs to support auth not through environment variables
 2014-09-08 10:46:18 -04:00
Renzo Lucioni
823be96843 Remove unused analytics JS left over by 3rd party auth changes 2014-09-05 15:46:23 -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
Brian Talbot
a6f2dd67e4 Merge pull request #5105 from edx/talbs/os-ggg-a11y 
LMS: Accessibility Tweaks
 2014-09-05 13:57:57 -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
Brian Talbot
f11b44c49e LMS: revising more pronounced focus state of onboarding buttons 2014-09-05 12:50: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
Adam
08f851aa7e Merge pull request #5095 from edx/cdodge/white-label-small-hotfixes 
Cdodge/white label small hotfixes
 2014-09-05 11:06:59 -04:00
Han Su Kim
b1ada02819 Merge pull request #5084 from edx/hotfix/2014-09-04b 
Tmporarily disable bulk operations b/c old mongo
 2014-09-05 11:00:02 -04:00
Renzo Lucioni
aa28fba9ad Revert "Revert "Merge pull request #4976 from edx/will/ecom-128"" 
This reverts commit 371dfd6187.
 2014-09-05 10:51:51 -04:00
Adam
385b3ff48a Merge pull request #5087 from edx/release 
Release
 2014-09-05 09:31:40 -04: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
Chris Dodge
405baab82a don't hard code the shoppingcart order confirmation page to use settings.xxx, allow for microsites to override 2014-09-04 22:18:16 -04:00
Chris Dodge
568ef4184a remove course-id visual column from the list of coupons as it's useless information here and prevents overflows from happening 2014-09-04 22:17:50 -04:00
Greg Price
1de17fb745 Move more forum nav rendering logic to front end 
The cohort selector is rendered only for a privileged user in a cohorted
course, and that logic is now in an Underscore template instead of Mako.
 2014-09-04 18:22:19 -04:00
Nimisha Asthagiri
041d72ccc6 Update mongo counts. 2014-09-04 18:14:13 -04:00
Greg Price
cd0ea052ed Ensure forum nav cohort selector works correctly 
One minor case is fixed (to pass "" instead of "all" as the group_id
parameter to indicate viewing all threads), and tests are added.
 2014-09-04 18:00:43 -04:00
Giulio Gratta
e0b7e8cfbb increase contrast of submission_feedback text 2014-09-04 17:45:47 -04:00
Giulio Gratta
e0262bd7a9 Make primary button focus state more pronounced 2014-09-04 17:45:47 -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
Diana Huang
371dfd6187 Revert "Merge pull request #4976 from edx/will/ecom-128" 
This reverts commit a03baee25c, reversing
changes made to 12e2d442e9.
 2014-09-04 16:01:28 -04:00
Han Su Kim
578be6cc70 Merge branch 'release' 2014-09-04 15:50:33 -04:00
Andy Armstrong
8349dbfa42 Implement forum cohort visibility labels correctly 
TNL-25
 2014-09-04 13:47:48 -04:00