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

30547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chrisndodge
11fef20101 Merge pull request #8165 from edx/muhhshoaib/SOL-236/make-manual-enrollments 
SOL-236 Manual Enrollments
 2015-06-02 16:31:32 -04:00
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
Kelketek
cda26bb94d Merge pull request #8173 from edx/badges 
OpenBadges MVP (SOL-768)
 2015-06-02 14:30:59 -05: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
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
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
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
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
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
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
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
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
Alessandro Verdura
31802a6675 PR feedback 
TNL-925
 2015-06-01 19:31:17 +02: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
zubair-arbi
803bc5532d use reverification xblock location as an identifier of reverification checkpoint 
ECOM-1612
 2015-06-01 19:33:04 +05: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
Marko Jevtić
0fc3c14dec Merge pull request #8187 from edx/mjevtic/SOL-883 
(SOL-883) (SOL-893) RTL support for Registration Code redemption page
 2015-06-01 15:00:47 +02:00
marjev
3fe8768d93 (SOL-883) RTL support for Registration Code redemption page 2015-06-01 13:59:33 +02:00
dino-cikatic
62797a3f2e Merge pull request #7697 from edx/feature/course-discovery 
Feature/course discovery
 2015-06-01 11:46:44 +02:00
Davorin Šego
8a7193e42a Merge pull request #8024 from edx/feature/SOL-276 
Feature/sol 276 WIP
 2015-06-01 11:46:15 +02:00
Davorin Sego
176b1c8962 Course Discovery - Language Filtering 
Filter by Language:
Designation for course language(s) in Studio
allows for filtering of courses based on their language in the sidebar
Reuses active filter view UI/IA from find courses page on edx.org
view for clearing individual or all filters, as with edx.org filtering
 2015-06-01 10:45:51 +02:00
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +02:00
Sarina Canelake
de3cccdbe4 Merge pull request #8291 from edx/sarina/fix-help-string 
Add correct_or_past_due option for showanswer help text
 2015-05-31 18:48:19 -04:00
Sarina Canelake
be8eed65c8 Internationalize help text 2015-05-31 17:22:52 -04:00
Sarina Canelake
1237ee6b37 Add correct_or_past_due option for showanswer help text (ref bbeb79cb) 2015-05-31 17:22:51 -04:00
Sarina Canelake
a00ee2750a Merge pull request #8268 from edx/sarina/i18n-issues 
Use platform name, not edX, in all strings
 2015-05-31 17:15:39 -04:00
Sarina Canelake
e4fa06138a Use platform name, not edX, in all strings 2015-05-31 16:05:50 -04:00
Alexander Kryklia
4c7bfb44dd Add Video Bumper. 
Fix n-click behaviour on poster.
Fix unit tests.
Fix handler for non_en lang for bumper.
Add more tests.
Fix docstrings.
Fix pep8.
Fix static redirection with bumper.
Fix button in IE11.
Add video_bumper field in bok_choy.

Fix pylink violations.

Update docstrings and some clean up.

Rename edx_video_id in bumper tests.

Fix too long lines in help text.

Address ui comments.

Fix bumper events.

Refactor bumper-transcripts code, fix bugs, address comments.
Squashed commits:
Fix download transcript button.
[74e0c8c] Fix quality
[a759f33] Fix error, when sub contains extension.
[b30755c] Revert "Add video files to host for transcripts."

This reverts commit cf8a96bf84346e17b6ad57ad4cc6a27d7a9118cd.
[36f038a] Add video files to host for transcripts.
[23f1655] Fix pep8 and pyling issues.
[0f1f9d2] Update acceptance test.
[765a27d] Wait for ajax in captions.
[8ae72a3] Fix logic.
[063450f] Fix unit tests.
[d1075fc] Fix handlers tests.
[25d31ad] Update bumper_utils.
[cb5f9df] Remove maxDiff.
[8738b1a] Code cleanup.
[87dbcb7] Fix issues with transcripts.
[ec899de] Fix transcripts in serializers.
[444b1fc] Fix transcripts typo.
[d524cb5] Fix bumper.
[f62cf22] Fix video mongo tests.
[8f1b55a] Fix dispatches.
[53bc308] Add more fixes.
[d5e3723] Fix test_video_handlers and rename the method.
[93efc23] Fix mobile tests.
[740e2ae] Fix pep8 and pylint.
[47cfb66] Address comments, add fixes.
[4e499d9] Add fixes.
[8353553] Add improvements.

Updated dispatch values)
.

Use ddt in bumper handler tests.

Move common metadata to single place.

Fix style.

Update docstring.

Fix poster button.

Improve bumper events.

Fix test after rebase.

Address comments.

Download transcript: use def video lang, not bump.

Renamed date_last_view_bumper to bumper_last_view_date.

Rename do_not_show_again_bumper to bumper_...

Address comments.

Fix tests for download for en lang.

Fix bumper logic.

Update strings.

Update resizer.

Remove resizer.

Fix unit tests.

Add tests.

Fix bumper events.

Clean up tests.

Fix pylint violations.

Fix pep8 and pylint violations.

Update docs and method names.

Update events.

Make /static/ prefix a must.

Fix wrong code.
 2015-05-31 14:45:31 +03:00
Adam
93faba006c Merge pull request #8284 from edx/merge-release-to-master 
Merge release to master
 2015-05-30 05:38:20 -04:00
Adam Palay
683d2b3dbe fix quality violation 2015-05-29 21:46:02 -04:00
Adam Palay
e3976f7e98 Merge remote-tracking branch 'origin/release' into merge-release-to-master 2015-05-29 19:47:12 -04:00