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

32199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5ae6beb408 Merge pull request #9379 from edx/ned/i18ntools-013 
Use 0.1.3 of i18ntools
 2015-08-19 11:04:18 -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
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
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
Matt Drayer
13ef9a62d1 Merge pull request #9358 from edx/ziafazal/SOL-1044-fix-org-ddl 
SOL-1125: fix for organization id drop down not populating
 2015-08-18 10:10:36 -04:00
Eric Fischer
1b66abc50a Merge pull request #9323 from edx/efischer/expand_instructor_definition 
Expand instructor definition
 2015-08-18 10:09:32 -04:00
Eric Fischer
ab3b2ebd9a Fixing problematic bok_choy test 
By moving the team_page.first_member_username access to occur before
click_first_profile_image() is called, we avoid a potential issue
where the wrapper() method defined in page_object.py, which
decorates the property, calls into _verify_page() and raises a
WrongPageError.
 2015-08-18 09:16:26 -04:00
Ahsan Ulhaq
722c5bb90d Style issues on the credit status in the dashboard 
ECOM-2117
 2015-08-18 17:42:03 +05:00
Zia Fazal
53f1b2de0c fix for organization id drop down not populating 2015-08-18 13:37:06 +05:00
Christina Roberts
3bf6b9bd32 Merge pull request #9357 from edx/christina/tnl-3072 
The stale flag needs to take into account its previous state.
 2015-08-17 20:30:17 -04:00
Eric Fischer
350d15876a Expand instructor definition 
Per discussions, for the purposes of the teams API, an 'instructor'
is any of:
	-course staff
	-global staff
	-discussion privileged users
This change will include the last case, which previously did not have
instructor access. Changes will be documented on the teams API wiki:
https://openedx.atlassian.net/wiki/display/TNL/Team+API

Tests have also been added to confirm this functionality.

TNL-2984
 2015-08-17 17:59:43 -04:00
Brian Beggs
c71d61e533 Adding django command to create mongodb indexes 2015-08-17 17:05:27 -04:00
cahrens
41f207dec3 The stale flag needs to take into account its previous state. 
Otherwise it can change from false to true without re-rendering. TNL-3072
 2015-08-17 17:05:27 -04:00
Mark Sadecki
19604a4a6e Merge pull request #9038 from mitocw/fix/aq/extended_labels_issues_ccx 
Fixed explicit label issues related to CCX accessibility
 2015-08-17 14:31:38 -04:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release 
Release
 2015-08-17 13:17:55 -04:00
Calen Pennington
9cbc8564a1 Merge pull request #9109 from jazkarta/ccx_course_published_signal 
Changes to a CCX course should emit a course_published event
 2015-08-17 13:14:00 -04:00
Sarina Canelake
5481a6a1a8 Merge pull request #9146 from open-craft/OC-791-course-timeline 
Instructor Dashboard: Display info about course timeline
 2015-08-17 13:10:57 -04:00
Kevin Falcone
7cdfe2ea95 Merge pull request #9350 from edx/jibshet/escape-studio-courses 
HTML-escape uses of course display name.
 2015-08-17 12:27:43 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
Waheed Ahmed
9529359681 Merge pull request #9297 from edx/waheed/tnl3049-fix-admin-course-access-role-required-field-value 
Fixed admin course access role required field value not populating.
 2015-08-17 20:41:22 +05:00
clrux
2dd3f6c60f Merge pull request #9257 from edx/clrux/ux-2515-calc-label 
Calculator: fixing remainder of a11y errors
 2015-08-17 10:40:19 -04:00
Waheed Ahmed
f1af5b5c29 Fixed admin course access role required field value not populating. 
TNL-3049
 2015-08-17 19:22:06 +05:00
Jesse Zoldak
e57bf4a5d4 Merge pull request #9326 from edx/zoldak/TNL-3069 
Mark TeamPageTest class as flaky TNL-3069
 2015-08-17 09:29:03 -04:00
Muzaffar yousaf
1ac701ebed Merge pull request #9338 from edx/muzaffar/revert-master-changes 
Reverts the accessibility changes for team profile page.
 2015-08-17 18:16:43 +05:00
tasawernawaz
b9bd9ae3f6 Merge pull request #9336 from edx/tasawer/bugfix/ecom-2019-fixing-mininmum-grade-value-error 
Fixing minimum grade value error
 2015-08-17 18:15:32 +05:00
Renzo Lucioni
64f5df575a Merge pull request #9329 from edx/renzo/fix-release-script 
Fix release script typo
 2015-08-17 08:57:10 -04:00
muzaffaryousaf
9e7d278dd0 Revert "Accessibility fixings." 
This reverts commit 789732a7c8.
 2015-08-17 16:52:01 +05:00
muzaffaryousaf
e73a855659 Revert "Accessibility fixings for new post button on teams." 
This reverts commit e133a63a5b.
 2015-08-17 16:51:52 +05:00
muzaffaryousaf
e133a63a5b Accessibility fixings for new post button on teams. 
TNL-1930
 2015-08-17 16:27:45 +05:00
muzaffaryousaf
789732a7c8 Accessibility fixings. 
TNL-1930
 2015-08-17 15:56:58 +05:00
Tasawer
58b088e109 Fixing minimum grade value error 
ECOM-2109
 2015-08-17 10:20:40 +00:00
Amir Qayyum Khan
e18fa2f489 Fixed explicit labels related issues on CCX coach dashboard and membershp team management to fix #21 2015-08-17 13:28:44 +05:00
Renzo Lucioni
03e6a12ede Fix release script typo 2015-08-15 14:31:41 -04:00
Brian Talbot
aa5fed718d Merge pull request #9207 from edx/talbs/remove-mktg-iframe 
Clean Up: Remove edx.org Specific MKTG Iframe Assets
 2015-08-14 17:42:01 -04:00
Christina Roberts
5e928417f1 Merge pull request #9325 from edx/christina/more-teams-tests 
Add an additional test case related to re-fetching data.
 2015-08-14 16:36:01 -04:00
Brian Talbot
944f51a60b LMS: removing old and not needed edx.org MKTG iframe assets 
* removing templates/styling
* removing test logic and URLs
 2015-08-14 16:17:19 -04:00
Jesse Zoldak
996ce1d62c Mark TeamPageTest class as flaky TNL-3069 2015-08-14 16:07:54 -04:00