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

1032 Commits

Author SHA1 Message Date
John Eskew
14ad8cd78f SharedModuleStoreTestCase conversion for speedup. 2016-02-29 14:41:17 -05:00
Michael Frey
90146d9ae0 Only allow ecommerce checkout if user is also activated 2016-02-23 10:11:14 -05:00
Zia Fazal
e8ccc2f3e5 Merge pull request #11076 from CredoReference/render-lms-main-navigation-with-template 
Render lms main navigation (tabs) with template
 2016-02-18 11:21:16 +05:00
vkaracic
86a4710ee8 Otto checkout flow 2016-02-17 18:16:44 +01:00
M. Rehan
af9e26f5cb Merge pull request #11479 from edx/mrehan/plat-998-warnings-on-logout 
Fix - Bypass unnecessary logs on logging out.
 2016-02-17 17:46:05 +05:00
Qubad786
faf3a64e36 Bypass unnecessary logs on loging out 2016-02-17 13:42:01 +05:00
Toby Lawrence
9654449302 Merge pull request #11465 from edx/perf/speed-up-courseware-tests 
Switch to SharedModuleStoreTestCase in the 'courseware' app where possible.
 2016-02-16 10:06:53 -05:00
Dmitry Viskov
d532f8de0e Render LMS main navigation (tabs) with template, override templates for a specific list item 2016-02-16 17:03:53 +03:00
Toby Lawrence
49d3a7d35d More quality fixes. 2016-02-16 07:58:33 -05:00
Saleem Latif
cd101d5dec Merge pull request #11494 from edx/saleem-latif/WL-307 
WL-307: correct FAVICON_PATH setting for comprehensive theming
 2016-02-16 14:39:13 +05:00
Saleem Latif
75f17ecc8e correct FAVICON_PATH setting for comprehensive theming 2016-02-15 17:13:19 +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
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
Awais Jibran
5899be9207 Fix Beta Testers access courseware in self-paced courses 
ECOM-3612
 2016-02-10 14:47:03 +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
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
Peter Fogg
22cb307961 Correctly format date block dates. 2016-02-04 14:34:08 -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
Douglas Hall
263c71a6d7 Fix PHX-246 2016-01-29 20:45:07 -05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Nimisha Asthagiri
08a2bc9620 Merge pull request #11358 from edx/release 
Hotfix for MA-1981 and safe sessions
 2016-01-27 15:53:20 -05:00
Nimisha Asthagiri
f3cb692472 Safe Session Cookies Middleware 2016-01-26 17:23:03 -05:00
Ibrahim
0f09bb8a94 raise 404 when copyright template is missing 2016-01-22 12:02:46 -05:00
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg 
Escape Course Name in enrolment message
 2016-01-20 20:04:23 +05:00
Mushtaq Ali
8f76f3385a Fix enrollment message 2016-01-20 15:59:27 +05:00
Edward Zarecor
c37378fe29 Merge pull request #11231 from edx/release 
Merging changes for the patch release back to master
 2016-01-14 14:37:43 -05:00
Edward Zarecor
546610084c Removing CDN RPC 
CR comments

Whitespace

wip test refactoring

more test refactoring

Re-write download URL too.

Test fixes related to download change, and fix

wip, re-locating tests

update classname

Quality fixes
 2016-01-13 21:46:57 -05:00
Amir Qayyum Khan
6443070901 Hide register to course page from student, so that only coach can invite students to join ccx 2016-01-12 14:21:20 +05:00
Amir Qayyum Khan
c0a131e5d6 Allowed ccx coaches to see individual students progress from grade book 2016-01-08 16:05:33 +05:00
Toby Lawrence
56fe511a81 Merge pull request #11025 from edx/PERF-224 
[PERF-224] Serve course assets from a CDN
 2016-01-05 13:40:54 -05:00
Toby Lawrence
77343df0d9 [PERF-224] Support to serve static assets from a CDN. 
A base URL can now be configured which is, potentially, prepended to an
asset URL.  This allows a CDN, or caching server, to front static asset
requests, taking load off of the contentstore and speeding up page load
times.

Asset URL generation respects locked vs unlocked assets, and will not
generate links to locked assets that would traverse a CDN (even though
the authorization component of the contentserver middleware wouldn't
allow those links to work anyways).
 2016-01-05 10:24:44 -05:00
Ayub-Khan
96e64464b5 -fix TNL-3556 Instructor tool "View as Specific Student" doesn't work on the course updates page. 
-Added test for TNL-3556.
 2016-01-05 17:50:23 +05:00
aamir-khan
3fbdebcd30 ECOM-3107: Updated the progress page to not display the eligibility if user is not enrolled as credit mode 2015-12-29 17:34:34 +05:00
Nimisha Asthagiri
44abf7a9a2 Performance enhancement in see_exists: reverse order of checks 2015-12-23 16:40:38 -05:00
Nimisha Asthagiri
8e3f4e058d Update Course Catalog API to support filters 2015-12-23 12:31:31 -05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking 
Bookmarking
 2015-12-22 18:25:48 +05:00
Matjaz Gregoric
585c64f282 Enable staff debug everywhere except on detached blocks. 
Staff markup was enabled on all block types in
https://github.com/edx/edx-platform/pull/10903

This works well inside the courseware, but it breaks layout of the course about
page, which is also an XModule, see:
https://github.com/edx/edx-platform/pull/10903#issuecomment-164266342

This commit disables staff markup/staff debug on all blocks except
blocks tagged with 'detached'. Detached blocks include course about
and info pages, static tabs.
 2015-12-18 08:19:57 +01:00
muzaffaryousaf
3cbbb8f3b1 Add/Remove Bookmark button to each unit in LMS courseware. 
TNL-1957
 2015-12-17 22:07:32 +05:00
Renzo Lucioni
2cee39d535 Modify Course API to filter visible courses by org 
Org to filter by is provided to the Course API list view using a querystring argument. Filtering ultimately occurs at the database layer. ECOM-2761.
 2015-12-14 15:32:46 -05:00
Nimisha Asthagiri
160f391408 Merge pull request #10959 from edx/course_overview/manual_seeding 
Course Overview - require manual seeding of the table
 2015-12-14 08:39:03 -05:00
Nimisha Asthagiri
d6364312f4 Course Overview - require manual seeding of the table. 2015-12-13 23:35:46 -05:00
Matt Drayer
115b169259 mattdrayer/SOL-1519: Include course-level configuration in feature check 2015-12-13 09:57:29 -05:00
Sarina Canelake
e3a9721b42 Remove ORA1 references from LMS Python tests 2015-12-11 15:07:09 -05:00
Nimisha Asthagiri
c14c146d0e Merge pull request #10841 from edx/mobile/optimize-course-api 
Optimize Course Catalog using CourseOverview
 2015-12-11 10:03:35 -05:00
Nimisha Asthagiri
2b8441a072 Update Course Catalog to use CourseOverview 2015-12-10 20:37:50 -05:00