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

32249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
E. Kolpakov
d486f14faf Hash Update: Poll XBlock (fixes TNL-3065) 2015-08-20 17:40:29 +03:00
Matt Drayer
ebed8cd42a Merge pull request #9339 from edx/ziafazal/SOL-493 
ziafazal/SOL-493: Fetch scores via ScoresClient
 2015-08-20 10:20:48 -04:00
Renzo Lucioni
63a49d6d1b Merge pull request #9398 from edx/release 
Merge release into master
 2015-08-20 10:08:52 -04:00
Ahsan Ulhaq
987ca4b4ea Merge pull request #9396 from edx/awais786/ECOM-2106-verificatoin-bug-with-otto 
fixing issue with student re-verification.
 2015-08-20 19:08:29 +05:00
Renzo Lucioni
f17df2d009 Merge pull request #9390 from edx/patch-2015-08-20 
Allow user partition version >= current version.
 2015-08-20 08:16:54 -04:00
Awais
653554fd7a fixing issue with student reverification. 
ECOM-2106
 2015-08-20 16:25:05 +05:00
tasawernawaz
74c7c2ad77 Merge pull request #9392 from edx/tasawer/bugfix/ecom-1996-hiding-find-course-button-on-edge 
Hiding find courses button from dashboard of edge.edx.org
FYI @wedaly
 2015-08-20 14:13:10 +05:00
Tasawer
46f2adf68c Hiding find courses button from dashboard of edge.edx.org 
ECOM-1996
 2015-08-20 11:45:34 +05:00
Eric Fischer
c6bbc7248f Merge pull request #9361 from edx/efischer/bok-choy-flakes 
Fixing flaky TeamPageTest bokchoy tests
 2015-08-19 21:52:47 -04:00
Renzo Lucioni
f84243d8dd Merge pull request #9388 from edx/release-2015-08-18-conflict 
Release 2015 08 18 conflict
 2015-08-19 18:08:25 -04:00
Will Daly
cea22a12ff Allow user partition version >= current version. 
If code is deployed that updates the user partition version,
then the code is rolled back, we may see user partition versions
greater than the currently deployed version.

The previous behavior was to raise a TypeError when this occurred;
the new behavior assumes that the newer version is backwards
compatible and tries to load the partition.
 2015-08-19 16:59:03 -04:00
Renzo Lucioni
a9fd1da519 Merge branch 'release' into release-2015-08-18-conflict 2015-08-19 16:53:34 -04:00
Eric Fischer
c170ff44e3 Fixing flaky bokchoy TeamPageTests 
The flaky test problems we've been seeing here are coming from not
waiting long enough after performing actions. By forcing
is_browser_on_page checks to wait until the page is fully loaded
instead of just looking for the presence of a single element, we
ensure that there will not be issues interacting with non-loaded
elements.

TNL-3069
 2015-08-19 16:51:30 -04:00
Christina Roberts
2f5193cf18 Merge pull request #9383 from edx/christina/search-sort 
Add sorting by last_activity_at.
 2015-08-19 16:48:10 -04:00
Ahsan Ulhaq
a495847b45 Merge pull request #9373 from edx/ahsan/ECOM-2114-Add-USD-to-prices-on-track-selection-pages 
Add USD labels to prices on track selection pages
 2015-08-20 00:37:27 +05:00
Marco Morales
e56c3d91af Merge pull request #9310 from edx/frances/teams-padding-responsive 
Teams page content padding
 2015-08-19 15:31:55 -04:00
Ned Batchelder
0fed2f5987 Merge pull request #9364 from edx/ned/django-1-4-22 
Upgrade Django to 1.4.22
 2015-08-19 15:06:16 -04:00
Eric Fischer
5ee49351f1 Merge pull request #9346 from edx/efischer/fix_docs_course_id_team_membership 
Updating documentation for team_membership endpoint
 2015-08-19 14:59:38 -04:00
Ahsan Ulhaq
3d62580fc2 Add USD labels to prices on track selection pages 
ECOM-2114
 2015-08-19 23:59:15 +05:00
cahrens
295108c9a4 Add sorting by last_activity_at. 
TNL-3011
 2015-08-19 14:23:38 -04:00
Christina Roberts
276cba90c6 Merge pull request #9262 from edx/christina/search-sort 
Add sorting by team_count, as well as secondary sort (by name).
 2015-08-19 12:25:07 -04:00
Eric Fischer
86f4806e84 Updating documentation for team_membership endpoint 
Recent changes to the team_membership API endpoint added the
course_id optional parameter, but the in-code documentation
was never updated to reflect this. The wiki documentation at
https://openedx.atlassian.net/wiki/display/TNL/Team+API is OK.

Related: https://github.com/edx/edx-platform/pull/9289
 2015-08-19 12:21:45 -04:00
Renzo Lucioni
a361191e00 Merge pull request #9381 from edx/release-2015-08-18-conflict 
Release 2015 08 18 conflict
 2015-08-19 12:02:23 -04:00
cahrens
c5f5a58c28 Allow course staff and privileged users to create multiple teams. 
TNL-3071
 2015-08-19 11:07:15 -04:00
Sarina Canelake
25a117613d Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit" 
This reverts commit cea274dc52, reversing
changes made to 02cf9caca6.
 2015-08-19 11:07:14 -04:00
Chris Dodge
674b92f0b9 Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard 
Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard if the feature flag is enabled.
 2015-08-19 11:07:14 -04:00
Chris Dodge
c08fbd1406 only include JS when feature flag is on and the course has proctoring enabled 2015-08-19 11:07:14 -04:00
Eric Fischer
da3ac3e65b Validating team size on join, server-side 
By doing this, we can prevent the bug where multiple users can join
a team simutaneously and push its enrollment over the defined
maximum value. Tests have also been added to confirm this behavior.

TNL-3061
 2015-08-19 11:07:14 -04:00
Will Daly
08b9b03b9f Merge pull request #9363 from edx/will/credit-request-exception-fix 
Specify course key when retrieving credit requirements.
 2015-08-19 08:05:59 -07:00
Ned Batchelder
9f92054ca7 Fix tests to work with Django 1.4.22 
The 1.4.22 security fix makes it so that empty sessions are not written.
To keep the tests working, we now log in the user, so that some data is
saved to the session.
 2015-08-19 11:05:41 -04:00
Ned Batchelder
5ae6beb408 Merge pull request #9379 from edx/ned/i18ntools-013 
Use 0.1.3 of i18ntools
 2015-08-19 11:04:18 -04:00
cahrens
9fe6dd2791 Call super instead of referencing superclass directly. 2015-08-19 10:52:50 -04:00
cahrens
1bd4b1d60c Add sorting by team_count, as well as secondary sort. 
TNL-3012
 2015-08-19 10:52:50 -04:00
Brian Beggs
9e31193100 Merge pull request #9295 from edx/bbeggs/ensure-indexes-PLAT-785 
Adding django admin command to create mongodb indexes
 2015-08-19 10:17:42 -04:00
Ned Batchelder
2cfe2a4697 Use 0.1.3 of i18ntools 2015-08-19 10:08:52 -04:00
Awais Qureshi
e990da0f77 Merge pull request #9372 from edx/awais786/ECOM-2113-change-donation-value 
Change default donation amount to $10.
 2015-08-19 18:30:03 +05:00
tasawernawaz
d9cc3ed4fe Merge pull request #9371 from edx/tasawer/story/ecom-1956-updte-validation-message-on-registration-page 
Updating validation error message on signup page.
 2015-08-19 14:42:19 +05:00
Zia Fazal
05e2cc9402 fetch StudentModule via query-chunking 
using ScoresClient instead of StudentModule

using ScoresClient without FieldDataCache
 2015-08-19 12:57:32 +05:00
Awais
4ca44effec Change default donation amount to $10. 
ECOM-2113
 2015-08-19 12:52:45 +05:00
Tasawer
cefe0daa74 Updating validation error message on signup page. 
ECOM-1956
 2015-08-19 12:50:12 +05:00
David Baumgold
81af277db1 Merge pull request #8350 from edx/db/clean-up-django-orm-usage 
Clean up the Django ORM usage a bit
 2015-08-18 16:05:05 -04:00
David Baumgold
2aa7e266cf Clean up the Django ORM usage a bit 2015-08-18 15:44:26 -04:00
Ned Batchelder
c3234c1cfc Upgrade Django to 1.4.22 
https://www.djangoproject.com/weblog/2015/aug/18/security-releases/
 2015-08-18 14:38:43 -04:00
Clinton Blackburn
8e35fc677e Merge pull request #9328 from edx/clintonb/compressed-text-field-fix 
Resolved decompression errors during tests
 2015-08-18 13:58:07 -04:00
Will Daly
e4a1ebd11c Specify course key when retrieving credit requirements. 
Fix an exception that could occur if a user had completed
the final grade credit requirement in > 1 course.
 2015-08-18 09:15:32 -07:00
Diana Huang
de15f8ec55 Merge pull request #9360 from edx/diana/add-last-activity 
Add a new last_activity_at field.
 2015-08-18 12:03:48 -04:00
zubair-arbi
c49d51f98b Merge pull request #9359 from edx/ahsan/ECOM-2117-style-issues-on-credit-status-in-dashboard 
Style issues on the credit status in the dashboard
 2015-08-18 20:42:33 +05:00
Diana Huang
ce8f311256 Add a new last_activity_at field. 
TNL-3068
 2015-08-18 11:21:04 -04:00
Calen Pennington
1e6d83b59e Merge pull request #9307 from cpennington/user-state-client-metrics 
User state client metrics
 2015-08-18 10:43:37 -04:00
Clinton Blackburn
207ce4eda5 Resolved decompression errors during tests 
Note that this change will require deleting all CourseStructure data. This data should be regenerated using the generate_course_structure management command.

XCOM-513
 2015-08-18 10:25:09 -04:00