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

28352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
c83ea18d91 Fix test failing under one shard. 
This test consistently fails when combining
lms acceptance onto one shard. (TE-737)
 2015-02-02 16:05:55 -05:00
Ben Patterson
407e6ec76b LMS Acceptance to one shard. 
We've transitioned many lettuce tests to bok-choy. It no longer
makes sense to keep LMS acceptance in two shards (each taking less
than 5 mins to run the actual tests).
 2015-02-02 16:05:55 -05:00
Will Daly
fd4ada255c Merge pull request #6864 from edx/will/country-access-messaging 
ECOM-998: Country access messaging
 2015-02-02 15:46:25 -05:00
Will Daly
82d7e25f3e Add views to the embargo app to render messages explaining why students are blocked. 2015-02-02 14:04:29 -05:00
Will Daly
19f676a8d7 Merge pull request #6845 from edx/will/country-access-models 
Add new models to embargo to support country access
 2015-02-02 14:03:18 -05:00
Feanil Patel
3570e474e0 Merge pull request #5123 from IONISx/tusbar/enable-https-studio 
Use HTTP_X_FORWARDED_PROTO header in studio
 2015-02-02 13:09:29 -05:00
Christine Lytwynec
74ecb84fc5 Merge pull request #6862 from edx/clytwynec/disable_flaky_tests 
disable PayAndVerifyTest.test_immediate_verification_enrollment
 2015-02-02 12:44:51 -05:00
Will Daly
a5867da9de Add new models to embargo to support country access 
Add Django admin UI for configuring country access

Migrate existing embargo rules into the new tables.
 2015-02-02 11:54:41 -05:00
Bertrand Marron
4789c5c9d0 Use HTTP_X_FORWARDED_PROTO header in studio 2015-02-02 16:54:26 +01:00
Christine Lytwynec
e90c66431b disable PayAndVerifyTest.test_immediate_verification_enrollment 2015-02-02 10:40:48 -05:00
Sarina Canelake
4b6c62a85b Merge pull request #6856 from edx/sarina/20150202-translations-update 
Update translations (autogenerated message)
 2015-02-02 09:35:26 -05:00
Sarina Canelake
67fbfdc8e0 Update translations (autogenerated message) 2015-02-02 09:12:54 -05:00
Ben Patterson
5e1cc88736 Merge pull request #6825 from edx/benp/bok-choy-4shards 
Introduce another bok-choy shard.
 2015-02-02 09:08:18 -05:00
Martyn James
7601046729 Merge pull request #6852 from edx/dcikatic/SOL-302-hide-reindex 
SOL-302 Hide reindex button if 'ENABLE_COURSEWARE_INDEX' false
 2015-02-02 08:34:26 -05:00
Martyn James
98e92bfb12 Merge pull request #6847 from edx/mjames/search_setting 
Default search engine to None
 2015-02-02 08:31:06 -05:00
Anton Stupak
64b3768d6b Merge pull request #6837 from edx/anton/fix-flaky-unit-test 
TNL-1298: Flaky Jasmine test for Student Notes.
 2015-02-02 14:23:41 +02:00
Chris
2967f18d3f Merge pull request #6739 from edx/clrux/lms-navigation-accessibility-update 
Accessibility fixes for UX-1572
 2015-02-02 07:05:00 -05:00
Dino Cikatic
772908d79d SOL-302 Hide reindex button if 'ENABLE_COURSEWARE_INDEX' false 2015-02-02 11:22:36 +01:00
zubair-arbi
1b96a59771 Merge pull request #6833 from edx/zub/bugfix/plat-420-fix-create_child-for-split 
don't add xblock with 'detached' tag as direct child of course for split...
 2015-02-02 14:03:42 +05:00
polesye
bf3740696e TNL-1298: Flaky Jasmine test for Student Notes. 2015-02-02 09:53:24 +02:00
zubair-arbi
7d7cb7850f don't add xblock with 'detached' tag as direct child of course for split in 'create_child' method 
PLAT-420
 2015-02-02 12:31:57 +05:00
Ned Batchelder
41040be7cc Merge pull request #6850 from edx/ned/contributing-tweaks 
Three spelling fixes
 2015-02-01 07:56:35 -05:00
Ned Batchelder
a0d4aff5ce Three spelling fixes 
I was going to make a more substantial change, but then realized why I
shouldn't.  Along the way, I saw these three words that should be
corrected.  So I was left with three very minor spelling fixes.  Should
I abandon them?  Seemed unfortunate.  So I'm committing them.

These are the kinds of decisions software engineers have to make....
 2015-02-01 07:54:07 -05:00
Will Daly
79ffa0f57f Merge pull request #6838 from edx/will/fix-translator-comments-in-email 
ECOM-1018: Fix translator comments showing up in redeem code email.
 2015-01-30 17:47:16 -05:00
Martyn James
1b769b53cd Default search engine to None, so that all search/indexing operations are disabled until enabled 2015-01-30 16:40:03 -05:00
Mark Sadecki
3f211d3ded Merge pull request #6842 from edx/cptvitamin/add-meself-to-authors 
adds Mark Sadecki to AUTHORS
 2015-01-30 16:09:29 -05:00
Ben Patterson
73b6f3f8a0 Introduce another bok-choy shard. 
Bok choy will now be broken as follows:
* shard 1
* shard 2
* shard 3
* default shard (i.e. 'none of the above')

We use our shards to break up work and reduce overall test time by leveraging
multiple test systems.
 2015-01-30 15:43:35 -05:00
Ben Patterson
beb9602d2a Merge pull request #6841 from edx/benp/fix-all-scripts-bok-choy 
Fix test script shard bug.
 2015-01-30 15:36:43 -05:00
Will Daly
bf68daa46b Fix translator comments showing up in redeem code email. 
Fix newlines in redeem code email.

Update copy to make sense for edx.org as well as white label.
 2015-01-30 15:28:47 -05:00
Renzo Lucioni
8f974ea901 Merge pull request #6815 from edx/renzo/enable-logistration 
Make logistration generally available if feature flag is enabled
 2015-01-30 15:15:56 -05:00
Ben Patterson
3c689ea435 Fix test script shard bug. 
This will help with rollout of TE-720 and any future new shards.
 2015-01-30 15:15:29 -05:00
Mark Sadecki
74c46d364b adds Mark Sadecki to AUTHORS 2015-01-30 15:08:26 -05:00
Greg Price
20eb84d431 Merge pull request #6828 from edx/gprice/video-upload-ordering 
Sort Studio video uploads by creation date
 2015-01-30 15:08:09 -05:00
Chris Rodriguez
3acb5c53f0 Accessibility issues addressing UX-1572 2015-01-30 14:16:59 -05:00
Sarina Canelake
ef8b95b98e Merge pull request #6805 from edx/sarina/legal-update-footer-text 
Update Footer Copyright Notice as per Legal OPEN-444
 2015-01-30 14:09:38 -05:00
Renzo Lucioni
a8bed5ce98 Make logistration generally available if feature flag is active 
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:

- Adds support for redirect URLs in third party auth for combined login/registration page
- Adds support for external auth on the combined login/registration page
- Removes old login and registration acceptance tests
- Adds deprecation warnings to old login and register views
- Moves third party auth util to student_account
- Adds exception for microsites (theming)
 2015-01-30 13:28:30 -05:00
Greg Price
3978d91644 Sort Studio video uploads by creation date 
This provides a better UX for video uploaders, because recent uploads
are readily visible at the beginning of the table.
 2015-01-30 13:23:44 -05:00
Chris
0a0d306b6a Merge pull request #6750 from edx/clrux/lms-navigation-content-focus-update 
Accessibility issues addressing UX-1573
 2015-01-30 12:26:23 -05:00
Will Daly
edc37a0418 Merge pull request #6816 from edx/aamir-khan/ECOM-763-invalidkeyerror 
Aamir khan/ecom 763 invalidkeyerror
 2015-01-30 11:40:43 -05:00
Sarina Canelake
2fd7657e0f Update text in LMS footer as per legal 
[OPEN-444]
 2015-01-30 11:33:46 -05:00
Sarina Canelake
af763c287e Update text in Studio footer as per legal 
[OPEN-444]
 2015-01-30 11:33:46 -05:00
Adam
704fd1125f Merge pull request #6830 from edx/merge-release-into-master 
Merge release into master
 2015-01-30 10:48:14 -05:00
Adam Palay
bfcfbfab2f Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-01-30 09:44:42 -05:00
Stephen Sanchez
869b407e1f Merge pull request #6818 from edx/sanchez/allow_redeem_code_upgrades 
ECOM-990: Fix the redemption codes to allow upgrading course modes.
 2015-01-30 09:36:43 -05:00
David Baumgold
0bf348cb28 Merge pull request #6791 from open-craft/bump-xblock-for-unique-id 
Bump XBlock version to include unique default field values
 2015-01-30 09:36:10 -05:00
Muzaffar yousaf
ae102de3be Merge pull request #6777 from edx/muzaffar/student-info-tnl836 
Get user anonymous id via xblock user service.
 2015-01-30 19:35:26 +05:00
Sarina Canelake
011a5f9410 Merge pull request #6754 from OmarIthawi/edraak/omarithawi/bulk-mail-rtl 
TinyMCE RTL in course bulk email
 2015-01-30 09:12:56 -05:00
AlasdairSwan
a001737d8c Merge pull request #6827 from edx/alasdair/logistration-field-focus-fix 
ECOM-1002 fixed issue of grey background for logistration page. Also fix...
 2015-01-30 08:52:53 -05:00
Xavier Antoviaque
f07cd749e4 Merge pull request #6740 from open-craft/kelketek/better-contentlib-modulestore-warning 
Better Content Library Block Incompatible Modulestore Warning (SOL-225)
 2015-01-30 13:04:29 +01:00
Awais
f3bf66c1c0 ECOM-763 handling InvalidKeyError exception. 2015-01-30 11:41:30 +05:00