Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zubair-arbi
f7d6060276 Merge pull request #5658 from edx/zub/bugfix/tnl-554-conflictingimportmessages 
show warning on navigate away from import page only for first two stages
 2014-10-28 18:56:23 +05:00
David Baumgold
9ff0979693 Correct doc link 2014-10-28 09:26:08 -04:00
Sarina Canelake
f1b95b3484 Merge pull request #5699 from Edraak/staff-debug-info-ltr-code 
Make staff debug info code to be always LTR
 2014-10-28 09:13:51 -04:00
Waheed Ahmed
eb42961017 Merge pull request #5734 from edx/waheed/tnl222-fix-upload-button-on-high-level-source-edit 
Fixed upload button on high level source editing popup.
 2014-10-28 14:12:03 +05:00
Waheed Ahmed
41d2fa1a5e Fixed upload button on high level source editing popup. 
TNL-222
 2014-10-28 13:02:57 +05:00
srpearce
78a50bd7d7 Merge pull request #5748 from edx/sylvia/docs/prob_correct 
Replace index file
 2014-10-27 17:07:02 -04:00
Frances Botsford
87d2a4cbb9 reorg of the receipt page header to match rest of the flow; removed cart-list class from receipt page wrapper 2014-10-27 17:05:00 -04:00
Sylvia Pearce
8f825ca6aa Replace index file 2014-10-27 16:18:11 -04:00
Adam
1a1ad7913d Merge pull request #5747 from edx/adam/update-ora2 
update ora2 to fix TNL-680
 2014-10-27 15:53:04 -04:00
srpearce
4742687a13 Merge pull request #5746 from edx/sylvia/docs/prob_migration 
Migrate exercises and tools to shared folder
 2014-10-27 15:50:05 -04:00
Adam Palay
4e628ad2e4 update ora2 to fix TNL-680 2014-10-27 15:37:24 -04:00
Sylvia Pearce
dfd00a0276 Migrate exercises and tools to shared folder 2014-10-27 15:36:45 -04:00
AlasdairSwan
a9a4057dab Merge pull request #5718 from edx/alasdair/logistration-t-and-c 
ECOM-466 Added support for custom error messages. Styled select widths
 2014-10-27 15:22:24 -04:00
AlasdairSwan
fd14406aed ECOM-369 merged and resolved issues with third party auth error messaging 2014-10-27 15:19:36 -04:00
AlasdairSwan
1b1eb78123 ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging 2014-10-27 15:19:07 -04:00
AlasdairSwan
d2accb6d34 ECOM-369 Added handling of model save errors. Updated FormView to add preRender function to limit amount of duplicate code. Updated PasswordResetModel to return error object when errors occur. 2014-10-27 15:19:07 -04:00
Will Daly
be2b55590c Use a 403 status to indicate that the user does not have a linked 
account for third party auth.
 2014-10-27 15:18:10 -04:00
AlasdairSwan
08e03ef380 ECOM-369 updated in light of review with Andy and code review 2014-10-27 15:17:07 -04:00
Renzo Lucioni
ca0d048b4f Fix failing JS tests 2014-10-27 15:17:07 -04:00
AlasdairSwan
0b9ed0315b ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging 2014-10-27 15:17:07 -04:00
AlasdairSwan
3efeaf5a47 Moved pre-render to first in initialize to ensure runs before render 2014-10-27 15:16:33 -04:00
AlasdairSwan
2ea9685552 ECOM-369 Added handling of model save errors. Updated FormView to add preRender function to limit amount of duplicate code. Updated PasswordResetModel to return error object when errors occur. 2014-10-27 15:16:33 -04:00
AlasdairSwan
a86e9e68db ECOM-466 Added support for custom error messages. Styled select widths 2014-10-27 15:15:10 -04:00
Will Daly
0735141afc Merge pull request #5730 from edx/will/update-donation-tests 
Add a test for donations with a white-label course mode
 2014-10-27 14:13:44 -04:00
John Eskew
ed9e059b5c Merge pull request #5557 from edx/jeskew/minor_xblock_doc_edit 
Fix XBlock doc formatting. No content change! Only formatting...
 2014-10-27 13:34:19 -04:00
Jason Zhu
4e528140f8 When s3fs cannot be accessed replaced with osfs 2014-10-28 00:01:55 +08:00
Will Daly
5a1df635d0 Merge pull request #5735 from edx/will/update-release-10-27 
Merge release into master (with changes from Friday 10/24/14)
 2014-10-27 12:01:09 -04:00
Sarina Canelake
25a745526c Merge pull request #5737 from edx/sarina/102714-translations-update 
Update translations (autogenerated message)
 2014-10-27 11:44:15 -04:00
Usman Khalid
ca65b68636 Added commit_on_success_with_read_committed decorator to courseware.views.index. 
TNL-367
 2014-10-27 20:44:14 +05:00
Sarina Canelake
e4bfa0f9ff Update translations (autogenerated message) 2014-10-27 11:43:16 -04:00
Don Mitchell
22cbe0c410 Merge pull request #5723 from edx/dhm/split_assetstore 
Implement asset metadata storage in Split - per-asset functionality
 2014-10-27 11:36:29 -04:00
Ben Patterson
ed2ca50804 Merge pull request #5732 from edx/benp/optimize-run-quality 
Optimize run_quality calls
 2014-10-27 11:08:59 -04:00
Will Daly
0cac6ea21b Fix pylint violations 2014-10-27 11:04:22 -04:00
Will Daly
7f54af3be0 Merge remote-tracking branch 'origin/release' 2014-10-27 10:59:31 -04:00
Will Daly
cafea30769 Merge pull request #5722 from edx/renzo/third-party-auth-no-prof-ed-autoenroll 
Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth
 2014-10-27 10:58:50 -04:00
Don Mitchell
f48289cc4f Moved assetstore tests to own file and ddt'd across stores 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
 2014-10-27 10:04:10 -04:00
Don Mitchell
b6fac23960 Implement asset metadata storage in Split - per-asset functionality 
PLAT-40

Conflicts:
	common/lib/xmodule/xmodule/assetstore/__init__.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-10-27 10:04:09 -04:00
Mark Hoeber
0064d29dc4 Merge pull request #5684 from edx/markhoeber-documentation-doc3 
Fixed Text Input Template
 2014-10-27 09:21:53 -04:00
Mark Hoeber
7ad5561abd Fixed Text Input Template 2014-10-27 09:21:26 -04:00
Mark Hoeber
fa93a69283 Merge pull request #5692 from edx/markhoeber-doc935 
Fixed code sample for python grader
 2014-10-27 09:07:05 -04:00
Mark Hoeber
c2428c7276 Fixed code sample for python grader 
Just a missing “
 2014-10-27 09:06:38 -04:00
Ben Patterson
9642468c98 Optimize run_quality calls 
Leverages recent changes in diff-cover to reduce number of diff-quality runs
 2014-10-27 07:06:58 -04:00
Will Daly
2c062ca08b Add a test for donations with a white-label course mode 2014-10-26 15:58:26 -04:00
Will Daly
60f02feb71 Merge pull request #5716 from edx/will/logistration-custom-error-msgs 
Add field from server to set custom error messages for logistration fields
 2014-10-25 14:29:21 -04:00
Will Daly
3996b0a7e6 Merge pull request #5708 from edx/will/fix-401-basic-auth-issue 
Logistration: Use a 403 status to indicate that the user does not have a linked account
 2014-10-25 14:29:05 -04:00
Ben Patterson
ff4a1755d0 Merge pull request #5650 from edx/benp/TE-555 
run_quality should run both quality reports in the case of a threshold breach
 2014-10-24 19:20:26 -04:00
srpearce
686ca3d779 Merge pull request #5583 from edx/sylvia/docs/SFD_Discussions 
Sylvia/docs/sfd discussions
 2014-10-24 17:12:44 -04:00
Sylvia Pearce
850c3a901a Add discussion info to SFD 2014-10-24 17:12:14 -04:00
Sarina Canelake
5b79de580a Update wording per Doc 2014-10-24 16:21:13 -04:00
Jesse Zoldak
26c01dffe3 Merge pull request #5721 from edx/zoldak/fix-easy-access-test 
Fix test page definition for course group configurations page
 2014-10-24 16:16:43 -04:00