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

10394 Commits

Author SHA1 Message Date
cahrens
7a3a48b15b Update to work with split_modulestore. 
"run" should not be passed in kwargs to create.
 2015-02-09 09:26:05 -05:00
cahrens
6272817c07 Tests fail with split modulestore. 
Have not been able to work out why.
 2015-02-09 09:26:05 -05:00
Calen Pennington
61f86369ad Merge pull request #6843 from cpennington/test-for-plat-417 
Add tests of PLAT-417
 2015-02-09 09:15:12 -05:00
Jesse Zoldak
3f1604ac28 Merge pull request #6736 from edx/zoldak/content-library 
Fix flaky content library test
 2015-02-06 15:54:54 -05:00
John Eskew
46f64305f7 Merge pull request #6767 from edx/jeskew/split_course_export_slowdown_take_II 
Fix performance problem with Split course import/export.
 2015-02-06 15:18:26 -05:00
Jesse Zoldak
07e0eee2bd Fix flaky content library test 2015-02-06 14:59:31 -05:00
zubair-arbi
b01f7adce1 Merge pull request #6907 from edx/zub/bugfix/tnl-1335-html5-contextual-menu 
fix contextual menu (make it clickable) for HTML5 videos
 2015-02-06 21:38:09 +05:00
John Eskew
9388ba5968 Change new BlockData object from a dict to an object with specific 
attributes that are serialized/de-serialized to/from MongoDB.

Change access of attributes from dict keys.

Add EditInfo object to encapsulate editing info for block data.
 2015-02-06 11:28:54 -05:00
Calen Pennington
79fe947a92 Add test of PLAT-417 2015-02-06 09:59:49 -05:00
zubair-arbi
a750476c73 fix contextual menu (make it clickable) for HTML5 videos 
TNL-1335
 2015-02-06 16:18:09 +05:00
ahsan-ul-haq
c814323644 Merge pull request #6810 from edx/ahsan/tnl-1074-adaptive-hint-inaccessible 
Problem with Adaptive Hint is inaccessible
 2015-02-06 15:15:11 +05:00
Syed Hassan Raza
806a3d9af2 Quote the starts with expression id^ 
TNL-1240
 2015-02-06 11:53:04 +05:00
Brian Talbot
5785df241d Merge pull request #6875 from edx/talbs/update-font-awesome-4.3 
Upgrade: Font Awesome 4.3.0
 2015-02-05 12:38:49 -05:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02:00
Calen Pennington
2bb1aafaaf Merge pull request #6752 from cpennington/modulestore-test-case-cleanup 
Clean up ModuleStoreTestCase
 2015-02-04 15:57:01 -05:00
Akiva Leffert
50730da1b6 Merge branch 'release' 2015-02-04 13:14:29 -05:00
Ahsan Ulhaq
8f71cb6015 Adaptive hint inaccessible 
Remove the <p> and label from textline

tnl-1074
 2015-02-04 21:42:20 +05:00
Ahsan Ulhaq
9b9301a5d4 Problem with Adaptive Hint is inaccessible 
There were no label added for problem with adaptive hint so for the question
added the label and insteat of using for attribute used the label as the
parent of input field

TNL-1074
 2015-02-04 21:41:25 +05:00
Sarina Canelake
6cdaad58de Merge pull request #6730 from OmarIthawi/edraak/unicode-fixes-log-username 
(WIP) Unicode fixes for log messages with username and other unicode input
 2015-02-04 11:31:57 -05:00
Calen Pennington
199a8b783f Enforce the use of XModuleFactory only in contexts where something will clean up after it 2015-02-04 09:09:14 -05:00
Calen Pennington
b353ed2ea2 Better support specifying of modulestore configuration in test cases 
The existing pattern of using `override_settings(MODULESTORE=...)` prevented
us from having more than one layer of subclassing in modulestore tests.

In a structure like:

    @override_settings(MODULESTORE=store_a)
    class BaseTestCase(ModuleStoreTestCase):
        def setUp(self):
            # use store

    @override_settings(MODULESTORE=store_b)
    class ChildTestCase(BaseTestCase):
        def setUp(self):
            # use store

In this case, the store actions performed in `BaseTestCase` on behalf of
`ChildTestCase` would still use `store_a`, even though the `ChildTestCase`
had specified to use `store_b`. This is because the `override_settings`
decorator would be the innermost wrapper around the `BaseTestCase.setUp` method,
no matter what `ChildTestCase` does.

To remedy this, we move the call to `override_settings` into the
`ModuleStoreTestCase.setUp` method, and use a cleanup to remove the override.
Subclasses can just defined the `MODULESTORE` class attribute to specify which
modulestore to use _for the entire `setUp` chain_.

[PLAT-419]
 2015-02-04 09:09:14 -05:00
Calen Pennington
03a05fd9d4 Always call super(..).setUp() from setUp 2015-02-04 09:09:14 -05:00
Will Daly
820cc4aaee Merge pull request #6784 from edx/will/invoice-refactor-squashed 
Invoice data model refactor
 2015-02-04 07:48:57 -05:00
Sarina Canelake
01064fcc79 Fix logging calls to use unicode, and lazy logging 2015-02-04 10:53:33 +02:00
Omar Al-Ithawi
4e733c6e1f Unicode fixes for log messages and other things 2015-02-04 09:55:44 +02:00
Chris
6266dcf1e7 Merge pull request #6820 from edx/clrux/forums-assign-regions 
Assign regions/landmarks for easier navigation
 2015-02-03 16:03:18 -05:00
Brian Talbot
89a05d8880 Upgrading Font Awesome vendor files from 4.2.0 to 4.3.0 2015-02-03 15:21:20 -05:00
Calen Pennington
dcbfb1d78f Backfill migration of course_modes to add the description field 2015-02-03 14:13:41 -05:00
Sarina Canelake
41475d462c Merge pull request #6876 from Stanford-Online/giulio/course-price-upstream 
Add cosmetic price field to studio & logic
 2015-02-03 13:34:12 -05:00
Awais Qureshi
22af2b75af ECOM-890: Update invoice data model. 
ECOM-891: Allow tracking of invoice transactions.

Authors: Awais Qureshi and Aamir Khan
 2015-02-03 13:27:40 -05:00
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic 
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
 2015-02-03 09:40:00 -08:00
Will Daly
6fa7815f89 Merge pull request #6872 from edx/will/country-access-message-theme 
Country access messaging theme fixup
 2015-02-03 11:44:05 -05:00
Marco Morales
e061024557 Merge pull request #6849 from edx/marco/discussions-endorse/font-awesome-fix 
Fixes broken answer and endorse icons on discussion forums
 2015-02-03 10:44:50 -05:00
Chris Rodriguez
66f909cd50 Assigning regions to forum areas and adding ARIA to new post form 2015-02-03 10:34:37 -05:00
Ben Patterson
b71c20c031 Revert "Add Cosmetic Display Price field to studio & logic to show it" 2015-02-03 09:41:54 -05:00
Waheed Ahmed
e868db2e4d Fixed multiple textbooks links to only last uploaded textbook. 
TNL-1304
 2015-02-03 19:31:28 +05:00
Will Daly
ce9c258f8b Update country access message end-points to be backwards compatible with embargo theme templates 
Move default country access messages out of static_templates, so they are not served by other Django views.
 2015-02-03 08:59:41 -05:00
Ned Batchelder
b048d98eb9 Merge pull request #6851 from edx/ned/fix-gettext-literals 
Fix a number of incorrect translation string uses.
 2015-02-03 08:38:58 -05:00
Ned Batchelder
fb595c89f3 Fix a number of incorrect translation string uses 
These were found by the new pylint checker I wrote! :)
 2015-02-02 22:38:27 -05:00
Sarina Canelake
db3d6fd9ab Merge pull request #6182 from Stanford-Online/giulio/course-price-upstream 
Add Cosmetic Display Price field to studio & logic to show it
 2015-02-02 20:07:58 -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
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
Christine Lytwynec
e90c66431b disable PayAndVerifyTest.test_immediate_verification_enrollment 2015-02-02 10:40:48 -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
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
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
Marco Morales
951773150f updated icons on discussion forums 2015-01-31 18:40:38 -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
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