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

6005 Commits

Author SHA1 Message Date
Carol Tong
77395bdf0d Merge pull request #8366 from edx/carol/doc/StudioTempl_Certs 
DOC: Finalize Help targets, sidebar text for Studio Certificates page
 2015-06-08 13:44:32 -04:00
Sarina Canelake
c9796b83a9 Merge pull request #8403 from edx/sarina/remove-redefine-django14-cors 
Use Django 1.4 @ensure_csrf_cookie method PLAT-664
 2015-06-08 11:44:25 -04:00
Carol Tong
6aa7f810f3 DOC: Finalize Help targets, sidebar text for certificates 2015-06-08 11:36:11 -04:00
Xavier Antoviaque
b32629d62f Default to filestorage when S3 isn't configured (aws.py) 
Also moves the default icons to the badges subfolder to avoid storage conflicts.
 2015-06-08 11:30:16 +02:00
Matt Drayer
3e52b8fad1 mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns 2015-06-06 23:15:17 -04:00
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04:00
Adam
ef5cd63cf2 Merge pull request #8345 from edx/adam/time-imports 
time how long imports take in datadog
 2015-06-05 13:52:55 -04:00
asadiqbal
815e408055 asadiqbal08/SOL-946: Remove default value for course title override 2015-06-04 16:28:52 -04:00
Awais Jibran
c1807c66d6 Merge pull request #8216 from edx/aj/tnl2159-studio-grade-range-bug 
Unconsistant view in Overall Grade Range
 2015-06-04 15:48:23 +05:00
Waheed Ahmed
c0f4c26e06 Fixed wiki pointing to old course's wiki in rerun courses. 
TNL-2314
 2015-06-04 14:36:30 +05:00
Adam Palay
67b56ae859 time how long imports take in datadog 2015-06-03 15:06:01 -04:00
David Baumgold
34addd8fa8 Group imports together in Mako templates 2015-06-03 12:36:47 -04:00
dino-cikatic
099be9e7e3 Merge pull request #8229 from edx/dcikatic/SOL-536 
Dcikatic/sol 536 [WIP]
 2015-06-03 13:55:42 +02:00
Davorin Sego
d3aa9dfd87 SOL-536 Experiment-Aware content search 2015-06-03 12:47:45 +02:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -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
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
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
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
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
Alessandro Verdura
31802a6675 PR feedback 
TNL-925
 2015-06-01 19:31:17 +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
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
David Baumgold
097f3fca8b Merge pull request #8112 from crispweed/master 
Scroll to new textbook and make input active, on textbook create
 2015-05-29 10:51:23 +02:00
Ned Batchelder
eb3b8c5ce4 TNL-2269 Compute language direction every time. 
The old code would compute the language direction once when the template
was loaded.

TNL-2269
 2015-05-28 16:13:59 -04:00
Sarina Canelake
a3b4a2516e Merge pull request #8220 from edx/sarina/ignore-migrations-for-coverage 
Ignore migrations in coverage reports
 2015-05-28 10:21:21 -04:00
Aamir
4a14ec694f Merge pull request #8122 from edx/aamir-khan/ECOM-1590-populate-requirements-table-new 
ECOM-1590: added the min_grade as a requirements
 2015-05-28 15:04:31 +05:00
aamir-khan
97b5ff7e8b ECOM-1590: added the min_grade as a requirements 2015-05-28 12:28:38 +05:00
Sarina Canelake
359e6134af Ignore migrations in coverage reports 2015-05-27 21:07:49 -04:00
Alessandro Verdura
8f6abbfd97 Add cancel() on object interface 
TNL-925
 2015-05-27 17:47:25 +02:00
Thomas Young
fcb369a68a added line with variable declarations to stop these being global, removed a bit of spurious whitespace at the end of another line 2015-05-27 16:17:22 +02:00
Alessandro Verdura
9603711196 Improvements on error handling + misc 
TNL-925
 2015-05-27 12:09:15 +02:00
Alessandro Verdura
8dd4f6efa7 PR feedback 
TNL-925

* Fix semicolons
* Use stage constants
* Group var declarations
* Add errorStage function
* Use constant for cookie name
* Use promises instead of callbacks
* Use fn.bind
* Improve error handling on upload stage
 2015-05-27 00:07:00 +02:00
Alessandro
a299af9ec2 Minor refactoring 
TNL-925
 2015-05-26 00:04:49 +02:00
Ben Patterson
176770efad Revert "Enable PyContracts during tests" 
This reverts commit 4312c0e763.
 2015-05-22 15:05:11 -04:00
Alessandro
8efadaec52 Add timestamp on success step + refactoring 
TNL-925
 2015-05-22 17:11:29 +02:00
Alessandro
4c0bf1615e Add moment.js 
TNL-925
 2015-05-22 17:10:05 +02:00
Mike Bifulco
1dcce2c49d fixed invalid CSS selectors 
The surplus ":" in the input selector causes jquery versions past 1.9 to throw an error.
 2015-05-22 14:56:42 +00:00
Sarina Canelake
7d96174f6b Fully enable licensing on devstack 2015-05-21 18:50:47 -04:00
Thomas Young
6aa1a84921 added jasmine tests for focusing on and scrolling to newly added textbook 2015-05-21 17:54:55 +02:00
Marco Morales
292ad42c3b Merge pull request #8125 from edx/marco/studio/outline-styling-fix/licensing 
BUG - Fixes styling issue for course status label on outline page
 2015-05-20 18:04:50 -04:00
Calen Pennington
a2cbd16680 Merge pull request #7789 from cpennington/wrap-csm 
Wrap access to CSM (inside FieldDataCache) to use the new interface
 2015-05-20 16:11:07 -04:00
Calen Pennington
4312c0e763 Enable PyContracts during tests 2015-05-20 15:07:18 -04:00
Marco Morales
c9f13eb982 fix for broken course status label on outline page 2015-05-20 11:49:30 -04:00