Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

10211 Commits

Author SHA1 Message Date
Ben Patterson
5703adb722 Merge branch 'release' 
Includes rc/2014-10-14
 2014-10-16 20:11:55 -04:00
Christina Roberts
f7ef9eb511 Merge pull request #5510 from edx/christina/bug-tnl-543 
Pass group_id when getting user thread and comment counts.
 2014-10-16 16:03:22 -04:00
cahrens
7133cfc150 Pass group_id when getting user thread and comment counts. 
Depends on cs_comments_serivce commit ea218a2b038b59e63fd6593b5598db90223636e1.

TNL-543
 2014-10-16 14:32:10 -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
Daniel Friedman
33cfb9c78a Merge pull request #5582 from edx/dan-f/cohorts-internationalization 
Ensure all user-facing cohort-related strings are internationalized
 2014-10-15 16:26:06 -04:00
Daniel Friedman
62c46c80e7 Bump the report downloads poll interval to 20 seconds 
TNL-565
 2014-10-15 15:58:08 -04:00
Daniel Friedman
37158bab1f Create standard way of updating a task's progress 
TNL-566
 2014-10-15 15:58:08 -04:00
Daniel Friedman
a9fc3b035b Verify cohort strings are scraped for translation 2014-10-15 14:51:02 -04:00
Jim Abramson
b6013a2399 Merge pull request #5577 from edx/jsa/tnl549 
Fix topic-related errors when editing discussion threads in inline mode.
 2014-10-15 11:34:40 -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
1b03534b55 Rename upload_*_to_s3 to no longer reference s3 
TNL-534
 2014-10-14 14:31:11 -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
Will Daly
5d77fab265 Merge pull request #5541 from edx/will/dashboard-js-shame 
Dashboard template cleanup
 2014-10-14 11:54:57 -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
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
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
81d4a24b6d Making the header width fixed until we have responsive design. 2014-10-10 12:17:58 -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
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
a63d58cff5 Remove unused credentials from mongo init 
was breaking pymongo 2.7
 2014-10-09 11:55:14 -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
c2ecaa7e30 Forum shouldn't cuase error while searching unicode 
If we use unicode character in the search of forum
it will cuase the error which is not the desired
behavior it should check and return result.

TNL-336
 2014-10-09 14:40:06 +05:00
stephensanchez
12ffe18085 Pull Request comments addressed. Tests fixed. 2014-10-08 21:26:09 +00:00
Renzo Lucioni
00d976b85d Use Backbone for student account and profile JS. 
Validate student account and profile form fields. Use RequireJS for Jasmine tests of account and profile JS.
 2014-10-08 15:50:13 -04:00
stephensanchez
0c6b3ba0c1 Changing the default value from 25.00 to 25 2014-10-08 19:48:14 +00:00
stephensanchez
4d68738c38 Adding new styles to the new donation button. 2014-10-08 19:34:25 +00:00
Andy Armstrong
3af9eb25b2 Minor cleanups 2014-10-08 15:14:17 -04:00
Andy Armstrong
fbeb57874c Address code review comments 2014-10-08 15:14:16 -04:00
Andy Armstrong
6114cf05f4 Don't show cohort information when disabled 
TNL-552
 2014-10-08 15:14:16 -04:00
Will Daly
d1b3e8e07a Merge pull request #5520 from edx/will/update-donation-text 
Update donation text in email and receipt page
 2014-10-08 13:45:55 -04:00
Daniel Friedman
736ed94064 Fix unicode-related failures in CSV upload. 
TNL-586
 2014-10-08 13:21:00 -04:00