Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
Toby Lawrence
dacdbae1a5 Fix up some broken tests. 
We added the ability here to check if a role has a user in with the ability to refresh the role cache before checking.  Since some tests will make inline requests, which in turn put a user into a new role, we have to refresh afterwards otherwise we won't see that new role in place.  Since we don't want to automatically refresh ever, we just added a way to request it, since we know in this test that we're doing something, effectively, out-of-band, which necessitates it.
 2016-02-12 14:17:51 -05:00
wajeeha-khalid
7a9fea0236 Merge pull request #11450 from edx/jia/MA-1985 
MA-1985 add analytics event to thread/comment vote
 2016-02-12 21:13:45 +05:00
Awais Jibran
5be6d31384 Use Course ID in logging an exception 
TNL-4115
 2016-02-12 20:10:59 +05:00
Peter Fogg
77343a02d2 Merge pull request #11486 from itsbenweeks/info_display_number_fix 
info page course id -> display_number_with_default
 2016-02-11 12:53:21 -05:00
wajeeha-khalid
72aeb2c8da implemented test event data for thread/comment vote 2016-02-11 22:30:41 +05:00
wajeeha-khalid
3312eb2d22 refactored code into exclusive functions 2016-02-11 21:31:44 +05:00
wajeeha-khalid
fe9b1a0d80 add analytics event to thread/comment vote 2016-02-11 21:31:44 +05:00
Ben Weeks
52e8db34fd course id/org/name -> display_stuff_with_default 2016-02-11 10:25:12 -05:00
Toby Lawrence
4611829ac1 Quality fixes. 2016-02-11 08:48:48 -05:00
Peter Fogg
5d0ed333a5 Merge pull request #11502 from edx/peter-fogg/audit-cert-cutoff-date 
Explicitly cut off cert eligibility.
 2016-02-10 15:41:16 -05:00
Peter Fogg
2d028f8246 Add an explicit cutoff date for audit cert granting. 
The previous logic was a convoluted way of doing the same thing, and
has already led to one bug. Instead of hoping that the bugs are ironed
out now and that future devs maintain this logic properly, let's just
set a real cutoff date.
 2016-02-10 12:16:37 -05:00
Awais Jibran
eb97c6cfb9 Merge pull request #11421 from edx/aj/ecom3612-beta-tester-self-paced-course-issue 
Fix Beta Testers access courseware in self-paced courses
 2016-02-10 21:02:22 +05:00
Jesse Zoldak
7ccca469fc Merge pull request #11481 from edx/zoldak/remove-lettuce-homepage-test 
Convert homepage acceptance test to bok-choy
 2016-02-10 08:45:06 -05:00
Jesse Zoldak
f0c54c15ee Convert homepage acceptance test to bok-choy 2016-02-10 06:32:38 -05:00
Awais Jibran
5899be9207 Fix Beta Testers access courseware in self-paced courses 
ECOM-3612
 2016-02-10 14:47:03 +05:00
John Eskew
3f58954f3a Merge pull request #11469 from edx/jeskew/fix_django_19_warnings 
Remove deprecation warnings from Django models.
 2016-02-09 16:38:23 -05:00
John Eskew
bb5c28c0c5 Remove deprecation warnings from Django models. 
Add app_label definitions in Meta classes for models.
Move import of course_mode model into methods to prevent importing
the models at startup time.
 2016-02-09 09:28:43 -05:00
Jesse Zoldak
f8c66c1a16 Merge pull request #11463 from edx/zoldak/staff-debug-test 
Remove duplicate staff debug acceptance tests
 2016-02-09 09:24:19 -05:00
wajeeha-khalid
9d6df1e132 Merge pull request #11189 from edx/ekafeel/discussion-api-namespace-pagination 
Ekafeel/discussion api namespace pagination
 2016-02-09 17:42:48 +05:00
Toby Lawrence
6a6ef0fd35 Fix some broken tests. 2016-02-08 14:13:36 -05:00
Toby Lawrence
ad9498ecf4 Switch to SharedModuleStoreTestCase in the 'courseware' app where possible. 2016-02-08 14:11:04 -05:00
Jesse Zoldak
fc4866054f Remove duplicate staff debug acceptance tests 2016-02-08 13:17:14 -05:00
David Ormsbee
9ae0dada4c Merge pull request #11445 from edx/ormsbee/clear_cache_in_tests 
Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
 2016-02-08 10:23:54 -05:00
sanfordstudent
c51bcdbf91 Merge pull request #11418 from edx/sstudent/MA-1918-handle-no-handouts 
MA-1918 returning None for courses with no handouts
 2016-02-08 08:52:41 -05:00
David Ormsbee
be25bb8aba Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase 
Cached values were leaking across tests, causing difficult to debug errors,
particularly when using Config Models. As part of this work, certain tests
that had query counts that relied on those values being cached needed to
be adjusted up.
 2016-02-06 00:01:15 -05:00
jsa
92aa346fdf Implement celery task to award program certs. 
ECOM-3354
 2016-02-05 12:21:20 -05:00
Sanford Student
f88e5bc1d8 MA-1918 returning None for courses with no handouts 2016-02-05 11:31:16 -05:00
Kevin Falcone
98671a8aa6 Merge pull request #11399 from edx/jibsheet/dont-use-using 
Don't use using() in migrations
 2016-02-04 19:47:10 -05:00
Peter Fogg
2ddf1f2e6f Merge pull request #11427 from edx/peter-fogg/fix-audit-cert-regen 
Correctly set certificate status for audit certs when regenerating.
 2016-02-04 18:56:40 -05:00
Peter Fogg
711e2e7f3c Correctly set certificate status for audit certs when regenerating. 
COR-2403
 2016-02-04 17:23:20 -05:00
Peter Fogg
22cb307961 Correctly format date block dates. 2016-02-04 14:34:08 -05:00
Nimisha Asthagiri
599173c6b6 Merge pull request #11198 from edx/block-cache/collect-phase 
Refactor Block Cache to separate Collect and Transform phases
 2016-02-03 20:18:09 -05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers 
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
 2016-02-03 17:13:21 -05:00
Nimisha Asthagiri
05767b433d Collect Course Blocks on Course Publish and Management Command 
MA-1368
 2016-02-03 16:56:22 -05:00
Nimisha Asthagiri
66397c35b9 Refactor Block Cache to separate Collect and Transform phases 2016-02-03 16:54:29 -05:00
Peter Fogg
0c1dc272d4 Change "Go to Course" to "Resume Course" on course home page. 
ECOM-2960
 2016-02-03 13:58:23 -05:00
Peter Fogg
75bef91e17 Fix query counts after Django 1.8 merge. 2016-02-03 13:58:23 -05:00
Peter Fogg
786c4456ea Last-accessed courseware on the home page. 
ECOM-2806
 2016-02-03 13:58:22 -05:00
Ahsan Ulhaq
96d030b6d9 Reverse and Rename Courseware and Course Info Tabs 
ECOM-2678
 2016-02-03 12:20:53 -05:00
Peter Fogg
fd397964b3 Styling and template changes for the Course Home page. 
ECOM-2810
 2016-02-03 12:20:53 -05:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup 
CMS: Removing H1 and H2 from editor options; updating editor icons
 2016-02-03 09:28:44 -05:00
Omar Khan
0b4fa6e5a5 Disallow free verified course modes 
The verification workflow assumes that all verified courses will have a
price. Free verified course modes cause a 404 when the user attempts to
enroll or upgrade.
 2016-02-03 21:19:45 +07:00
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05:00
Chris Rodriguez
81d86eea42 Changing H2 to H3 in problem templates 2016-02-02 15:41:02 -05:00
Kevin Falcone
2d9708da03 Remove uses of using() from migrations 
This hardcoded the db_alias fetched from schema_editor and forces django
to try and migrate any second database you use, rather than routing to
the default database.  In testing a build from scratch, these do not
appear needed.

Using using() prevents us from using multiple databases behind edxapp.

Additionally - add back a removed backwards migration from certificates
0003.  I have no idea why this was dropped in the 1.8 upgrade.
 2016-02-01 16:57:26 -05:00
Douglas Hall
263c71a6d7 Fix PHX-246 2016-01-29 20:45:07 -05:00
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating 
PHX-219 Subsection Gating
 2016-01-29 11:05:39 -05:00
Zia Fazal
6e861f266b Merge pull request #11352 from edx/ziafazal/WL-209 
ziafazal/WL-209:Cert Social Sharing customization
 2016-01-29 16:50:17 +05:00
Zia Fazal
06e38e1c24 added branding to 404 and 500 error pages 
changes based on feedback

renamed a definition and added test coverage

fixed broken tests
 2016-01-29 15:46:51 +05:00
M. Rehan
b427da7185 Merge pull request #11350 from edx/mrehan/unwanted-discussion-modules 
Fix - skip orphans while getting discussion modules
 2016-01-29 12:46:02 +05:00