Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
32,165 Commits 1 Branch 0 Tags
9cbc8564a12eaae381ebefeb7c98b420f7265b68
Commit Graph

11688 Commits

Author SHA1 Message Date
Adam Palay
e1def5c554 gracefully fail when parsing xml with non-compatible string (TNL-347) 2014-10-16 10:47:36 -04:00
Will Daly
c0582cc437 Fix broken profile API test 2014-10-16 10:24:00 -04:00
Calen Pennington
e00b666db9 Merge pull request #5590 from cpennington/xblocks-with-children 
Enable pure XBlocks to use children in edx-platform
 2014-10-16 10:23:35 -04:00
Will Daly
8761eaf3dd Added check for duplicate email and username 2014-10-16 10:20:21 -04:00
Diana Huang
011b4dc181 Merge pull request #5594 from edx/diana/open-id-bug 
Handle OpenID errors for POST requests.
 2014-10-16 09:53:31 -04:00
Will Daly
7ef9ec838f Added better docstrings and comments 2014-10-16 09:42:43 -04:00
Calen Pennington
fee681be68 Escape xblock wrapper data attributes and css classes for safe html 2014-10-16 09:09:22 -04:00
Calen Pennington
4d653d5359 Set xmodule_runtime on all XModule-like things (including pure XBlocks using the XModuleMixin) 
Expose xmodule_runtime as .runtime if it's set (otherwise, fall back to
the supplied runtime). This causes all blocks to act like XModules when
they have a ModuleSystem, and like XModuleDescriptors if they only have
a DescriptorSystem.
 2014-10-16 09:09:20 -04:00
Calen Pennington
41f3c040c8 Add block type to the available attributes in the xblock javascript frontend 2014-10-16 09:08:57 -04:00
Calen Pennington
4a43427c6d Add block.name to xblock javascript frontend 2014-10-16 09:08:57 -04:00
Calen Pennington
47a3172bf1 Enable parent/child tests using the acid XBlock. 
Also fix those tests to correctly wait until the ajax portions have
finished before evaluating the page contents.
 2014-10-16 09:08:54 -04:00
Will Daly
e89afa93c0 WIP: add login and registration end-points to the user API. 2014-10-16 08:48:38 -04:00
Daniel Friedman
64d2514f2c Merge pull request #5528 from edx/dan-f/data-download-tech-debt 
Student profile CSV background task tech debt
 2014-10-15 16:54:41 -04:00
Diana Huang
0c6cba73ac Handle OpenID errors for POST requests. 
ECOM-441
 2014-10-15 16:33:31 -04:00
lduarte1991
d6549d2e41 Annotation Tools: CSS fixes for editor 2014-10-15 16:24:25 -04:00
E. Kolpakov
4f3240e488 Fixed errors in discussion XModule, caused by c2716d4 [TNL-606] 
Co-Authored-By: jmclaus <jmc@edx.org>
Co-Authored-By: jsa <jsa@edx.org>
 2014-10-15 12:29:27 -04:00
Nimisha Asthagiri
e0f9def061 Merge pull request #5584 from edx/nimisha/val/MA-81 
MA-81 Honor video download setting with VAL-enabled videos.
 2014-10-15 10:10:13 -04:00
Nimisha Asthagiri
5355b4b96e MA-81 Honor video download setting with VAL-enabled videos. 2014-10-14 22:32:16 -04:00
Will Daly
26a94afb26 Merge pull request #5573 from edx/will/django-countries-fix 
Update django-countries to 2.1.2, override country name for Taiwan
 2014-10-14 17:14:32 -04:00
jsa
786fc806f5 Add topic selection to inline thread editing, fixing errors 
Co-Authored-By: Brian Talbot <btalbot@edx.org>

TNL-549
 2014-10-14 15:45:19 -04:00
Stephen Sanchez
7df00578f1 Merge pull request #5536 from edx/sanchez/remove-new-header-footer-flags 
Removing the feature flags for new header and footer.
 2014-10-14 15:06:45 -04:00
Renzo Lucioni
257e8cf857 Merge pull request #5551 from edx/renzo/track-selection-test-cleanup 
Clean up after track selection experiment
 2014-10-14 15:06:19 -04:00
Daniel Friedman
e9292fb5a5 Add coverage for cohort view's showSection link 
TNL-550
 2014-10-14 14:31:43 -04:00
lduarte1991
fea2ba5e1e Annotation Tools: Bug fixes - tinymce bug after exiting full screen, stupid check for type, missing tag subscriptions 2014-10-14 14:06:33 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
stephensanchez
c15d97ea9b Removing the feature flags for new header and footer. 
Fix acceptance tests

Updating lettuce tests.

Revert the deletion of the original edx header and footer.

Renaming old header and footers to legacy files.

Add IS_EDX_DOMAIN flag for header.

Updating tests and django main template.

renaming the header files for microsite backwards compat.
 2014-10-14 17:47:46 +00:00
Will Daly
ad11c1b6f4 Update django-countries to 2.1.2, override country name for Taiwan 2014-10-14 13:12:36 -04:00
lduarte1991
14dfe9a1e8 Image Annotation Tool: Double border, color borders and tag buttons 2014-10-14 13:00:47 -04:00
Greg Price
be81f1d297 Merge pull request #5547 from edx/gprice/password-reset-csrf-exempt 
Make password reset endpoint CSRF exempt
 2014-10-14 11:33:55 -04:00
Waqas Khalid
af3d27135a Merge pull request #5540 from mlkwaqas/waqas/tnl188-endorsement-username-link-broken 
Endorsement username shouldn't be broken
 2014-10-14 19:01:43 +05:00
Don Mitchell
7e52ba872e Merge pull request #5535 from edx/dhm/unit_perf 
Performance enhancements for unit tests
 2014-10-14 09:37:08 -04:00
Will Daly
8061336102 Move user_service into user_api/api 2014-10-14 07:38:10 -04:00
Jonathan Piacenti
d09d729b75 Lazy loading of CourseMode model's internationalization. 2014-10-13 21:30:07 +00:00
Waqas Khalid
f023b62bd0 Endorsement username shouldn't be broken 
If we endourse the answer of the question in discussion
the username link that is created is broken whereas it
should point to the userprofile.

TNL-188
 2014-10-13 16:58:30 +05:00
ichuang
38c7832f75 fix tracking log entry key child-id -> child_id 2014-10-12 13:40:54 -04:00
Ben Patterson
3ef0653711 pylint cleanup. 2014-10-11 12:51:20 -04:00
Sarina Canelake
02bfe039fd Merge pull request #5431 from open-craft/datadog-wrapper 
Consistently wrap the DataDog API to prevent logged errors & missing stats data
 2014-10-10 14:59:38 -04:00
Don Mitchell
f4b2789f54 Merge pull request #5288 from edx/split/info_perf 
Upgrade pymongo
 2014-10-10 12:55:38 -04:00
Greg Price
a2f860740c Make password reset endpoint CSRF exempt 
This is necessary for mobile apps
 2014-10-10 11:32:46 -04:00
Braden MacDonald
a8f622af7f Consistently ensure dog_stats_api tags are formatted correctly 2014-10-09 12:35:26 -07:00
Don Mitchell
90723d9191 Make unit tests work on older mongo versions 2014-10-09 15:14:37 -04:00
Gabe Mulley
5643101ad1 Small changes to the segment.io event handler 2014-10-09 13:25:20 -04:00
Andy Armstrong
03b41032ae Merge pull request #5501 from edx/andya/disable-cohorts-ui-bug 
Don't show cohort information when disabled
 2014-10-09 12:55:07 -04:00
Don Mitchell
b7b5400c3e Upgrade pymongo 
LMS-11437
 2014-10-09 11:55:14 -04:00
Don Mitchell
3c42e8c725 Performance enhancements for unit tests 
in test_contentstore, don't load the xml course if not necessary
 2014-10-09 11:47:56 -04:00
Nimisha Asthagiri
b78bb976cc Merge pull request #5531 from edx/release 
Merge Release
 2014-10-09 09:58:51 -04:00
Renzo Lucioni
37625e8e29 Merge pull request #5515 from edx/renzo/language-backbone 
Use Backbone for student account and profile JS.
 2014-10-09 09:50:40 -04:00
Stephen Sanchez
7802c1ed2c Merge pull request #5526 from edx/sanchez/style-donation-button 
Adding new styles to the new donation button.
 2014-10-09 08:53:01 -04:00
Oleg Marshev
d2c3e1ebca Merge pull request #5496 from edx/oleg/lms-har-generate 
Generate HAR Files for LMS
 2014-10-09 12:09:21 +03:00
stephensanchez
12ffe18085 Pull Request comments addressed. Tests fixed. 2014-10-08 21:26:09 +00:00