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

26844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stv
dff5772cda Fix PEP8: E121 continuation line indentation 
is not a multiple of four
 2014-11-24 20:44:43 -05:00
Nimisha Asthagiri
ec74398d74 Merge pull request #5956 from edx/mobile/analytics-shim-update 
MA-90 Update Analytics Shim to match new mobile requirements.
 2014-11-14 19:59:12 -05:00
John Eskew
126747febc Merge pull request #5960 from edx/jeskew/default_asset_collection_name 
Always create an asset metadata collection in the Mongo modulestore.
 2014-11-14 13:54:52 -05:00
Sarina Canelake
810df8b7de Merge pull request #5885 from edx/sarina/name-branded-assets-in-lms 
Consistently name branded assets in lms
 2014-11-14 13:29:22 -05:00
Adam
3f5c824b74 Merge pull request #5957 from edx/adam/disable-purchase-button-on-click 
disable "go to payment button" on click (ECOM-643)
 2014-11-14 12:43:26 -05:00
Adam Palay
bc8d0a9976 disable "go to payment button" on click (ECOM-643) 2014-11-14 12:22:30 -05:00
David Baumgold
559f1e194e Merge pull request #5941 from edx/studio-images 
Moved Studio images from img/ directory to images/ directory
 2014-11-14 10:33:26 -05:00
Sarina Canelake
ab54f9cf42 Translate "Powered by Open edX" string 2014-11-14 10:30:37 -05:00
Sarina Canelake
ab5da97c41 Consistently name edX branded elements within the LMS [OPEN-300] 2014-11-14 10:30:37 -05:00
Stephen Sanchez
a84e4598dd Merge pull request #5955 from edx/sanchez/fix-djfs-dependency 
Fix the DJFS dependency.
 2014-11-14 10:15:41 -05:00
John Eskew
546d81a822 Always create an asset metadata collection in the Mongo modulestore. 
If no collection name is specified, use a default name.
https://openedx.atlassian.net/browse/PLAT-294
 2014-11-14 09:44:31 -05:00
John Eskew
600e7bf331 Merge pull request #5953 from edx/jeskew/created_by_on_addition 
Add created_on and created_by to asset metadata storage.
 2014-11-14 08:52:49 -05:00
Ben Patterson
3ae312caa6 Merge pull request #5954 from edx/benp/mysql56-test-updates 
Don't use 'test' db for mysql since it's reserved.
 2014-11-13 19:50:54 -05:00
Nimisha Asthagiri
07d50ba7a1 MA-90 Update Analytics Shim to match new mobile requirements. 2014-11-13 18:18:57 -05:00
stephensanchez
3396b2bb2c Fix the DJFS dependency. 2014-11-13 22:07:39 +00:00
Stephen Sanchez
66ff4e67cb Merge pull request #5946 from edx/sanchez/ecommerce_info_to_ga 
Adding new Google Analytics eCommerce event to shoppingcart.
 2014-11-13 16:51:37 -05:00
John Eskew
872faddba8 Add created_on and created_by to asset metadata storage. 
https://openedx.atlassian.net/browse/PLAT-278
 2014-11-13 14:59:12 -05:00
Ben Patterson
a19b97c61f Don't use 'test' db for mysql since it's reserved. 
This db name is reserved and used by mysql installations. This can cause
conflicts when trying to populate our own 'test' database on mysql.
 2014-11-13 14:41:50 -05:00
John Eskew
a4fea91322 Merge pull request #5940 from edx/jeskew/mixed_copy_assets_between_modulestores 
One bok_choy video test is failing - but it passes locally and should be fine.
 2014-11-13 13:25:53 -05:00
stephensanchez
822f15546a Adding new Google Analytics eCommerce event to shoppingcart. 
Adding new event and test

pylint and comments
 2014-11-13 18:17:52 +00:00
John Eskew
a2cc8d994a Enable cross-modulestore copying of course asset metadata. 
https://openedx.atlassian.net/browse/PLAT-38
 2014-11-13 11:15:45 -05:00
Ben Patterson
3f7d0f242b Merge pull request #5943 from edx/benp/db-cache-mysql56 
Improve compatibility with additional mysql installations.
 2014-11-13 10:51:38 -05:00
Don Mitchell
51927808f0 Merge pull request #5939 from edx/split/course_asset 
Paging and sorting for assets
 2014-11-13 10:17:59 -05:00
David Ormsbee
43d8c7a712 Merge branch 'release' 
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
 2014-11-13 10:11:12 -05:00
Ben Patterson
8e2d794264 Improve compatibility with additional mysql installations. 
Some mysql debian packages do not grant mysql user as many permissions, and
we need to add them.
 2014-11-12 22:11:59 -05:00
David Baumgold
e00424a091 Moved Studio images from img/ directory to images/ directory 
OPEN-304
 2014-11-12 17:19:23 -05:00
Don Mitchell
482113883a Paging and sorting for assets 
PLAT-75
 2014-11-12 16:05:59 -05:00
David Baumgold
a0a5746e21 Merge pull request #5935 from edx/db/upgrade-diff-cover 
Upgrade diff-cover
 2014-11-12 15:25:08 -05:00
Don Mitchell
978c2b240e Merge pull request #5933 from edx/dhm/bug_tnl-764 
Remove over optimization which didn't work correctly
 2014-11-12 15:20:15 -05:00
Greg Price
dec9e41d1b Merge pull request #5853 from edx/gprice/fix-complementary 
Fix spelling of complementary role
 2014-11-12 14:36:35 -05:00
David Baumgold
3676b4f72f Upgrade diff-cover 2014-11-12 14:17:27 -05:00
Don Mitchell
326a1221b9 Remove over optimization which didn't work correctly 
Added story PLAT-293 to do it correctly.
This fixes TNL-764
 2014-11-12 13:29:40 -05:00
Stephen Sanchez
fc8b2a5f37 Merge pull request #5720 from edx/sanchez/avoid_event_suppression 
Changing event suppression to signal suppression.
 2014-11-12 12:46:26 -05:00
stephensanchez
6e85ec0739 Changing event suppression to signal suppression. 
Code review changes.

Fix test and pylint.

pylint error.

Updating the test to verify the signal is fired.

Test for all analytics events

Import pylint error.

Pylint error
 2014-11-12 16:26:29 +00:00
David Baumgold
d981f98b9c Merge pull request #5814 from edx/disable-pylint-todo-comments 
Pylint: ignore TODO comments
 2014-11-12 10:51:40 -05:00
Dennis Jen
dd38f52358 Merge pull request #5838 from edx/dsjen/feature-flag-analytics-enrollments 
Feature flagged enrollment counts on instructor dashboard.
 2014-11-12 10:40:04 -05:00
David Ormsbee
1a4ad061b1 Merge pull request #5928 from edx/diana/fix-pylint-complaint 
Fix pylint violation.
 2014-11-12 09:26:34 -05:00
Nimisha Asthagiri
3651f2c0e9 Merge pull request #5921 from edx/gprice/fix-oauth-token-login 
Fix OAuth token login endpoint to set session user
 2014-11-12 09:19:35 -05:00
Diana Huang
da5bfd45aa Fix pylint violation. 2014-11-12 09:17:56 -05:00
Christina Roberts
24039fb813 Merge pull request #5881 from edx/christina/notification-requirejs 
Use factory file so JS used by studio_xblock_wrapper.html goes through RequireJS Optimizer
 2014-11-12 09:08:05 -05:00
Adam
4486ce35a7 Merge pull request #5913 from edx/adam/prevent-accidental-course-mode-downgrade 
Prevent instructors from accidentally downgrading enrollment modes throu...
 2014-11-12 09:05:01 -05:00
chrisndodge
257b22e228 Merge pull request #5922 from edx/cdodge/fix-import-error 
try importing the exact references we need rather than deferencing it fr...
 2014-11-12 09:04:19 -05:00
zubair-arbi
6dae34a34b Merge pull request #5923 from edx/zub/bugfix/wl-150-survey-form-error-on-info-page 
avoid annonymous user from redirecting to survey form
 2014-11-12 18:14:38 +05:00
Chris Dodge
a93faad78b try importing the exact references we need rather than deferencing it from the djangoapp module 2014-11-11 21:49:13 -05:00
Sarina Canelake
7ada956975 Merge pull request #5918 from stvstnfrd/pep8/whitespace 
Fix whitespace-related PEP8 issues
 2014-11-11 09:01:43 -05:00
zubair-arbi
b7d526b907 avoid annonymous user from redirecting to survey form 
WL-150
 2014-11-11 14:22:26 +05:00
stv
bd4658e6a0 Lower PEP8 threshold to 150 violations 2014-11-10 19:31:09 -08:00
stv
1164624fbc Fix PEP8: W291 trailing whitespace 2014-11-10 19:31:09 -08:00
stv
cb894cf35e Fix PEP8: E261 at least two spaces before inline comment 2014-11-10 19:31:09 -08:00
stv
180adfed52 Fix PEP8: E251 unexpected spaces around keyword / parameter equals 2014-11-10 19:31:09 -08:00