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

29555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chris
397da0dbde Merge pull request #7586 from edx/clrux/UX-1912-a11y-fix-heading-order 
Correcting heading levels
 2015-04-07 10:01:16 -04:00
Aamir
37e2ffeceb Merge pull request #7575 from edx/aamir-khan/ECOM-1289-reverification-service 
Aamir khan/ecom 1289 reverification service
 2015-04-07 18:50:01 +05:00
aamir-khan
917ca595cc ECOM-1289: added the re-verification service to implement the re-verification xblock 2015-04-07 18:09:53 +05:00
Sarina Canelake
a8e0c9a133 Merge pull request #7596 from louyihua/transcript_editor_error_message_i18n 
Make some cms strings i18n
 2015-04-07 08:53:39 -04:00
Ben Patterson
3b854b219b Merge pull request #7609 from edx/benp/bok-choy-coverage-migrations 
Omit migrations when calculating bok-choy coverage.
 2015-04-07 07:34:48 -04:00
marjev
7f45900cbc Fixes show more results section of the lms courseware search 2015-04-07 08:34:11 +00:00
louyihua
297d94a38b Make some strings i18n 2015-04-07 12:56:03 +08:00
Ben Patterson
f388ea131e Omit migrations when calculating bok-choy coverage. 
When we calculate bok-choy coverage, we are including various migraitons
as part of the calculation. This does not represent the kind of
code that bok-choy can cover, since that is part of the RDBMS build-out
and maintenance.
 2015-04-06 16:52:27 -04:00
David Baumgold
2e5353aef7 Removed references to code ownership page 
Because no one actually uses that page
 2015-04-06 14:26:52 -04:00
Piotr Mitros
cd8147cbde Merge pull request #7451 from edx/pmitros/disable-email-auth 
Make e-mail activation optional
 2015-04-06 20:38:51 +03:00
Piotr Mitros
c656998e8d Make e-mail activation optional 2015-04-06 12:50:18 -04:00
Sarina Canelake
d2c7db0f4b Merge pull request #7600 from louyihua/fix_paging_header_i18n 
Fix i18n breaking in some js and underscore files
 2015-04-06 11:00:01 -04:00
Sarina Canelake
aca6054639 Merge pull request #7599 from louyihua/i18n_fastgenerate 
Add i18n_fastgenerate
 2015-04-06 10:54:44 -04:00
Adam
a8bd6dc32d Merge pull request #7570 from edx/adam/bulk-email-changes 
use different queue for smaller emails (TNL-1591)
 2015-04-06 10:01:51 -04:00
Mark Hoeber
e931df20ec Merge pull request #7578 from edx/markhoeber-redirect-enrollment-api-doc 
Redirect Enrollment API to Platform API doc
 2015-04-06 09:50:13 -04:00
Sarina Canelake
c35dbd3f49 Merge pull request #7602 from edx/sarina/20150406-translations-update 
Update translations (autogenerated message)
 2015-04-06 09:26:46 -04:00
Sarina Canelake
4dea3aa9df Update translations (autogenerated message) 2015-04-06 09:26:06 -04:00