Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,165 Commits 1 Branch 0 Tags
9cbc8564a12eaae381ebefeb7c98b420f7265b68
Commit Graph

32165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anton Stupak
ce4fb60ba0 Merge pull request #5598 from edx/anton/maintenance-fonts 
Maintenance page: Serving Fonts through Platform Assets
 2014-10-22 17:19:22 +03:00
AlasdairSwan
5671392a5d Merge pull request #5681 from edx/alasdair/logistration-styling 
Alasdair/logistration styling - merge approved by Will
 2014-10-22 10:16:05 -04:00
AlasdairSwan
3a0304724d ECOM-531 tweaking margins 2014-10-22 09:52:40 -04:00
chrisndodge
228c513dd3 Merge pull request #5678 from edx/cdodge/shoppingcart-rewrite-hotfix1 
css fix of remove icon and Fixed a bug where the discount coupon applied...
 2014-10-22 09:47:08 -04:00
Don Mitchell
00ca7cbde5 Merge pull request #5649 from edx/dhm/update_ok 
Update opaque_keys to new release
 2014-10-22 09:42:29 -04:00
Don Mitchell
2ac069a6ae Merge pull request #5653 from edx/dhm/PLAT-189 
Add command line command to create course in either split or mongo
 2014-10-22 09:41:55 -04:00
Oleg Marshev
21056b950e Use DATE_TIME format for course start or end time in student dashboard. 2014-10-22 16:23:32 +03:00
lduarte1991
976c3cb11f Annotation Tool: Fix Share Plugin style and spacing 
- fixed parseInt issue

 - PR fixes
 2014-10-22 09:22:10 -04:00
lduarte1991
deefe9b13e Annotation Tools: Updated Share plugin from version 1.0 to v1.1 2014-10-22 09:21:39 -04:00
clytwynec
def3467e45 Merge pull request #5672 from benpatterson/testeng/rebase-upstream 
Testeng/rebase upstream
 2014-10-22 09:19:03 -04:00
Muhammad Shoaib
b0802aafc8 css fix of remove icon and Fixed a bug where the discount coupon applied ‘disappeared’ 
when changing the quantity between enrollment vs reg code cart types.
 2014-10-22 09:12:32 -04:00
polesye
7e6483f7b5 TNL-633: Remove leftover Google Font reference. 2014-10-22 16:11:49 +03:00
AlasdairSwan
ab035a0ebb ECOM-531 updating grid column counts in media queries and added some more classes to style against instead of elements 2014-10-22 09:06:28 -04:00
chrisndodge
7dc13508cb Merge pull request #5674 from edx/cdodge/single-seat-order-receipt-email-is-not-html 
only multi-seat emails is html
 2014-10-22 08:59:25 -04:00
Adam
2bb44a001a Merge pull request #5641 from edx/adam/update-latex-data 
update latex problem data (TNL-264)
 2014-10-22 08:52:52 -04:00
Chris Dodge
cb6f96603b only multi-seat emails is html 2014-10-22 00:37:46 -04:00
Muhammad Ammar
03b9ed744f Publish datadog stats for build 
TE-453
 2014-10-22 00:05:03 +00:00
Ben Patterson
3a6a519bac Upgrade to mongo 2.6.4 2014-10-22 00:05:03 +00:00
Muhammad Ammar
ff0e8c3805 Merge Coverage Reports 
TE-465
 2014-10-22 00:05:03 +00:00
Ben Patterson
5524e0bdee Add quality report capability. 2014-10-22 00:05:03 +00:00
Ben Patterson
a90ba504f7 re-shard lms to fix a failing test. 2014-10-22 00:05:03 +00:00