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

29522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frances Botsford
73dd510fd7 remove bad classwrapper for dashboard donate banner layout and sidebar 2015-04-09 17:05:39 -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
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
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
Adam Palay
c2e5bd3d98 use different queue for smaller emails (TNL-1591) 2015-04-06 08:13:55 -04:00
Braden MacDonald
5f87bc08c5 Merge pull request #7534 from open-craft/mentoring-req-update 
Add mentoring v2 and its bump dependency xblock-utils for Harvard
 2015-04-05 17:47:52 -07:00
louyihua
2d47f80391 Fix i18n breaking in some js and underscore files 
1. Spliting strings inside the call to `gettext()` in javascript breaks the string extraction process, so the string should kept in one line.
2. Using escape string inside a string in `gettext()` may cause the extractor to misunderstand the escape string, so that it will escape this escape string.
 2015-04-06 01:28:06 +08:00
louyihua
faafda086d Add i18n_fastgenerate 
So the time-consuming i18n_extract step can be skipped for situations that only the translated strings are modified while the source strings are still the same.
 2015-04-05 18:59:43 +08:00
Braden MacDonald
f2fb8bf752 Bump mentoring and its dependency xblock-utils for Harvard 2015-04-03 13:49:51 -07:00
Will Daly
83e391ee9f Merge pull request #7590 from edx/release 
Merge release back into master (hotfix-2015-04-03)
 2015-04-03 15:43:24 -04:00
Will Daly
08cb8dd541 Merge pull request #7583 from edx/hotfix/2015-04-03 
Hotfix: Add proxy to allow IE9 to make xdomain requests
 2015-04-03 14:43:29 -04:00
Greg Price
7ee640412c Merge pull request #7588 from edx/gprice/debug-toolbar-order 
Move debug toolbar to end of devstack middleware
 2015-04-03 14:39:59 -04:00
Renzo Lucioni
e39bc1a813 Merge pull request #7581 from edx/renzo/clean-up-admin 
Update SKU field help text and verbose name
 2015-04-03 13:52:59 -04:00
Greg Price
8936224437 Move debug toolbar to end of devstack middleware 
The django debug toolbar circumvents other middleware with process_view
functions, so it needs to go at the end of our MIDDLEWARE_CLASSES
setting.

https://django-debug-toolbar.readthedocs.org/en/1.3/tips.html#middleware-isn-t-working-correctly
 2015-04-03 13:50:57 -04:00
Kelketek
5795ba3faf Merge pull request #7482 from open-craft/fix_duplicate_rcb 
Fix duplication of Randomized Content Blocks
 2015-04-03 12:50:09 -05:00
Chris Rodriguez
2b9dafeccb Correcting heading levels 2015-04-03 13:21:48 -04:00
Kelketek
e469e4da9e Merge pull request #7585 from edx/kelketek/update-xblock-hash 
Update XBlock Hash
 2015-04-03 12:03:24 -05:00
Nimisha Asthagiri
a204cacd74 Merge pull request #7561 from edx/mobile/PLAT-520 
PLAT-520 Fix Asset store import of null values.
 2015-04-03 12:46:21 -04:00
Kelketek
042a0092f2 Update XBlock Hash 2015-04-03 11:08:54 -05:00
Will Daly
645f9c2c7a Add proxy to allow IE9 to make xdomain requests 
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
 2015-04-03 11:41:31 -04:00
Jonathan Piacenti
e95e5e7090 Changed RCB recursive copy function to private function. 2015-04-03 10:40:44 -05:00
Nimisha Asthagiri
d9d4a007b9 PLAT-520 Fix Asset store import of null values 2015-04-03 11:39:51 -04:00
Renzo Lucioni
a8c8863409 Update SKU field help text and verbose name 2015-04-03 11:24:19 -04:00
Mark Hoeber
8008cfbe18 Redirect Enrollment API to Platform API doc 2015-04-03 11:08:05 -04:00
Jonathan Piacenti
5bf2c23f59 Fixed issue with block IDs being different across library versions. 2015-04-03 13:51:03 +00:00
Marco Morales
e62e6b4c8e Merge pull request #7562 from edx/marco/dashboard/message-styling-fixes 
Reverts removed styling rule which broke certificate status message on the course dashboard
 2015-04-03 09:39:33 -04:00
Matt Drayer
241133f0ae Merge pull request #7540 from edx/mattdrayer/SOL-462 
Add social sharing feature (Twitter, Facebook) to student dashboard
 2015-04-03 09:18:36 -04:00
Sarina Canelake
40dc37dd0f Merge pull request #7563 from louyihua/translation_fix 
Ignore pylint error 7610 (translation-of-non-string) on where it is intended
 2015-04-03 08:47:36 -04:00
Awais Jibran
4ec713e968 Merge pull request #7554 from awaisdar001/aj/tnl473-fix-studio-container-bad-url 
Fixed invalid `usage key` errors which previously throw 500.
 2015-04-03 10:30:41 +05:00
louyihua
0d0d1a0ccd Ignore pylint error 7610 (translation-of-non-string) on where it is intended to do 
As some i18n features need ```ugettext``` or its shorcut ```_``` to be called on a non-string-literal, so the pylint check of ```translation-of-non-string``` should be explicitly disabled in such situations.
 2015-04-03 11:59:53 +08:00
Marco Morales
ebdcc3bb6a Add social sharing feature (Twitter, Facebook) to student dashboard 2015-04-02 23:05:13 -04:00
Braden MacDonald
8d8fa0faaf Partial fix perhaps? 2015-04-03 02:05:22 +00:00
Braden MacDonald
781634558e Improve the test to show a failure case 2015-04-03 01:59:02 +00:00
Nimisha Asthagiri
58afd8a7c7 Merge pull request #7541 from edx/mobile/import_fix_course_id 
MA-410 Update video_module import to use target course_id.
 2015-04-02 19:56:04 -04:00
Jonathan Piacenti
bf414cf9bb Redid _get_library one more time, for giggles 2015-04-02 21:46:33 +00:00
Jonathan Piacenti
fa95d323c6 Tested version handling, modified modulestore when it didn't work. 2015-04-02 21:41:27 +00:00