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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlasdairSwan
b14a129132 Merge pull request #5705 from edx/alasdair/logistration-error-styles 
Alasdair/logistration error styles
 2014-10-23 16:28:05 -04:00
AlasdairSwan
e332e79328 ECOM-369 Moved to Base FormView extended by other views. 2014-10-23 16:23:59 -04:00
Alison Hodges
01cd160e74 Course keys use key introspection 
@brianhw, @watsonemily, @srpearce, and @stroilova, please review.
Question: is there an impact on CommentThread.commentable_id for
discussion threads?
 2014-10-23 16:15:39 -04:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
Alison Hodges
bfcffd2def Merge pull request #5660 from edx/ahodges/doc/relnotes20141021 
Ahodges/doc/relnotes20141021
 2014-10-23 15:40:16 -04:00
Alison Hodges
7026aa4045 Release notes for 23 Oct 2014 
initial draft
 2014-10-23 15:39:40 -04:00
Stephen Sanchez
d9e47a6bd3 Merge pull request #5695 from edx/sanchez/enrollment-tests-and-cleanup 
enrollment tests and cleanup
 2014-10-23 15:31:46 -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
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
aba600cfae Merge pull request #5704 from edx/renzo/add-js-tests 
Add tests of access and password reset views
 2014-10-23 14:41:24 -04:00
Renzo Lucioni
f157ee1461 Add tests of access and password reset views 2014-10-23 14:39:22 -04:00
Giulio Gratta
07263de841 Convert icons on course_about to font awesome 2014-10-23 10:54:18 -07:00
Adam Palay
0be9a26521 change ItemNotFoundErrors to log.warning in x_module.py 2014-10-23 13:38:12 -04:00
stephensanchez
e7570c52e6 adding all the tests for data and api. 
Updating tests for views

Last chunk of tests and pep8 cleanup

Code Review cleanup.

Additional CR comments

Changing serialization of suggested prices.
 2014-10-23 16:57:29 +00:00
Will Daly
9aed03bea2 Merge pull request #5703 from edx/will/disable-auth-for-login-and-register 
Disable auth for login and registration end-points
 2014-10-23 11:52:41 -04:00
David Baumgold
14209c672a Merge pull request #5667 from lduarte1991/lduarte-harvardx-pr33 
Annotation Tools: Upgrading Share plugin from v1.0 to v1.1
 2014-10-23 11:22:22 -04:00
srpearce
46b2f0d7a0 Merge pull request #5694 from edx/sylvia/docs/DOC-842 
Add note about provisional status to annotation problem type
 2014-10-23 11:16:03 -04:00
Sylvia Pearce
c922910817 Add note about provisional status to annotation problem type 2014-10-23 11:15:40 -04:00
Will Daly
fb5a8098de Disable auth for login and registration end-points 2014-10-23 10:20:37 -04:00
Tim Babych
8fbdf712fa Merge pull request #5698 from edx/tim/django-1.4.16 
Update django version to 1.4.16
 2014-10-23 16:46:41 +03:00
Will Daly
d8eafc4754 Merge pull request #5701 from edx/will/call-default-something-else 
Use 'defaultValue' instead of 'default' in the form description.
 2014-10-23 09:15:39 -04:00
Will Daly
0245c7e16e Use 'defaultValue' instead of 'default' in the form description. Fix an error that would cause the login and password reset pages to not load correctly. 2014-10-23 08:56:40 -04:00
Anton Stupak
b12aa0b1b6 Merge pull request #5518 from edx/anton/requirejs-optimizer 
Add RequireJS Optimizer.
 2014-10-23 15:29:42 +03:00
Omar Al-Ithawi
4f4349a63b Make staff debug info code to be always LTR 2014-10-23 14:26:56 +03:00
Oleg Marshev
f550359d67 Merge pull request #5545 from edx/oleg/lms-dashboard-course-start-time 
Add course start/end time to student dashboard.
 2014-10-23 11:56:37 +03:00
Tim Babych
693089e4a1 Update django version to 1.4.16 2014-10-23 11:54:18 +03:00
Stephen Sanchez
3775efae7d Merge pull request #5687 from edx/sanchez/no-donations-for-microsites 
Adding an additional check to avoid donations showing up for microsites.
 2014-10-22 17:24:59 -04:00
Alison Hodges
72becf59ab Merge pull request #5691 from edx/ahodges/doc/country_required 
Registration page images out of date
 2014-10-22 17:16:30 -04:00
Will Daly
33f0e92d62 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 2014-10-22 17:13:30 -04:00
Will Daly
82385c4e36 Merge pull request #5679 from edx/will/logistration-third-party-auth 
Integrate third party auth into the combined login/registration page.
 2014-10-22 17:11:44 -04:00
Will Daly
9e9dec1de1 Integrate third party auth into the combined login/registration page. 
Change third party auth login failure code to a 401, to detect authentication
success with no linked account.

If already authenticated, redirect immediately to the dashboard.

Use "Location" header correctly for 302 redirects from student views.

Add utility functions for simulating a running third-party auth pipeline.

Add a utility function for checking whether third party auth is enabled.

Respect default values sent by the server
 2014-10-22 17:10:49 -04:00
stephensanchez
128d4836c0 Change design to check for min price or suggested prices. 2014-10-22 20:26:03 +00:00
Tim Babych
ffd64212ea Merge pull request #5657 from edx/tim/mktg-iframe-trim 
TNL-281: reduce amount of JS in marketing iframe
 2014-10-22 23:03:15 +03:00
Alison Hodges
08660da8c3 Registration page images out of date 2014-10-22 15:59:58 -04:00
chrisndodge
817db22319 Merge pull request #5688 from edx/cdodge/use-platform-name 
Dont use site_name, use platform_name in the shopping cart flow template
 2014-10-22 15:55:31 -04:00
stephensanchez
de4a2191c8 pep8 error. 2014-10-22 19:53:59 +00:00
Carol Tong
4d1a39bd8e Remove caution re grade exports + content experiments 2014-10-22 15:39:46 -04:00
Jesse Zoldak
ff2f226b83 Add Solano Labs tddium artifacts to gitignore 2014-10-22 15:27:52 -04:00
Chris Dodge
f463aca922 Dont use site_name, use platform_name in the shopping cart flow template 2014-10-22 15:09:10 -04:00
stephensanchez
d5966b1e21 Adding an additional check to avoid donations showing up for microsites. 2014-10-22 18:20:32 +00:00
Adam
7e12e40164 Merge pull request #5532 from edx/adam/disable-pycontracts-on-startup 
disable pycontracts except in development environments (PLAT-122)
 2014-10-22 14:17:45 -04:00
Ben Patterson
ed59dfbc15 Merge pull request #5686 from edx/benp/tddium-timeout 
Increase overall build timeout.
 2014-10-22 14:06:37 -04:00
Tim Babych
fc6cb50256 TNL-281: reduce amount of JS in marketing iframe 2014-10-22 20:54:45 +03:00
Ben Patterson
8d574a2545 Increase overall build timeout. 2014-10-22 13:36:39 -04:00
Carlos Andrés Rocha
578f5b6299 Merge pull request #5673 from rocha/fix-course-structure-command 
Fix dump course structure when element metadata uses opaque keys.
 2014-10-22 10:22:55 -07:00
Christina Roberts
d4531201e5 Merge pull request #5654 from edx/christina/visible_graded_content 
Tests for conditional content (split_test module).
 2014-10-22 12:55:30 -04:00
Carlos Andrés Rocha
a1a7504f81 Fix dump course structure when element metadata uses opaque keys. 
Make sure that during the serialization, all opaque keys and their
references and serialized using the `unicode` function.

AN-3821
 2014-10-22 12:36:50 -04:00
Renzo Lucioni
afefe21c4f Merge pull request #5682 from edx/renzo/add-js-tests 
WIP: Add JS tests of access, login, register, and password reset views
 2014-10-22 10:39:29 -04:00
cahrens
c09632ef69 Tests for conditional content (split_test module). 
TNL-39
 2014-10-22 10:38:50 -04:00
Renzo Lucioni
21e5805bd9 WIP: Add JS tests of access, login, register, and password reset views 2014-10-22 10:23:39 -04:00