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

31316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
1153edf820 Merge pull request #8318 from edx/will/credit-requirement-status-changes 
Add additional "reason" field to CreditRequirementStatus
 2015-06-02 16:18:47 -04:00
Jonathan Piacenti
2aa85a72f0 Fix for flaky library users studio test, SOL-618 2015-06-02 19:52:46 +00:00
Kelketek
cda26bb94d Merge pull request #8173 from edx/badges 
OpenBadges MVP (SOL-768)
 2015-06-02 14:30:59 -05:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -04:00
Jonathan Piacenti
d499b22498 Analytics events for badges. 2015-06-02 18:32:50 +00:00
Jonathan Piacenti
f7862c1d9b Allow sharing of badges through the certificate web view. 2015-06-02 18:32:50 +00:00
Jonathan Piacenti
81877300cd Implement OpenBadge Generation upon Certificate generation through Badgr API 2015-06-02 18:32:50 +00:00
Muhammad Shoaib
65c4f1df89 SOL-236 Manual Enrollments 2015-06-02 13:19:32 -04:00
Andy Armstrong
94e1c42314 Add extensible course view types for edX platform 2015-06-02 13:12:40 -04:00
Sarina Canelake
9008548c25 Merge pull request #8207 from amir-qayyum-khan/add_ccx_enable_to_settings 
Added ccx enable/disable flag to advance settings and show hide ccx coach option on lms
 2015-06-02 11:52:17 -04:00
Christina Roberts
46cb847eb9 Merge pull request #8306 from edx/christina/delete-unused-methods 
Delete change_email_request and lang_pref_set_language
 2015-06-02 11:30:35 -04:00
Will Daly
58d24111f5 Add additional "reason" field to CreditRequirementStatus 
* Add "reason" JSON-encoded field to CreditRequirementStatus.
* Add a "failed" status to CreditRequirementStatus.status choices.
 2015-06-02 11:17:11 -04:00
Awais Jibran
a2fc4bd216 Overall Grade Range in Grading does not show consistant view when grades are removed 
TNL2159
 2015-06-02 20:15:19 +05:00
David Baumgold
e8022c74f2 Merge pull request #8169 from AkA84/TNL-925-import-module-amendments 
TNL-925: Import module amendments
 2015-06-02 10:58:32 -04:00
amir-qayyum-arbisoft
6a41cd7bfa Added ccx enable/disable flag to advance settings and show hide ccx coach option on lms 2015-06-02 19:43:42 +05:00
Ned Batchelder
bb0180d366 Merge pull request #8288 from edx/ned/add-range-checker 
Add range pylint checker
 2015-06-02 10:36:09 -04:00
chrisndodge
44bea2eacb Merge pull request #8305 from edx/cdodge/hotfix-support-multiple-regcode-redemptions 
don't assume in the ORM query a single RegCodeRedemption per enrollme…
 2015-06-02 10:19:42 -04:00
cahrens
410beb8485 Delete unused methods. 
This functionality is provided to the user_api accounts and preferences api.
TNL-1701
 2015-06-02 10:03:19 -04:00
Ned Batchelder
cc5c1001d1 Fix simplifiable-range pylint warnings. 2015-06-02 09:47:13 -04:00
Ned Batchelder
5b6294fe23 Update edx_lint to latest, with range checker 2015-06-02 09:47:12 -04:00
Syed Hassan Raza
dc13bbe1d6 Remove table of contents 2015-06-02 18:40:00 +05:00
Chris Rodriguez
b8a5dc9dee Replacing top border on footer 2015-06-02 09:02:03 -04:00
Calen Pennington
3b9c13e059 Merge pull request #8225 from UQ-UQx/master 
Initial chromeless template (for LTI Provider)
 2015-06-02 08:41:46 -04:00
Andrew Dekker
b4da8e2b86 Updated LTI render courseware test 
Updated LTI render courseware test for courseware-chromeless.html
 2015-06-02 21:39:33 +10:00
aamir-khan
41db8d8ec1 ECOM-1592: code refactoring 2015-06-02 16:31:23 +05:00
Chris Dodge
fdfda81add don't assume in the ORM query a single RegCodeRedemption per enrollment record 
Removed the unused try/except block around filter().
 2015-06-02 16:15:49 +05:00
Ahsan Ulhaq
4b2ba7e2e8 Merge pull request #8145 from edx/ahsan/ECOM-1473-No-indication-photo-taken 
No indication the photo was taken
 2015-06-02 06:19:54 -04:00
Ahsan Ulhaq
689b9c2d8e No indication the photo was taken 
No indication that photo is captured on verify photo page

ECOM-1473
 2015-06-02 12:41:51 +05:00
aamir-khan
810733db2c ECOM-1592: Adding incourse reverification as a credit requirement in course 2015-06-02 11:55:26 +05:00
Matt Drayer
d3dde8553c Merge pull request #7882 from edx/mattdrayer/SOL-465 
mattdrayer/SOL-465: Configure Certificate Web View via Studio
 2015-06-01 20:52:54 -04:00
Matt Drayer
af7277cdd9 New Feature: Certificates Web View 
- SOL-465: Initial implementation of certificates web view and signatories (names/titles)

- SOL-718 Close button is working properly

- SOL-801 Backbone Signatories Modeling

- SOL-803 Underscore template: Editor (Add)

- SOL-802 Signatories: Underscore template - Details

- SOL-804 Signatories: Underscore template: Editor (Edit)

- Add signatory delete Django view

- SOL-805 Signatory editor (Delete)

- Add Coffeescript router

- SOL-716 Jasmine Tests

- Added missing minified JS library

- client side validation of signatory fields

- SOL-390 signatories names

- Remove obsolete extends Sass files

- input maxlength limiting for signatory information

- SOL-389: Course title override

- SOL-466: Add capability to upload digitized signatures in Studio

- ziafazal: fixed css for upload signature image

- ziafazal: completed deletion of signature images

- UX-1741: Add initial static rendering/styling for Open edX web certs
  * creating new global static dir
  * adding static version of edX UX pattern library assets
  * adding web certificates static assets
  * adding static (+abstracted) web certificates rendering
  * creating two tiers of rendering (base + distinguished)
  * providing sample assets for certificate rendering
  * supporting RTL layouts
  * adding certifcates assests to edX static asset pipeline
  * temporarily hiding the mozilla open badges share action
  * wiring print button to print view/page
  * fixup! addressing conflict artifact in valid cert template
  * fixup! adding missing %hd-subsection sass extend + components comment clean up
  * fixup! correcting pattern library .hd-4 font-weight value

- SOL-468 Linked Student View for Web View Credential

- SOL-467: Add capability to upload organization logos for certificates

- SOL-391 / SOL-387: Signatory related info (assets) in certificates web view

- kelketek: Fixes for static asset collection in certificate HTML view.

- SOL-398 Web View: Public Access

- mattdrayer: Post-merge branch stabilization

- catong: Initial changes to Studio template and Help config file

- ziafazal: Branch stabilizations

- SOL-387: Display organization logo on LMS web view

- talbs/mattdrayer: Branch Stabilizations

- talbs: converting backpack action to use a button HTML element

- talbs: revising placeholder assets + their rendering in cert view

- mattdrayer: Username web view wireup

- SOL-386 Certificate Mode Previews

- SOL-905: Make organization logo and signatory signature uneditable

- SOL-922: Improve test coverage

- SOL-765: Add LinkedIn sharing

- [marco] temporary styling adjustment to account for smaller linkedin share image / fake button

- SOL-921: Address hardcoded template items

- SOL-927: Deleting certificate should delete org logo image also
  * updated invalid template
  * removed hr
  * fix invalid certificate error

- clrux: Add i18n to certificate templates and partials

- mattdrayer: Pylint violations

- SOL-920 Certificate Activation/Deactivation

- mattdrayer: Added LMS support

- SOL-932: Fix preview mode support in certificate view

- SOL-934: Fixed bug reported and broken tests

- SOL-935 removed the 'valid' word from web view title

- talbs: RTL support updates/fixes
  * revising certificate type icon/name vertical alignment
  * removing unused older certificate template
  * revising styling for message/banner actions
  * abstracting accomplishment type to use course mode + adding in honor/verified-specific placeholders

- mattdrayer: JSHint violations
 2015-06-01 19:48:04 -04:00
Will Daly
8664fddb35 Merge pull request #8310 from edx/will/ECOM-1676-take-two 
Avoid loading all users for "reviewing user" on the verify_student admin page.
 2015-06-01 17:57:29 -04:00
Daniel Friedman
f81d09cbdb Merge pull request #8254 from edx/dan-f/enable-tinymce-spellcheck 
Enable the browser's spellcheck in tinymce
 2015-06-01 17:08:08 -04:00
Greg Price
d6cd09be1e Merge pull request #8217 from edx/gprice/discussion-api-create-comment 
Add comment creation to discussion API
 2015-06-01 17:01:30 -04:00
Will Daly
01f3a28467 Avoid loading all users for "reviewing user" on the verify_student admin page. 2015-06-01 16:51:08 -04:00
Alessandro Verdura
f8dc82c3ce Translate error message for unsupported file format 
TNL-925
 2015-06-01 22:20:46 +02:00
Alexander Kryklia
ef8f391888 Merge pull request #7825 from edx/alex/video_bumper 
Alex/video bumper
 2015-06-01 23:07:05 +03:00
Daniel Friedman
1365096821 Merge pull request #8129 from edx/dan-f/auto-auth-add-anonymous_id_2 
Add anonymous_id to page returned by auto_auth
 2015-06-01 15:21:39 -04:00
Daniel Friedman
9e0dcb7239 Add JSON response to auto_auth with anonymous_id 2015-06-01 14:21:42 -04:00
Daniel Friedman
c26b958fd0 Enable the browser's spellcheck in tinymce 
TNL-1621
 2015-06-01 14:05:49 -04:00
Will Daly
b9b8b4d147 Merge pull request #8299 from edx/will/ECOM-1678 
ECOM-1678: Fix broken footer image URLs when using a CDN.
 2015-06-01 14:02:36 -04:00
Alessandro Verdura
31802a6675 PR feedback 
TNL-925
 2015-06-01 19:31:17 +02:00
Will Daly
70c6ce8ddb ECOM-1678: Fix broken footer image URLs when using a CDN. 2015-06-01 13:03:16 -04:00
swdanielli
53c35ae55f Merge pull request #8290 from edx/danielli/recommender_img_preview 
handle more exceptions for file uploading
 2015-06-01 12:30:09 -04:00
swdanielli
49f378b2af handle more exceptions for file uploading 2015-06-01 11:44:51 -04:00
zubair-arbi
c6439b53d0 Merge pull request #8231 from edx/zub/story/ecom-1612-change-icrv-block-fields 
use reverification xblock location as an identifier of reverification…
 2015-06-01 20:41:47 +05:00
Will Daly
a7c934c115 Merge pull request #8297 from edx/will/ecom-1494 
Prevent Django admin from loading all users for verify student models.
 2015-06-01 11:06:26 -04:00
zubair-arbi
803bc5532d use reverification xblock location as an identifier of reverification checkpoint 
ECOM-1612
 2015-06-01 19:33:04 +05:00
Will Daly
00578a0ca1 Prevent Django admin from loading all users for verify student models. 2015-06-01 10:08:00 -04:00
Ben McMorran
f425027134 Merge pull request #8048 from edx/benmcmorran/search-tags 
Enable HTML in note tags and support highlighting
 2015-06-01 09:37:23 -04:00