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

29509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Adam
9ad4b71688 Merge pull request #7572 from edx/release 
Release
 2015-04-02 17:24:50 -04:00
Carol Tong
85b36acaa8 Merge pull request #7568 from edx/carol/docs/AdvancedSettingsUIHelp 
Edits to Advanced Settings UI text for Discussion Blackout Dates, Discussion Topic Mapping
 2015-04-02 17:03:47 -04:00
Jesse Zoldak
72f7b25a3c Merge pull request #7574 from edx/zoldak/fix-pep8 
Fix trailing whitespace issues
 2015-04-02 16:36:57 -04:00
Jesse Zoldak
5b93992ecb Fix trailing whitespace issues 2015-04-02 16:32:22 -04:00
Adam
61f7373a26 Merge pull request #7552 from edx/hotfix/2015-04-01 
Fixed static pages removed on import for split course.
 2015-04-02 16:08:50 -04:00
Carol Tong
4ebefce767 Fix line length 2015-04-02 16:04:32 -04:00
Jesse Zoldak
e9635e7f03 Merge pull request #7569 from edx/zoldak/SOL-618 
Decorate flaky test SOL-618
 2015-04-02 15:40:44 -04:00
Mark Hoeber
d7eb8cf7e4 Merge pull request #7309 from edx/markhoeber-doc1748 
Platform APIs Doc
 2015-04-02 14:47:10 -04:00
Carol Tong
f318f1b355 Edits to UI text for Discussion Blackout Dates, Discussion Topic Mapping 
to address DOC-1434, DOC-1828
 2015-04-02 14:32:25 -04:00
Jesse Zoldak
ab63243d01 Decorate flaky test SOL-618 2015-04-02 14:26:46 -04:00
Jonathan Piacenti
ce19c769eb Fix handling of library versions in the library tools. 2015-04-02 18:26:04 +00:00
Jonathan Piacenti
51905f0cd5 Addressed notes for RCB duplication, removed management buttons from RCB container 2015-04-02 18:26:04 +00:00
Jonathan Piacenti
a6c00635b2 Fix issues with overrides on duplicated RCBs. 2015-04-02 18:23:28 +00:00