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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ben Patterson
e82ba142ce Merge pull request #5575 from edx/sarina/10142014-translation-update 
Update translations (autogenerated message)
 2014-10-14 15:21:12 -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
Daniel Friedman
1b03534b55 Rename upload_*_to_s3 to no longer reference s3 
TNL-534
 2014-10-14 14:31:11 -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
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
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
lduarte1991
14dfe9a1e8 Image Annotation Tool: Double border, color borders and tag buttons 2014-10-14 13:00:47 -04:00
Sarina Canelake
724f7ac8ec Update translations (autogenerated message) 2014-10-14 12:50:44 -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
Usman Khalid
32c6dad526 Moved imports to manage.py and wsgi.py. 2014-10-14 18:27:31 +05: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
Louis Pilfold
01d9a6de10 Add Louis Pilfold to AUTHORS 2014-10-13 15:01:00 +01:00
Louis Pilfold
a501fbfc2d Stop page extending out of viewport width by 40px 
Currently the .container and .wrapper-footer elements are set to 100%,
and also have horizontal padding added to them. This results in a total
width of greater than the full width of the viewport; This causing the
browser to scroll horizonally into empty space, regardless of how wide
the viewport is.

I had added the `box-sizing: border-box` to these elements in order to
resolve this.

Cheers,
Louis
 2014-10-13 14:43:16 +01: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
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
John Eskew
2a71160148 Fix doc formatting. 2014-10-10 16:13:40 -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
Stephen Sanchez
75908924ce Merge pull request #5549 from edx/sanchez/increase-min-header-width 
Making the header width fixed until we have responsive design.
 2014-10-10 13:52:51 -04:00
Don Mitchell
f4b2789f54 Merge pull request #5288 from edx/split/info_perf 
Upgrade pymongo
 2014-10-10 12:55:38 -04:00
Stephen Sanchez
fb31932bb6 Merge pull request #5546 from edx/sanchez/update_default_donation_amount 
Changing default donation amount
 2014-10-10 12:18:04 -04:00
Stephen Sanchez
81d4a24b6d Making the header width fixed until we have responsive design. 2014-10-10 12:17:58 -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
Stephen Sanchez
c578302f73 Changing default donation amount 2014-10-10 09:51:40 -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