Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
Chris Rodriguez
717b56a7b2 Sending skip links to single main, making more relevant 2016-05-02 13:09:19 -04:00
Peter Fogg
5a780e8019 Generate API client credentials. 
ECOM-3946
 2016-05-02 13:09:19 -04:00
Waheed Ahmed
921dc602ba Automatically enable Self Generating Certificates for Self Paced Courses. 
ECOM-3437
 2016-05-02 13:09:18 -04:00
Simon Chen
79332ed586 ECOM-4272 Add the cosmetic changes to the program listing page 2016-05-02 13:08:59 -04:00
Ned Batchelder
1a2ba1a533 Reduce the use of 'Open edX' as a noun 2016-05-02 12:44:28 -04:00
Bill DeRusha
25df9db6ff WIP django catalog admin 2016-05-02 11:20:31 -04:00
AlasdairSwan
294e1782f6 ECOM-3968 updated program card link alt text 2016-04-29 08:03:40 -04:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
AlasdairSwan
a6da71591a Merge pull request #12221 from edx/alasdair/ECOM-3200-program-card-learner-progress 
Adding program progress bar to program cards
 2016-04-27 15:06:39 -04:00
AlasdairSwan
cdb05c26a6 Adding program progress bar to program cards 2016-04-27 13:46:48 -04:00
Brian Jacobel
19b9242986 Merge pull request #12151 from edx/bjacobel/requirejs-errors-in-django-templates 
Fix errors in old Django templates / migrate to Mako
 2016-04-27 13:39:54 -04:00
Renzo Lucioni
63b65ab035 Merge pull request #12231 from edx/renzo/program-progress 
Measuring program progress
 2016-04-27 09:24:09 -04:00
Muzaffar yousaf
d97b3cbd1f Merge pull request #12037 from edx/fedx/upgrade-backbone 
Upgrade backbone via npm.
 2016-04-27 17:31:00 +05:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm. 
TNL-4335
 2016-04-27 12:48:45 +05:00
Renzo Lucioni
5da6a598dd Measuring program progress 
Introduces a utility class for gauging a user's progress towards program completion. Progress data is passed to the ProgramListFactory. ECOM-3200.
 2016-04-26 13:36:58 -04:00
Chris Rodriguez
fed39609d5 AC-400 removing tabindex from bookmark 2016-04-26 09:54:48 -04:00
Andy Armstrong
fe88402982 Merge branch 'master' into alasdair/fedx-118-pattern-library-styles-with-current-partials 2016-04-25 16:51:25 -04:00
Brian Jacobel
060b5bf97d Update escaping and safe-templating usage 2016-04-25 15:08:16 -04:00
Brian Jacobel
ac37c12b7d This is what this string used to look like, to gettext 2016-04-25 15:08:16 -04:00
Brian Jacobel
3c944d2af3 Fix line wrapping here 2016-04-25 15:08:16 -04:00
Brian Jacobel
284cc17b1d Move manual refunds page to Mako 2016-04-25 15:08:16 -04:00
Brian Jacobel
784e200a2f OAuth grant screen converted to mako (3/4) 2016-04-25 15:08:16 -04:00
Brian Jacobel
422147ea5a Migrate password_reset_confirm.html to Mako (2/4) 2016-04-25 15:08:16 -04:00
Brian Jacobel
bda18f46c0 Convert password_reset_confirm.html to Mako 2016-04-25 15:08:16 -04:00
Brian Jacobel
5965091a89 Remove an old i18n JS include from the wiki that did nothing 2016-04-25 15:08:16 -04:00
Brian Jacobel
bceab97d77 The only JS the pages using this template need is base_application 2016-04-25 15:08:16 -04:00
Brian Jacobel
ae49f7a6d9 Fix a usage of a Mako thing that doesn't work here 2016-04-25 15:08:16 -04:00
Brian Jacobel
2bee02a10a Fix gettext errors by including /js/i18n/LANGUAGE_CODE/djangojs.js in Django template 2016-04-25 15:08:16 -04:00
Andy Armstrong
c42b36ccd1 Fixes 2016-04-25 13:35:57 -04:00
clrux
8e347f4078 Merge pull request #12101 from edx/clrux/ac-342-tweaking-skip-links 
AC-342 sending skip links to single main, relevant
 2016-04-25 11:36:26 -04:00
Peter Fogg
687197481f Merge pull request #12154 from edx/peter-fogg/client-keys 
Generate API client keys.
 2016-04-25 11:05:01 -04:00
AlasdairSwan
a9971ef2ba FEDX-118 Adding header to test page 2016-04-25 10:56:28 -04:00
Chris Rodriguez
2a23757fbc Sending skip links to single main, making more relevant 2016-04-25 10:00:45 -04:00
Peter Fogg
b9b67d1091 Generate API client credentials. 
ECOM-3946
 2016-04-25 09:27:04 -04:00
Waheed Ahmed
f246c6bbd6 Automatically enable Self Generating Certificates for Self Paced Courses. 
ECOM-3437
 2016-04-25 17:52:47 +05:00
Simon Chen
f1e79c0b9b ECOM-4272 Add the cosmetic changes to the program listing page 2016-04-22 14:52:13 -04:00
muzaffaryousaf
1b0cda2430 Js test fixes for lms and lms-coffee. 2016-04-22 19:09:33 +05:00
M. Rehan
d659dd9f6d Merge pull request #12068 from edx/mrehan/sust-40-reduce-peroblem-get-ajax 
SUST-40 – Eliminate unwanted problem_get ajax requests flooding the LMS.
 2016-04-22 14:59:22 +05:00
Awais Qureshi
a3fcc93374 Merge pull request #12192 from edx/revert-12191-revert-12106-awais786/ECOM-3199-xseries-certs-view 
Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel""
 2016-04-21 11:56:49 +05:00
Adam
88192fd444 Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel"" 2016-04-20 19:21:14 +05:00
Adam Palay
9a4f80e5c0 update query for whitelisted users who haven't yet had certs run for them 
remove CertificateStatuses.regenerating
 2016-04-20 09:01:49 -04:00
Jesse Zoldak
270814102f Revert "Adding background image for xseries certificates on dashboard side bar panel" 2016-04-19 13:52:19 -04:00
sanfordstudent
adcf4a98c7 Merge pull request #12038 from edx/sstudent/seq_item_title_ 
Displaying title of item in course sequence tooltip instead of list of item's children
 2016-04-19 13:32:34 -04:00
Sanford Student
bbcec0cf40 displaying title of sequence item in tooltip instead of children 2016-04-19 10:28:47 -04:00
Awais Qureshi
298770e51b Merge pull request #12106 from edx/awais786/ECOM-3199-xseries-certs-view 
Adding background image for xseries certificates on dashboard side bar panel
 2016-04-18 16:22:11 +05:00
tasawernawaz
b4e1e97185 ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-18 08:48:21 +00:00
Awais
54058f6e58 Adding background image for xseries certificates on programs dashboard side bar panel. 
ECOM-3199
 2016-04-18 12:50:08 +05:00
Adam
98b8b68d40 Revert "Updated dashboard UI for empty list of courses and programs" (#12166) 2016-04-15 12:46:21 -04:00
tasawernawaz
00d2d6d20d Merge pull request #12153 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs-updated 
Updated dashboard UI for empty list of courses and programs
 2016-04-15 13:08:24 +05:00
tasawernawaz
ba6ba40e2e ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-15 06:50:03 +00:00