Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,630 Commits 1 Branch 0 Tags
8dfb7745657e746e09da985d9ef9e7c552f413ce
Commit Graph

30630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
b6256def99 Merge pull request #6814 from edx/benp/lms-one-shard 
LMS Acceptance to one shard.
 2015-02-03 13:41:09 -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
Will Daly
4c2a05419a Merge pull request #6878 from edx/will/ecom-1031 
ECOM-1031: Show requirements in upgrade step of the decoupled verify/payment flow
 2015-02-03 12:52:47 -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
Will Daly
c414b60bbb ECOM-1031: Show requirements in upgrade step of the decoupled verify/payment flow 2015-02-03 11:20:33 -05:00
Akiva Leffert
d34f8a7289 Merge pull request #6873 from edx/waheed/tnl1304-fix-multiple-textbook-links 
Fixed multiple textbooks links to only last uploaded textbook.
 2015-02-03 11:11:38 -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
Calen Pennington
3cf2fe7dc1 Merge pull request #6865 from cpennington/add-memory-dump-signal 
Add memory dump signal
 2015-02-03 10:33:34 -05:00
Ben Patterson
ebc86895ea Merge pull request #6874 from edx/revert-6182-giulio/course-price-upstream 
Revert "Add Cosmetic Display Price field to studio & logic to show it"
 2015-02-03 10:32:41 -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
Sarina Canelake
6ce7f96f16 Merge pull request #6869 from edx/sarina/fix-footer-css 
LMS: correcting poorly scoped font-family rule for footer links inside o...
 2015-02-02 19:22:50 -05:00
Sarina Canelake
4fc4b2f3de LMS: correcting poorly scoped font-family rule for footer links inside of p, ul, ol elements. 
Fix link stylings in LMS and CMS footers
 2015-02-02 16:42:08 -05:00
Ben Patterson
6708ed8fa6 This test no longer follows modern workflows. Disabling. TE-736. 
Also cleaning up some lint.
 2015-02-02 16:05:55 -05:00
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
Calen Pennington
a69c4efd21 Add the ability to send SIGPROF to an edx-platform process to obtain a memory dump 2015-02-02 13:12:58 -05:00
Calen Pennington
03594aa3f4 Upgrade pip 2015-02-02 13:12:58 -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
Davorin Sego
71d66316fc Courseware search: Change name of results page from "Searching [course name]" 
and patch up some style issues
 2015-02-02 14:44:15 +01: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
Marco Morales
951773150f updated icons on discussion forums 2015-01-31 18:40:38 -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