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

10875 Commits

Author SHA1 Message Date
Muzaffar yousaf
77d445c962 Merge pull request #7787 from edx/muzaffar/tnl2051-profile-image-hover 
Adding hover state to image profile for accessibility.
 2015-05-06 14:11:04 +05:00
Muhammad Ammar
63f4aa8ceb Merge pull request #7761 from edx/ammar/tnl1886-add-certificate-columns-in-grade-report 
Add certificate columns in grade report
 2015-05-06 09:32:42 +05:00
Clinton Blackburn
5e68753101 Deprecated Verify Later Page 
We are moving toward a single workflow for verification.
 2015-05-05 16:42:27 -04:00
Greg Price
f22756128d Merge pull request #7881 from edx/gprice/discussion-api-thread-list 
Add thread list endpoint to the new discussion API
 2015-05-05 13:56:10 -04:00
Marco Morales
6426e28846 Merge pull request #7591 from jolyonb/jbloomfield/printing-links 
Print CSS: Fixing Links
 2015-05-05 13:35:25 -04:00
Marco Morales
cc478af4e8 Merge pull request #7592 from jolyonb/jbloomfield/printing-pagesize 
Fix Print Media CSS: Page margins
 2015-05-05 13:34:01 -04:00
Jim Abramson
1ce4baa67a Merge pull request #7892 from edx/jsa/xcom-208 
Pass tracking context to ecommerce api client.
 2015-05-05 12:42:08 -04:00
muzaffaryousaf
0d2e2660e2 Adding hover state to image profile for accessibility. 
TNL-2051
 2015-05-05 21:01:47 +05:00
Jolyon Bloomfield
bf4a1d47a9 Fixing page size print CSS (rebase commit). 2015-05-05 11:45:56 -04:00
Greg Price
90f28dce31 Add thread list endpoint to the new discussion API 
This is an initial implementation that only allows retrieval of all
threads for a course and only returns an easily computed subset of the
fields that are needed, in order to keep this change from getting too
large.

JIRA: MA-641
 2015-05-05 11:45:09 -04:00
Jolyon Bloomfield
d4a5bf7490 Fixing links in print media (combined commit for rebase). 2015-05-05 11:39:37 -04:00
jsa
26f9a5d76f Pass tracking context to ecommerce api client. 
XCOM-208
 2015-05-05 10:50:46 -04:00
muhammad-ammar
3bb7a2508d Add certificate columns to existing grade report 
TNL-1886
 2015-05-05 17:43:08 +05:00
Ahsan Ulhaq
702663d978 Merge pull request #7889 from edx/ahsan/AC-102-forums-vote-tracking-missing-spaces-awkward-reading 
Forums vote tracking missing spaces causes awkward reading
 2015-05-05 05:48:59 -04:00
Christina Roberts
31a19c0f63 Merge pull request #7823 from edx/christina/notes-tagging 
Add tags plugin.
 2015-05-04 20:56:52 -04:00
cahrens
8e636677ff Display tags in note template. 2015-05-04 16:00:23 -04:00
cahrens
5fe384ca2b Add tags plugin. 
TNL-1924
 2015-05-04 16:00:18 -04:00
zubair-arbi
7a1060cf56 Merge pull request #7849 from edx/zub/story/reverification-sevice-get-attempts-method 
add 'get_attempts' method for 'ReverificationService'
 2015-05-04 12:49:01 +05:00
Ahsan Ulhaq
95b2b82896 Forums vote tracking missing spaces causes awkward reading 
AC-102
 2015-05-02 19:52:20 +05:00
Clinton Blackburn
bfb201ec7d Merge pull request #7822 from edx/clintonb/receipt-page-update 
Updated Receipt Page for Oscar
 2015-05-02 09:32:11 -04:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
Eugeny Kolpakov
4d076fceed Merge pull request #7816 from open-craft/ekolpakov/children-import-fix 
Fixed loosing children in drafts on import
 2015-05-01 20:59:01 +03:00
E. Kolpakov
6db974c8ee Fixes for course import-export: 
* Updated XBlock hash - new version forces exposes force_dirty method on fields
* Includes Scope.children fields into xml_importer._update_module_location so that they are updated as well.
* Tests for mutable fields xml_importer._update_module_location with mutable fields and children
 2015-05-01 18:36:14 +03:00
Will Daly
f6e8ce24af Merge pull request #7879 from edx/will/restore-remember-me 
Add remember me checkbox back to the combined login/registration page
 2015-05-01 09:57:45 -04:00
Greg Price
c006befdaf Merge pull request #7767 from edx/gprice/discussion-api-topics 
Add discussion topic API
 2015-04-30 18:05:08 -04:00
Will Daly
05baddb2a6 Add remember me checkbox back to the combined login/registration page 2015-04-30 17:13:03 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Greg Price
ebff94af3f Add discussion topic API 
This is the first stage of the new Discussion API.

JIRA: MA-604
 2015-04-30 14:25:05 -04:00
Ahsan Ulhaq
1e5cbbefe1 Merge pull request #7844 from edx/ahsan/AC-97-aria-describedby-broken-id-ref-sign-in-page 
aria-describedby has broken IDref on Sign in email form
 2015-04-30 11:04:49 -04:00
Ned Batchelder
6fd60f21b5 Merge pull request #7358 from edx/ned/add_dunder_init_files 
Add missing __init__.py files
 2015-04-30 10:50:49 -04:00
Awais Qureshi
e465733778 Merge pull request #7811 from edx/awais786/ECOM-1284-re-generate-certs 
ECOM-1284  enabling re-generate certs.
 2015-04-30 18:46:12 +05:00
Ahsan Ulhaq
6d451ccd47 change three line structure to one line 2015-04-30 18:13:27 +05:00
Ahsan Ulhaq
3ec676e61b change indentaion and add new line 2015-04-30 18:13:27 +05:00
Ahsan Ulhaq
734ce5e2fb aria-describedby has broken IDref on Sign in email form 
AC-97
 2015-04-30 18:13:27 +05:00
zubair-arbi
9edec96fb8 update django admin for 'verify_student' app 2015-04-30 18:02:24 +05:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04:00
zubair-arbi
96d4a895f0 add 'get_attempts' method for 'ReverificationService' 2015-04-30 15:50:12 +05:00
Awais
19ab698f4c ECOM-1284 enabling re-generate certs. 2015-04-30 14:15:33 +05:00
zubair-arbi
4d9781aaa7 Merge pull request #7813 from edx/zub/story/ecom-1477-verfication-model-add-itemid 
add location_id field for the Reverification XBlock in VerificationStatu...
 2015-04-30 11:27:22 +05:00
Will Daly
50e9b43512 Merge pull request #7826 from edx/will/update-reverification-flow-copy 
Update copy on reverification flow.
 2015-04-29 10:38:54 -04:00
Sarina Canelake
aed9ba8a38 Merge pull request #7818 from mcgachey/mcgachey-lti-render 
[LTI Provider] Wiring up LTI views to the courseware template
 2015-04-29 10:34:09 -04:00
Sarina Canelake
cd9ce147d0 Merge pull request #7831 from amir-qayyum-arbisoft/icon_in_set_date 
Fixed cross icon issue on set date dialog inside schedule tab
 2015-04-29 09:47:33 -04:00
zubair-arbi
da94aca522 add location_id field for the Reverification XBlock in VerificationStatus model 
ECOM-1477
 2015-04-29 18:41:30 +05:00
amir-qayyum-arbisoft
3e5e6065e4 fixed cross icon issue on set date dialog inside schedule tab 2015-04-29 15:28:21 +05:00
Aamir
dc308d4f28 Merge pull request #7772 from edx/awais786/ECOM-1441-additional-methods 
ECOM-1441 additional methods for skip re-verification links.
 2015-04-29 14:13:10 +05:00
Awais
860467e7d2 ECOM-1441 additional methods for skip re-verification links. 2015-04-29 12:17:15 +05:00
Chris
d9e13d22b8 Merge pull request #7763 from edx/clrux/sequence-nav-button-icons 
Changing sequence nav buttons from images to icon fonts
 2015-04-28 14:05:38 -04:00
Chris Rodriguez
74ce5cbb87 Changing sequence nav buttons from images to icon fonts 2015-04-28 11:04:16 -04:00
Phil McGachey
854c9637f1 [LTI Provider] Addressing review comments 2015-04-28 10:35:44 -04:00
Sarina Canelake
b2d9d339d1 Docstrings for mailchimp scripts 2015-04-28 10:23:10 -04:00