Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3531 Commits

Author SHA1 Message Date
David Ormsbee
43d8c7a712 Merge branch 'release' 
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
 2014-11-13 10:11:12 -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
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
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
AlasdairSwan
790ac3f3ef Merge pull request #5915 from edx/alasdair/rwd-trackselection 
ECOM-574 Updated track selection page to be responsive
 2014-11-10 16:41:50 -05:00
AlasdairSwan
23081f076b ECOM-574 Updated track selection page to be responsive 2014-11-10 15:39:17 -05:00
Will Daly
5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
 2014-11-10 15:05:37 -05:00
Chris Dodge
3c36f7cbad Add new course_module field which describes what the catalog visibility should be (both, about, none) 2014-11-09 10:36:00 -05:00
Will Daly
578c04f62f Put logistration page behind a feature flag 2014-11-07 13:05:17 -05:00
Will Daly
e629ce2ba6 Move redirection/enrollment to AccessView and trigger it using an event. 
Ensure window.isExternal is loaded

Don't set a default for terms of service

For paid courses, add the course to the cart and redirect to the shopping cart view.

Don't send form method and url as form data.

Stub window.analytics in the access view test.
 2014-11-07 12:59:08 -05:00
Renzo Lucioni
bedd6cc2f5 Jasmine tests of validation utility 
Includes a modification of validation logic which performs min and max length checks on optional fields in addition to required fields.
 2014-11-07 10:44:25 -05:00
Dennis Jen
b27401554c Feature flagged enrollment counts on instructor dashboard. 
* enrollments counts removed from legacy dashboard
 2014-11-04 12:56:53 -05:00
Sarina Canelake
fece2b9dd2 Merge pull request #5821 from edx/sarina/remove-old-admin-files 
Remove admin files deprecated in Django 1.4
 2014-11-04 10:55:13 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/course_modes/views.py
 2014-11-04 10:50:09 -05:00
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8 
Remove more pep8 violations
 2014-11-04 08:58:17 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Gabe Mulley
821c97fbb4 Implement shim for mobile video events. 
This PR addresses the following issues:

1) All requests return a 200 OK unless there is an authorization failure. This is deliberate in case the secret key is compromised.
2) Push all of the nasty logic necessary to generate compatible video events into the LMS instead of trying to do that mapping on the mobile devices.
3) Stop using the deprecated "action" field in the segment.io event. According to their support team this field should not be used anymore and is just around for backwards compatibility reasons.

Fixes: AN-3818
 2014-11-03 14:12:07 -05:00
Clinton Blackburn
22952af61f Merge pull request #5782 from edx/remove-analytics-demographics 
Updates to Demographics Display
 2014-11-03 10:07:31 -05:00
Sarina Canelake
ed76907c0d Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 
Delete lms/static/admin resources as they are no longer needed
for the admin page as of Django 1.4

Moved two files that were referenced elsewhere:
lms/static/admin/js/jquery.min.js -> lms/static/js/admin/jquery.min.js
lms/static/admin/js/urlify.js -> lms/static/js/admin/urlify.js
 2014-11-01 00:01:17 -04:00
Martyn James
9f3b9c7ba3 Merge pull request #5818 from edx/release 
Merging latest updates to release
 2014-10-31 14:49:04 -04:00
Feanil Patel
7d2a2f896c Merge pull request #5291 from fmyzjs/s3_storgae 
When s3fs cannot be accessed replaced with osfs
 2014-10-31 09:52:02 -04:00
Diana Huang
fc468bf696 Set up basic enrollment infrastructure. 2014-10-30 17:15:26 -04:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -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
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
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
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
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
Jason Zhu
4e528140f8 When s3fs cannot be accessed replaced with osfs 2014-10-28 00:01:55 +08:00
John Eskew
b857a0ed7b Phase 1 of adding asset metadata saving to old Mongo 2014-10-24 11:07:32 -04:00
AlasdairSwan
e332e79328 ECOM-369 Moved to Base FormView extended by other views. 2014-10-23 16:23:59 -04: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
asadiqbal08
1035d67a25 WL-98 
fix typo and add more security on API

fix some bugs and typos

address PR feedback

be sure to send emails when accounts already exist

PR feedback

fix multiple uploads

pep8 fixes

pep8 fix

pylint fixes

fix url mapping

WL-98
- Complete code coverage
- Update code for error and warning messages.
- improve code as per some suggestions

updated the UI of the auto_enroll feature

fixed the errors

PR feedback

add test

add back file filtering

add some more error handling of input

remove unneeded coffeescript code

pylint fixes

add pep8 space

WL-98
- Updated and added test cases.
- Updated membership coffee file for errors display handling.
- fixed minor text issues.

allow for blank lines and add a test

add blank line (pep8)
 2014-10-21 14:23:46 -04:00
Will Daly
fabd8a97ad Fix validation for checkboxes in forms. 
Remove hard-coded TOS checkbox in registration template.
Disable new dashboard in settings; expose password reset end-point in student account app.
Added empty JS tests for new JavaScript
 2014-10-21 07:29:46 -04:00
AlasdairSwan
ed0c383ac0 Merge pull request #5647 from edx/alasdair/combine-reg-login-form 
Alasdair/combine reg login form
 2014-10-20 14:54:34 -04:00
AlasdairSwan
52ffe93866 ECOM-369 added forgot password flow plugged in to Renzo's API 2014-10-20 14:33:40 -04:00
AlasdairSwan
61db0182e5 Added password reset view and started basic styling 2014-10-20 12:12:17 -04:00
AlasdairSwan
b70dfb0780 ECOM-369 added registration view and front end validation 2014-10-20 12:07:51 -04:00
AlasdairSwan
bd0c5f227c ECOM-369 Added initial Backbone code which allows a user to login to lms 2014-10-20 12:07:51 -04:00
Will Daly
d774bcf36e Support separate terms of service and honor code checkboxes. 2014-10-20 11:26:17 -04:00
Will Daly
458186f7d1 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	lms/djangoapps/student_account/test/test_views.py
	lms/djangoapps/student_account/urls.py
	lms/djangoapps/student_account/views.py
 2014-10-20 10:57:05 -04:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Jesse Zoldak
24f90307f7 Remove references to /tmp in tests 
Including:

* Change path for mongo_metadata_inheritance to use unique temp dir
* Update SASS_CACHE_PATH with thread-safe temp dir
* Remove hard coded directory reference for grades download tests
* Remove hard coded directory reference for direct mongo test
 2014-10-17 10:00:12 -04:00
Will Daly
e89afa93c0 WIP: add login and registration end-points to the user API. 2014-10-16 08:48:38 -04:00
Will Daly
26a94afb26 Merge pull request #5573 from edx/will/django-countries-fix 
Update django-countries to 2.1.2, override country name for Taiwan
 2014-10-14 17:14:32 -04:00
Stephen Sanchez
7df00578f1 Merge pull request #5536 from edx/sanchez/remove-new-header-footer-flags 
Removing the feature flags for new header and footer.
 2014-10-14 15:06:45 -04:00