Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
Daniel Friedman
9bf22ea9fe Verify grade export works for problems in split tests 
TNL-41
 2014-10-30 09:58:16 -04:00
AlasdairSwan
ff753f2bcb Merge pull request #5784 from edx/alasdair/rwd-header-and-footer 
Alasdair/rwd header and footer
 2014-10-30 09:21:21 -04:00
AlasdairSwan
0c22db688f ECOM-406 removed commented out code, moved colours to variables and fixed hover state for mobile menu 2014-10-30 09:20:48 -04:00
Nimisha Asthagiri
994ac6da6d Fixes for MOB-836 and MOB-766 and MA-96. 2014-10-29 22:06:42 -04:00
Martyn James
f61b968e01 Merge branch 'release' 2014-10-29 15:36:26 -04:00
Renzo Lucioni
bcef7611d4 Clean up logistration copy 2014-10-29 14:42:57 -04:00
AlasdairSwan
e04a3ab32b ECOM-406 Added JS fil that will update DOM to make the header and footer responsive 
Made the header and footer responsive
 2014-10-29 14:00:54 -04:00
Calen Pennington
34d09085ab Remove proxying of resources_fs, and add a unittest that exposes the problem 
[PLAT-191]
 2014-10-29 13:48:57 -04:00
Clinton Blackburn
13579ca9a8 Updates to Demographics Display 
- Gating on feature enabled for Open edX users
- If feature disabled and Insights URL is set, displaying message pointing users to Insights
 2014-10-29 12:31:44 -04:00
Clinton Blackburn
a3171eb8d8 Removed Analytics API Client 
Instructors should use Insights instead.
 2014-10-29 10:25:18 -04:00
Will Daly
c553a47c26 Update third party auth on the logistration form 2014-10-28 17:00:48 -04:00
Diana Huang
13986d8475 Update tests to match new text. 2014-10-28 16:28:58 -04:00
Will Daly
48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
 2014-10-28 15:16:27 -04:00
Diana Huang
9f441d22b0 Merge pull request #5745 from edx/will/third-party-auth-fixes 
Third Party Auth Fixes
 2014-10-28 13:06:40 -04:00
Tim Babych
306813674d Merge pull request #5761 from edx/tim/mktg-iframe-fix 
Do not show middle-click href in marketing iframe for logged in users
 2014-10-28 18:29:36 +02:00
Diana Huang
92b0bf10c1 Update tests to match new text. 2014-10-28 11:58:41 -04:00
John Eskew
831dd593c9 Add tests for empty analytics server info and url-encoded params. 2014-10-28 11:28:57 -04:00
John Eskew
38e88e3011 Check for empty URL and api key before old analytics api call. 
Encode course key as a URL parameter.
 2014-10-28 11:28:57 -04:00
Tim Babych
960f7b206a Fix to marketing iframe middle-click href: course does not always have openable url. 2014-10-28 17:20:57 +02:00
Will Daly
f9b5a9173f Redirect users to the track selection page or ?next page when using third party auth 
Set marketing site logged in cookie from third party auth.
 2014-10-28 10:28:30 -04:00
AlasdairSwan
728df71acf ECOM-531 Updated style after review with Andy Waldrop 2014-10-28 10:20:44 -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
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
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
Jason Zhu
4e528140f8 When s3fs cannot be accessed replaced with osfs 2014-10-28 00:01:55 +08: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
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
frances botsford
93425a7c47 Merge pull request #5719 from edx/frances/fix/rtl-dashboard-fixes 
small UI fixes on dashboard for RTL
 2014-10-24 15:26:42 -04:00
frances botsford
60bb6a1021 Merge pull request #5696 from Stanford-Online/giulio/course-about-font-awesomize 
Convert icons on course_about to font awesome
 2014-10-24 14:05:23 -04:00
Frances Botsford
13b97e3606 small UI fixes on dashboard for RTL 2014-10-24 14:01:39 -04:00
John Eskew
5ffc6ac256 Merge pull request #4854 from edx/jeskew/assetstore_modulestore_work 
Phase 1 of adding asset metadata saving to old Mongo
 2014-10-24 12:47:53 -04:00
Sarina Canelake
3d1c54fefa Merge pull request #5595 from Stanford-Online/caijim/resetbutton 
Support and tests for adding a reset button to units
 2014-10-24 11:49:24 -04:00
John Eskew
b857a0ed7b Phase 1 of adding asset metadata saving to old Mongo 2014-10-24 11:07:32 -04:00
Will Daly
cc07afb967 Use a 403 status to indicate that the user does not have a linked 
account for third party auth.
 2014-10-24 08:57:54 -04:00
AlasdairSwan
c3083069d1 ECOM-466 cleaned up form submission validation 2014-10-24 08:55:28 -04:00
Giulio Gratta
5b647a3a12 remove unused icon images 2014-10-23 14:04:15 -07:00
AlasdairSwan
e332e79328 ECOM-369 Moved to Base FormView extended by other views. 2014-10-23 16:23:59 -04:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
AlasdairSwan
d889a362ae ECOM-369 added meta to header to enable responsive. Set country dropdown to required for registration form 2014-10-23 15:22:27 -04:00
Jim
6d19a0c87c Support and tests for adding a reset button to units 
Users may want to start anew when answering a question. This commit decouples reset from randomization while still preserving backward compatibility. Users can clear their input.
Instructors can set course-wide and problem-specific settings for reset button display.
 2014-10-23 12:14:27 -07:00
Renzo Lucioni
f157ee1461 Add tests of access and password reset views 2014-10-23 14:39:22 -04:00