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

1873 Commits

Author SHA1 Message Date
Saleem Latif
5f766f3806 Changes after testing on staging 2015-10-16 10:19:43 +05:00
frances botsford
a2bb8ed96c Merge pull request #10120 from edx/frances/fix/repo-cert-template-bugs 
Platform Web Cert template fixes
 2015-10-13 16:51:56 -04:00
Frances Botsford
06df341f56 web cert template rendering - adjust signature image sizing 2015-10-09 15:12:50 -04:00
Saleem Latif
9799d15373 course-number and override course-number added in Certificate Editor View 2015-10-08 11:29:14 +05:00
Mark Hoeber
dc5ed68420 Merge pull request #10062 from edx/markhoeber-doc2326 
Add Video File Size Warning to Upload Template
 2015-10-06 15:50:11 -04:00
Mark Hoeber
34820aba24 Add Video File Size Warning to Upload Template 2015-10-06 13:59:40 -04:00
asadiqbal
0b28fd23f8 SOL-1225 2015-10-06 14:52:38 +05:00
asadiqbal
aec1b95945 SOL-1262 2015-10-05 16:28:28 +05:00
David Baumgold
0219e18fa8 Merge pull request #10023 from edx/release 
Release into master
 2015-10-02 12:58:50 -04:00
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
Christine Lytwynec
90b9a73763 fix typo in course_info.html 2015-09-30 15:11:15 -04:00
David Baumgold
aa8ecca536 Remove the edx.org comprehensive theme 
There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.
 2015-09-30 12:18:01 -04:00
David Baumgold
116ca29189 Remove the edx.org comprehensive theme 
There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.
 2015-09-30 11:04:28 -04:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04:00
Saleem Latif
abfa6d9ad1 Line breaks in signatory title issue fixed 2015-09-29 12:38:58 +05:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
Bill DeRusha
271bc54071 Merge pull request #9765 from edx/bderusha/readonly-enrollment 
Readonly for enrollment end date/time on edX (for non-global-staff)
 2015-09-18 10:14:15 -04:00
Bill DeRusha
c6b54aa61f Readonly for enrollment end date/time on edX (for non-global-staff) 
TNL-2694

Add accessibility aria-readonly attributes
 2015-09-18 09:39:18 -04:00
Peter Fogg
0a2cfbe31c Merge pull request #9738 from edx/peter-fogg/change-studio-help-links 
Remove Tender and change Studio help links.
 2015-09-17 22:42:57 -04:00
Peter Fogg
fec5129a49 Remove Tender and change Studio help links. 
TNL-2695
 2015-09-17 16:30:40 -04:00
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -04:00
John Eskew
6b12ec97cc Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 16:23:52 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Matt Drayer
05a2b54b5a hotfix/2015-09-16-1: Removed signatory org char limit 2015-09-16 14:24:57 -04:00
Ned Batchelder
764cd862bd Mako comments have to be double-hash, or they are included on the page. 2015-09-16 11:24:18 -04:00
David Baumgold
9cd6e6ffde Merge pull request #9764 from edx/db/i18n-course-rerun-strings 
Internationalize course re-run strings
 2015-09-15 14:30:59 -04:00
Matt Drayer
3adb26d95b mattdrayer/signatory-title-textarea: Increase form input limit to 106 characters 2015-09-15 11:55:08 -04:00
David Baumgold
61419cefa5 Re-word translators comment 2015-09-15 11:24:46 -04:00
David Baumgold
9b34ab51bd Break translators comments across multiple lines 2015-09-15 11:24:43 -04:00
David Baumgold
4dbd81451f Internationalize course re-run strings 2015-09-15 10:19:55 -04:00
Christine Lytwynec
6164c20a0f Make studio forgot password link focusable 2015-09-09 12:40:31 -04:00
Matt Drayer
43da9f060e Merge pull request #9550 from edx/asadiqbal08/SOL-1157 
SOL-1157 Certs: Additional Studio UI cleanup
 2015-09-04 10:27:00 -04:00
asadiqbal
725e186677 SOL-1128 further enhancement 2015-09-03 15:06:18 -04:00
asadiqbal
3e4d4504ff SOL-1157 -- moving buttons from top to bottom and also using the standard save/cancel buttons in signatory edit view. 
and update the bokchoy test
 2015-09-03 15:32:52 +05:00
Christine Lytwynec
e807cbd589 Merge pull request #9402 from edx/clytwynec/TNL-2153 
Change component types and template links to buttons
 2015-09-01 12:48:46 -04:00
Christine Lytwynec
3470e180fc Change component types and template links to buttons 2015-09-01 10:31:35 -04:00
Muhammad Ammar
d38da773ea Merge pull request #9265 from edx/ammar/use-studio-confirmation-dialog-in-lms 
Confirm when leaving team
 2015-08-27 17:26:07 +05:00
muhammad-ammar
6134e8b5ed Move studio dialog code into common 2015-08-26 20:26:27 +05:00
asadiqbal
43316ea8fa SOL-1128 2015-08-26 15:11:46 +05:00
Mark Hoeber
68414a1345 Merge pull request #9352 from edx/markhoeber-doc2219 
Updated Certificate's config page help
 2015-08-21 14:40:38 -04:00
Alison Hodges
1e374f4d4e Merge pull request #9382 from edx/ahodges/comments_on_roles 
Adds a comment to reduce confusion over remaining role name differences
 2015-08-20 20:18:04 -04:00
Alison Hodges
3547821b1a Adds a comment to reduce confusion over remaining role name differences 2015-08-20 16:09:35 -04:00
zubair-arbi
ec28a75f14 In-course reverification access control 
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
 2015-08-20 08:43:55 -07:00
Mark Hoeber
5c33f144d0 Updated Certificate's config page help 2015-08-20 11:04:22 -04:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release 
Release
 2015-08-17 13:17:55 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application 
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
 2015-08-10 10:29:45 -04:00
Mushtaq Ali
f4aa92f0aa Merge pull request #9229 from edx/mushtaq/tnl-2882-fix-ie10-group-config-bug 
Fix IE10 issue with delete button.
 2015-08-10 17:48:59 +05:00