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

29572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dino Cikatic
0fa86e3d5c SOL-570 Remove djangotracker from common imports 2015-04-13 11:58:37 -04:00
Martyn James
953581e62f Merge pull request #7313 from edx/mjames/SOL-174 
SOL-174 - Indexing within celery task
 2015-04-10 15:22:20 -04:00
Davorin Sego
e37a98d1be Indexing moved to celery task. Reorganised indexing to always allow for full course reindex. Indexing code no longer needs to be in common, because it is triggered by signal instead of being called.g 2015-04-10 14:30:19 -04:00
Martyn James
d54cb3b962 Merge pull request #7648 from edx/mjames/AboutExtra 
Updated course_about API to include additional information
 2015-04-10 13:48:49 -04:00
Ben Patterson
a542b3d3c8 Merge pull request #7647 from edx/benp/remove-lettuce-tab-tests 
[Lettuce deprecation] Remove redundant lettuce tab tests.
 2015-04-10 11:57:25 -04:00
Aamir
a83d068600 Merge pull request #7617 from edx/aamir-khan/ECOM-1290-redirect-to-courseware-new 
ECOM-1290: added the redirection back to courseware after re-verificatio...
 2015-04-10 20:53:45 +05:00
aamir-khan
ca08b979b3 ECOM-1290: added the redirection back to courseware after re-verification 2015-04-10 19:44:35 +05:00
Martyn James
bf9d1ef137 Updated course_about API to include additional information 2015-04-10 10:27:34 -04:00
frances botsford
d45aecff3c Merge pull request #7646 from edx/frances/donate-notification-fix 
Dashboard donate and sidebar layout fix
 2015-04-10 09:39:09 -04:00
zubair-arbi
8db98203ff Merge pull request #7601 from edx/zub/story/ecom-1228/enhance-track-selection-page 
update track selection page, use only min price for course modes
 2015-04-10 14:52:15 +05:00
zubair-arbi
2c10eeb3aa update track selection page, use only min price for course modes 
ECOM-1228
 2015-04-10 11:53:31 +05:00
zubair-arbi
305b7138e5 Merge pull request #7639 from edx/zub/bugfix/ecom-653-remove-invalid-link 
update invalid documentation link in '_payment_page_response' method doc...
 2015-04-10 11:07:33 +05:00
Ben Patterson
1146bb2c61 [Lettuce deprecation] Remove redundant lettuce tab tests. 
These are already covered by bok-choy tests:
  File: test_lms.py
  Class: HighLevelTabTest
 2015-04-09 18:20:03 -04:00
Frances Botsford
73dd510fd7 remove bad classwrapper for dashboard donate banner layout and sidebar 2015-04-09 17:05:39 -04:00
Stephen Sanchez
a2e029a516 Merge pull request #7553 from edx/sanchez/support_oscar_receipts 
XCOM-128: Allow the receipt page to support E-Commerce Orders.
 2015-04-09 10:52:38 -04:00
zubair-arbi
3cc931d8d9 update invalid documentation link in '_payment_page_response' method docstring 
ECOM-653
 2015-04-09 19:13:28 +05:00
Stephen Sanchez
1669274175 :Allow the receipt page to support Oscar Orders. 2015-04-09 14:01:12 +00:00
Calen Pennington
2c080af646 Merge pull request #7603 from cpennington/xblock-metrics-block-type 
Add the entry-point used to load an XBlock to the tags when recording me...
 2015-04-08 16:35:33 -04:00
Christine Lytwynec
05a8e23d57 Merge pull request #7633 from edx/release 
Release
 2015-04-08 15:40:45 -04:00
Adam
0298180e30 Merge pull request #7632 from edx/adam/revert-multiple-email-queues 
Revert "use different queue for smaller emails (TNL-1591)"
 2015-04-08 14:47:45 -04:00
Adam
c04ef4b733 Merge pull request #7630 from edx/hotfix/2015-04-08 
Hotfix/2015 04 08
 2015-04-08 14:38:19 -04:00
Marko Jevtić
5cb7fe7390 Merge pull request #7567 from edx/mjevtic/SOL-294 
(SOL-294) CSS style that will display ellipsis properly
 2015-04-08 19:43:25 +02:00
Calen Pennington
29c9080bdf Add the entry-point used to load an XBlock to the tags when recording metrics on rendering and handling 2015-04-08 13:00:27 -04:00
Marko Jevtić
42896452a1 Merge pull request #7576 from edx/mjevtic/more_search_results 
Fixes show more results section of the lms courseware search
 2015-04-08 18:49:57 +02:00
marjev
050a53d954 (SOL-294) CSS style that will properly display ellipsis 2015-04-08 18:46:23 +02:00
Adam Palay
9fa8187ffc Revert "use different queue for smaller emails (TNL-1591)" 
This reverts commit c2e5bd3d98.
 2015-04-08 12:33:09 -04:00
Jesse Zoldak
de1cbb9b93 Merge pull request #7631 from edx/zoldak/remove-ptest 
Remove unused bok_choy paver option ptests
 2015-04-08 12:14:19 -04:00
Jesse Zoldak
e5132e3f74 Remove unused paver option ptests 2015-04-08 11:57:02 -04:00
Chris
35db7f34af Merge pull request #7580 from edx/clrux/UX-1909-a11y-button-contrast 
Changed color of gray to be slightly darker for AA compliance
 2015-04-08 11:54:20 -04:00
chrisndodge
8a3fb01d32 Merge pull request #7598 from edx/cdodge/use-microsite-config-in-dashboard 
be sure to take platform_name from microsite config paths in the dashboa...
 2015-04-08 11:52:14 -04:00
Adam Palay
33ddecbc97 update nltk in other parts of the platform 2015-04-08 11:28:49 -04:00
David Baumgold
aac8bf2ebd Update NLTK to 2.0.5 
For setuptools compatibility
 2015-04-08 11:26:55 -04:00
Waheed Ahmed
c20c99badd Added ora release tag. 2015-04-08 11:26:36 -04:00
Chris
468d538e0c Merge pull request #7584 from edx/clrux/UX-1911-a11y-remove-nav 
Changes the nav element to a div
 2015-04-08 11:25:32 -04:00
Syed Hassan Raza
23e08b2744 Split courses drafts import issue 2015-04-08 11:22:27 -04:00
Adam Palay
d9a21bdf4d use email context for keyword substitution, cutting down on db queries (TNL-1591) 2015-04-08 11:22:26 -04:00
Syed Hassan Raza
825aaed67f Split course's assests can access through '/' in asset url 2015-04-08 11:22:25 -04:00
Chris Rodriguez
7b9bf47072 LMS: changed value of gray (m-gray-d1) to be darker or a11y compliance 2015-04-08 10:56:11 -04:00
Chris
66e4c254a9 Merge pull request #7582 from edx/clrux/UX-1910-a11y-contribution-list 
Changing lists to divs for some items
 2015-04-08 10:54:15 -04:00
Chris Dodge
31f2e42c02 be sure to take platform_name from microsite config paths in the dashboard 
add some more microsite aware config checks
 2015-04-08 10:07:47 -04:00
Chris Rodriguez
62cc1436ad LMS: changing lists to divs for certain items in the payment flow 2015-04-08 10:07:10 -04:00
Sarina Canelake
fc7b35c792 Merge pull request #7620 from louyihua/misc_i18n 
Better i18n extraction and translation
 2015-04-08 08:30:53 -04:00
Ben Patterson
9190c35843 Merge pull request #7626 from edx/benp/upgrade-rednose 
Upgrade rednose
 2015-04-07 18:04:57 -04:00
Ben Patterson
3cc5879abc Upgrade rednose 
TE-779

The latest release of rednose will allow for output of the
flaky test repoort. (It was being swallowed in rednose 0.3)

Here is the diff: https://github.com/gfxmonk/rednose/compare/version-0.3.1...version-0.4.1
Here is likely the commit we care about most: c66b37c92b
 2015-04-07 14:54:37 -04:00
David Baumgold
c31e0fd1d7 Merge pull request #7429 from edx/db/update-path-py 
Update path.py to version 7.2
 2015-04-07 14:47:43 -04:00
Carol Tong
bc74031172 Merge pull request #7618 from edx/carol/doc/librariesLearnMore 
Fix help token for Studio > Libraries: Learn More button
 2015-04-07 13:45:37 -04:00
louyihua
adc6929b45 Better i18n extraction and translation 
1. Extract the full sentence rather than parital of a sentence, so that languages with different word orders than English can benifit from this.
2. Using ngettext instead of gettext with 'xxx(s)', as Transifex treats `()` as special characters so that it enforces the translated string must have the same number of `()` pairs. Such enforcement makes translations difficult, as not every language can use forms like 'xxx(s)' to represent both singular & plural within a single word.
 2015-04-08 00:47:47 +08:00
Carol Tong
a854c727a7 Fix help token for Learn More button 2015-04-07 11:56:26 -04:00
David Baumgold
e12c2ec4eb Merge pull request #7607 from edx/remove-code-ownership-page 
Removed references to code ownership page
 2015-04-07 10:40:06 -04:00
Chris Rodriguez
ea13689c6f LMS: changing nav element in payment flow to div element for a11y improvements 2015-04-07 10:04:21 -04:00