Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3029 Commits

Author SHA1 Message Date
Christine Lytwynec
659c72a03e move bok choy studio split tests to shard_2 2015-06-08 15:53:34 -04:00
Christine Lytwynec
e31a78cbb7 move bok choy video license tests to shard_2 2015-06-08 15:51:13 -04:00
Christine Lytwynec
2005734e1c move bok choy discussion tests to shard_2 2015-06-08 15:45:46 -04:00
Peter Fogg
17d3906c86 TNL-1891 Browse Teams: Category Subnavigation 
Introduces a tabbed view component which displays its subviews and
handles Backbone navigation between each tab. This is used to implement
the "My Teams" and "Browse" areas of the Teams tab. Right now the
content of both tabs is stubbed out with a placeholder view which should
be replaced by TNL-1893 and TNL-1892.
 2015-06-08 15:05:11 -04:00
Chris Rodriguez
4fd1ebce1c Fixing test to match CSS 2015-06-08 14:55:56 -04:00
Christine Lytwynec
7e19142b01 unskip acid xblock tests 2015-06-08 11:57:18 -04:00
Marko Jevtic
9e30bdb2c7 (SOL-835) Addressing flakiness of the reindex acceptance test 2015-06-08 14:27:11 +02:00
Ben Patterson
f37fdaf47d Merge pull request #8386 from edx/benp/lint-fix-test_import_export 
Follow imports order guidelines.
 2015-06-07 17:13:16 -04:00
Ben Patterson
dc4b4f9022 Merge pull request #8404 from edx/benp/skip-settings-test-jun2015 
Skip test that has become too flaky. SOL-449.
 2015-06-07 13:32:04 -04:00
Ben Patterson
d3f7bdc1e8 Skip test that has become too flaky. SOL-449. 2015-06-07 10:43:53 -04:00
Matt Drayer
3e52b8fad1 mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns 2015-06-06 23:15:17 -04:00
Ben Patterson
b7f8bd3c80 Follow imports order guidelines. 
https://github.com/edx/edx-platform/wiki/Python-Guidelines#imports-order

Follow-up to #8368
 2015-06-05 09:43:49 -04:00
Ben Patterson
8d1651cc19 Merge pull request #8381 from edx/benp/flaky-milestones-jun2015 
Flag test as flaky. SOL-449
 2015-06-05 09:16:42 -04:00
Ben Patterson
4e39799f49 Flag test as flaky. SOL-449 2015-06-04 20:16:26 -04:00
Ben Patterson
8e37e68c3f Flag test as flaky. TNL-2386 2015-06-04 19:20:31 -04:00
David Baumgold
37064cf191 Learners don't need to be lean 2015-06-04 09:42:27 -04:00
Shrhawk
ef500514c1 Merge pull request #7970 from edx/shr/bug/TNL-2038-Remove-table-of-contents-transcript-languages 
Remove "table of contents" from transcript upload languages
 2015-06-03 22:39:39 +05:00
David Baumgold
34addd8fa8 Group imports together in Mako templates 2015-06-03 12:36:47 -04:00
Diana Huang
6534503c93 Add teams tab 
TNL-1939
 2015-06-03 09:10:44 -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
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
Jonathan Piacenti
81877300cd Implement OpenBadge Generation upon Certificate generation through Badgr API 2015-06-02 18:32:50 +00: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
Ned Batchelder
cc5c1001d1 Fix simplifiable-range pylint warnings. 2015-06-02 09:47:13 -04:00
Syed Hassan Raza
dc13bbe1d6 Remove table of contents 2015-06-02 18:40:00 +05: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
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
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +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
Alessandro Verdura
6d9cfdcd22 Add timestamp value test 
TNL-925
 2015-05-27 21:59:29 +02:00
Awais Jibran
64ffcb2e2b Merge pull request #8179 from edx/aj/tnl2223-expand-inline-discussion-jumps-to-the-bottom-of-page 
TNL-2223 Inline discussion jumps to the bottom of the page when threa…
 2015-05-27 22:50:28 +05:00
Alessandro Verdura
da683ca7cf Add UI acceptance test 
TNL-925
 2015-05-27 17:47:35 +02:00
Christine Lytwynec
df758d7917 Add an explicit accessibility test TE-890 2015-05-26 11:55:27 -04:00
Awais Jibran
adfca9d480 TNL-2223 Inline discussion jumps to the bottom of the page when thread is expanded. 2015-05-25 18:31:17 +05:00
Awais
3da312b224 ECOM-1590 adding new field in advance_settings. 2015-05-21 00:29:00 +05:00
Christina Roberts
cff565060b Merge pull request #8052 from edx/christina/tag-events 
Update student notes eventing for tags.
 2015-05-19 13:55:57 -04:00
cahrens
0c7af25c79 Update student notes eventing for tags. 
TNL-2172
 2015-05-19 13:14:10 -04:00
Ben Patterson
6d38de1e5a Merge pull request #8098 from edx/benp/flaky-annotation 
Skip test. TNL-1590
 2015-05-19 12:34:13 -04:00
Ben Patterson
51ac5f7128 Skip test. TNL-1590 
Even when using the flaky decorator, it is not reliable.
 2015-05-18 17:02:18 -04:00
Sarina Canelake
1775dd5365 Merge pull request #7315 from edx/db/creative-commons 
Allow custom licensing for course content
 2015-05-18 15:36:50 -04:00
Sarina Canelake
ca64c665cc Default course license to All Rights Reserved 
Clicking on conflicting option box unchecks all conflicts
LMS: Clicking license text should bring to new window
updated styles to reflect html reuse inside of xblock edit modal area.

Add ARIA attributes to license for a11y

Gracefully handle re-selecting of selected license
 2015-05-18 14:37:32 -04:00
David Baumgold
a3887e951c Courseware license (Creative Commons): FED 
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
 2015-05-18 14:36:04 -04:00
David Baumgold
ca2fee1259 Move LicenseMixin into VideoFields class 2015-05-18 14:35:07 -04:00
David Baumgold
2159d34128 Added a simple XBlockMixin for courseware licenses 
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
 2015-05-18 14:34:28 -04:00
Ben Patterson
41e84a58dd Skip flaky test. SOL-618. 2015-05-18 14:11:20 -04:00
Martyn James
20a32a7e4f Merge pull request #8043 from edx/dcikatic/SOL-487-filter-staff-view-rebase 
Dcikatic/sol 487 filter staff view (rebase against master)
 2015-05-18 10:40:57 -04:00
Andy Armstrong
358aa7754b Add "Teams Configuration" advanced setting 2015-05-15 14:13:41 -04:00