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

26265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
a3ac57bb1f Merge pull request #5534 from edx/i18n-cms-index 
Some strings were missing i18n calls
 2014-10-15 12:57:07 -04:00
David Baumgold
eba03512d5 Replace course status message 2014-10-15 11:35:56 -04:00
David Baumgold
0f07bad3ed Some strings were missing i18n calls 2014-10-15 11:35:56 -04:00
Sarina Canelake
11fb9364ab Merge pull request #5376 from edx/sarina/new-contributor-docs 
Update Contributing documentation with new PR process. OPEN-111
 2014-10-15 11:19:39 -04:00
Sarina Canelake
8f9f4ba51b Update Contributing documentation with new PR process. OPEN-111 2014-10-15 11:17:57 -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
Brian Talbot
1171d0ec2b Merge pull request #5555 from edx/talbs/fix-studio-rerun-notification 
Studio: FIX - Course Rerun Outline Notification Icon Display
 2014-10-15 08:13:32 -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
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
Brian Talbot
0a633eaf09 Studio: resolving post-course rerun outline UI alert icon display issue 
UX-1054
 2014-10-14 14:09:15 -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
Mark Hoeber
f1c81d42bb Merge pull request #5572 from edx/markhoeber-doc-928 
Removed Vitalsource e-reader information
 2014-10-14 13:38:47 -04:00
Mark Hoeber
b840d723c6 Removed Vitalsource e-reader information 2014-10-14 13:37:48 -04:00
Will Daly
ad11c1b6f4 Update django-countries to 2.1.2, override country name for Taiwan 2014-10-14 13:12:36 -04:00
Will Daly
5d77fab265 Merge pull request #5541 from edx/will/dashboard-js-shame 
Dashboard template cleanup
 2014-10-14 11:54:57 -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
Don Mitchell
f3aaa4e68b Merge pull request #5558 from edx/dhm/bug_index_count 
Dont' need error check call in old mongo on this test
 2014-10-14 09:36:06 -04: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
Ben Patterson
61dbd70cf6 Merge pull request #5560 from edx/benp/improve-pylint-violations 
pylint cleanup.
 2014-10-11 14:20:41 -04:00
Ben Patterson
3ef0653711 pylint cleanup. 2014-10-11 12:51:20 -04:00
Don Mitchell
1ce2c2cda7 Dont' need error check call in old mongo on this test 2014-10-10 16:19:24 -04:00
Sarina Canelake
35f9fc595e Merge pull request #5423 from mitocw/bdero/fix-gitlog-focused-error 
Added handling in gitlog template for missing import logs
 2014-10-10 16:08:15 -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
Brandon DeRosier
c571a2a029 Added handling in gitlog for missing import logs 
Fixes a template error that occurs when viewing a course's detailed
git import log. The problem happens for courses imported using methods
other than the `git_add_course` command.
 2014-10-10 10:41:06 -04:00
Will Daly
e0133b12a6 Move JavaScript from dashboard template into its own module 
Make HTML comments Mako comments
 2014-10-10 08:45:54 -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
e2fbc09d9d Merge pull request #5527 from mulby/tweak-segment-io-endpoint 
Small changes to the segment.io event handler
 2014-10-09 14:11:34 -04:00
srpearce
bcde4ee574 Merge pull request #5537 from edx/sylvia/docs/relnotes10-7 
Updates 10-7 release notes
 2014-10-09 13:48:32 -04:00
Sylvia Pearce
76499563dd Updates 10-7 release notes 2014-10-09 13:47:45 -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
brianhw
b719c074bc Merge pull request #5517 from edx/brian/fix_export_course 
Make sure temporary course directory uses safe characters.
 2014-10-09 12:20:09 -04:00
Don Mitchell
01205cdee2 tz aware 2014-10-09 11:55:14 -04:00
Don Mitchell
a63d58cff5 Remove unused credentials from mongo init 
was breaking pymongo 2.7
 2014-10-09 11:55:14 -04:00
Don Mitchell
5c00ce674d Test multiple threads linear growth 2014-10-09 11:55:14 -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
David Baumgold
fc5148438d Merge pull request #4730 from edx-solutions/secure-cookies 
secure-cookies: Allow to use secure HTTPS cookies (Django setting)
 2014-10-09 10:24:34 -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
Waqas Khalid
5f73c178b8 Merge pull request #5418 from mlkwaqas/waqas/tnl336-forum-search-unicode-error 
Forum shouldn't cuase error while searching unicode
 2014-10-09 15:55:48 +05:00