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

624 Commits

Author SHA1 Message Date
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
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Sarina Canelake
71d5180ba1 Add more context to translation strings 2015-08-11 13:11:32 -04:00
David Baumgold
8daf2a7854 settings.STUDIO_SHORT_NAME doesn't exist in LMS 2015-08-10 10:40:40 -04:00
David Baumgold
668c7fdca3 Should never just link the word 'here' 2015-08-05 15:53:51 -04:00
David Baumgold
386a8a27dd Merge pull request #8936 from edx/db/remove-unneeded-template-block 
Remove unneeded block from courses.html template
 2015-08-03 13:13:58 -04:00
David Baumgold
7adaa22186 Remove unneeded block from courses.html template 2015-08-03 09:47:19 -04:00
Calen Pennington
aa374ca12a Make DjangoXBlockUserStateClient pass semantic tests 
This required the following changes to the DjangoXBlockUserStateClient
semantics:

1) Changes get/get_many to return XBlockUserState tuples, rather
than state dictionaries or (block_key, state) tuples.
2) Raises DoesNotExist if get_history is called on an XBlock that has
had no data saved to it.
3) Returns XBlockUserState tuples as the results of get_history.
 2015-08-01 08:13:25 -04:00
Davorin Šego
65eb26b7b4 Merge pull request #9004 from edx/dsego/discovery-ui-improvements 
Improve course discovery filtering and empty search
 2015-07-30 17:34:39 +02:00
aamir-khan
9f0f081a1f ECOM-1916: updated the dispaly 2015-07-28 14:59:48 +05:00
Davorin Sego
8d6df18357 Course discovery UI improvements 2015-07-28 11:59:44 +02:00
Christina Roberts
e5928bacc2 Merge pull request #8894 from edx/andya/lms-requirejs 
Implement RequireJS Optimizer in the LMS
 2015-07-21 15:07:49 -04:00
Will Daly
d3f58b689f Credit progress page formatting bugfixes. 
* Correctly format the student's full name on the progress page.
* Add tests for progress page credit requirements display.
* Display grade percentage for credit requirement on progress page
 2015-07-20 13:08:13 -07:00
cahrens
ad16f9f968 Optimize search usages. 2015-07-20 14:24:30 -04:00
Sarina Canelake
9b905ae729 Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag 2015-07-15 11:11:09 -04:00
Marco Morales
a930fec852 Merge pull request #8812 from edx/marco/UX-384/reminder-icon-change 
UX-384: Improved visual indicator for graded subsections in LMS sidebar
 2015-07-14 14:26:31 -04:00
Marco Morales
493200734e Merge pull request #8296 from edx/marco/find-courses-page/styling-changes 
Styling improvements to openedX search through Find Courses page
 2015-07-14 08:14:35 -04:00
Marco Morales
b30c2f3bd0 updated graded icon indicator to use data-tooltip, font-awesome, plus hides it from screenreaders 2015-07-13 22:31:20 -04:00
Sven Marnach
3d7246ecc8 Allow masquerading as a specific user different from the logged in user. 2015-07-13 18:55:45 -07:00
Tasawer
c964b5cb5a Update copy for On Demand Cert Download 
ECOM-1651
 2015-07-09 15:45:40 +05:00
Awais
db7dea118c ECOM-1829 Removing the regen link. 2015-07-08 16:55:37 -04:00
Will Daly
9056052b09 Fix a small typo for credit requirements on the progress page. 2015-07-08 11:56:43 -07:00
Ben Patterson
cc7647571c Revert "Update copy for On Demand Cert Download" 2015-07-08 07:59:39 -04:00
Tasawer
028ddefe4e Update copy for On Demand Cert Download 
ECOM-1651
 2015-07-08 16:01:10 +05:00
aamir-khan
935da3a12c ECOM-1601: Added the help link of credit info 2015-07-07 09:58:48 +00:00
Akiva Leffert
f0b52c698d Merge pull request #8739 from edx/aleffert/remove-chromeless-xblock-border 
Remove border from chromeless xblock
 2015-07-06 11:37:29 -04:00
Matt Drayer
4526b929b0 Merge pull request #8491 from edx/mattdrayer/fix-progress-template 
mattdrayer/SOL-1018: Fixed progress template for better web certificates support
 2015-07-02 13:51:49 -04:00
Akiva Leffert
07fda73ffa Remove border from chromeless xblock 
JIRA: https://openedx.atlassian.net/browse/MA-972
 2015-07-01 12:11:15 -04:00
Chris Dodge
b741ce786b fix python unit tests 2015-07-01 13:46:55 +02:00
Davorin Sego
2972e9110c search input element styling improvements, test clean up 2015-07-01 13:46:55 +02:00
Marco Morales
b9ed758246 Initial syles cleanup and changes for course discovery on openedx 2015-07-01 13:46:54 +02:00
Ahsan Ulhaq
7787974dd5 Order of Credit Eligibility line items 
Displayed eligibility line items on the Progress page of a Credit course
in the order of appearance in the courseware.

ECOM-1782
 2015-07-01 13:40:39 +05:00
Matt Drayer
700eb8b702 mattdrayer/fix-progress/template: Improved web certificates support 2015-06-26 10:43:26 -04:00
Will Daly
75d194e279 Update credit eligibility 
* Update credit eligibility when a user satisfies an eligibility requirement.
* Refactor set_credit_requirement_status arguments.
* Use django-simple-history to track requirement status changes.
* Refactor progress page by moving credit into a helper function and adding comments.
 2015-06-24 15:19:27 -07:00
Ahsan Ulhaq
6fdff766bc Credit eligibility requirements display on student progress page 
ECOM-1523
 2015-06-22 18:36:54 +05:00
Dino Cikatic
af7521b240 SOL-994 fix js loading if search features disabled 2015-06-17 14:53:45 +02:00
Awais Qureshi
52e8d71fb9 Merge pull request #8489 from edx/awais786/ECOM-1683-remove-cert-regen-code 
ECOM-1683 removing regen-cert code.
 2015-06-17 14:51:19 +05:00
frances botsford
f66261c9f2 Merge pull request #8309 from edx/frances/responsive-lms-cleanup 
Responsive LMS cleanup
 2015-06-16 23:10:49 -04:00
Frances Botsford
03d5589e97 first wave cleanup of fixed width at page level in LMS 2015-06-16 16:09:04 -04:00
Awais
4d5a4b035d ECOM-1683 removing regen-cert code. 2015-06-16 20:08:57 +05:00
Ahsan Ulhaq
d35b652843 Display Eligibility table on progress page 
1-Adding basic html for displaying eligibility table
2-Updated Eligibility Requirements Dynamically

ECOM-1523
 2015-06-16 16:19:33 +05:00
Andy Armstrong
1689004189 Create a common paginated list view 
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
 2015-06-15 13:51:09 -04:00
Edward Zarecor
c12c5c926d fixing post-release merge conflicts with DKH 2015-06-10 16:56:21 -04:00
Giulio Gratta
0b741aa3c4 BUGFIX: fix FA4 conversion for a few icons 
- course-about sidebar info icon -> correct icon: "fa-info-circle"
- wiki search add file -> correct icon: "fa-plus-circle"
- wiki history paragraph info -> correct icon: "fa-info-circle"
 2015-06-09 10:18:35 -07:00
Chris Dodge
e47c97b465 make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag 2015-06-08 07:46:55 -04:00
asadiqbal
6f0606a00b asadiqbal08/SOL-961: Student-generated certificate flow shows "download" certificate button 2015-06-07 20:44:42 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
Tim Krones
f711a32e3d TNL-1652: Allow instructors to obtain CSV file listing students who may 
enroll in a course but have not signed up yet.
 2015-06-04 20:50:04 +02:00
David Baumgold
34addd8fa8 Group imports together in Mako templates 2015-06-03 12:36:47 -04:00
Andy Armstrong
94e1c42314 Add extensible course view types for edX platform 2015-06-02 13:12:40 -04:00