Peter Fogg
|
2871ce8dee
|
Fix pep8 violations.
|
2013-06-03 10:36:46 -04:00 |
|
Peter Fogg
|
457bd30c68
|
Make sure advanced component creation shows even a single template.
|
2013-06-03 10:26:52 -04:00 |
|
Peter Fogg
|
55aaa1a8e9
|
Add lettuce tests for single-click video creation and fix previously failing tests.
|
2013-06-03 10:20:38 -04:00 |
|
Peter Fogg
|
cce65ce9ae
|
Merge branch 'master' of github.com:edx/edx-platform into peter-fogg/single-click-video-creation
|
2013-06-03 09:15:52 -04:00 |
|
Peter Fogg
|
8c5f9e6e41
|
Fix merge conflict.
|
2013-06-03 08:49:52 -04:00 |
|
Christina Roberts
|
de743a4812
|
Merge pull request #39 from edx/fix/marco/studio-latex-compiler
hides latex compiler in settings tab by making previously specific css s...
|
2013-06-02 13:19:32 -07:00 |
|
chrisndodge
|
7735e37585
|
Merge pull request #8 from edx/valera/fix_videoalpha_studio_integration
Added videoalpha to advanced components in component.py file.
|
2013-06-02 13:04:33 -07:00 |
|
Chris Dodge
|
6fb520f21e
|
add peer grading to the advanced components check
|
2013-06-02 14:39:36 -04:00 |
|
chrisndodge
|
cd0f4b8194
|
Merge pull request #18 from edx/fix/cdodge/bad-link-in-activation-email
[STUD-177] Fix/cdodge/bad link in activation page
|
2013-06-02 11:36:31 -07:00 |
|
marco
|
67a29ea94a
|
hides latex compiler in settings tab by making previously specific css sibling selector general enough to find and hide the appropriate div
|
2013-06-02 12:48:54 -04:00 |
|
Chris Dodge
|
91d3f4ddff
|
add simple content check for the activation page when the user is not logged in
|
2013-06-02 00:43:17 -04:00 |
|
Chris Dodge
|
c0899463e3
|
remove unused import reference
|
2013-06-02 00:18:35 -04:00 |
|
Chris Dodge
|
ba9a5b3824
|
add simple check on whether the expected advanced modules appear in the edit unit page when turned on
|
2013-06-02 00:15:34 -04:00 |
|
cahrens
|
4d311f44cd
|
Code review feedback.
|
2013-06-01 18:46:09 -04:00 |
|
Peter Fogg
|
68581610a4
|
Allow single-click creation of course components that only have one template.
|
2013-05-31 16:22:51 -04:00 |
|
cahrens
|
486d085d1e
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-31 16:00:09 -04:00 |
|
cahrens
|
a82daf0710
|
Change to Backbone collection.
|
2013-05-31 15:59:53 -04:00 |
|
Peter Fogg
|
5434f2750e
|
Cleaning up code to fix pylint/pep8 errors.
|
2013-05-31 15:58:12 -04:00 |
|
Peter Fogg
|
56ed47b37f
|
Allow single-click video creation.
|
2013-05-31 12:52:53 -04:00 |
|
marco
|
290d049c29
|
Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui
|
2013-05-31 12:41:13 -04:00 |
|
marco
|
72e1fab1c4
|
SASS variable and naming standards sync-up based on @talbs feedback completed
|
2013-05-31 12:40:40 -04:00 |
|
Peter Fogg
|
7a16938ad2
|
Remove unnecessary suppression.
|
2013-05-31 11:58:05 -04:00 |
|
cahrens
|
57f8bbf69d
|
Updates to Selenium test based on feedback.
|
2013-05-31 11:26:31 -04:00 |
|
Chris Dodge
|
7efcd98135
|
fix up styles in header for this particular use case
|
2013-05-31 11:25:28 -04:00 |
|
Peter Fogg
|
782cb05410
|
Add passing Lettuce testing for video autoplay in LMS.
|
2013-05-31 11:22:45 -04:00 |
|
Chris Dodge
|
62bacea371
|
use the right link to the login page in a particular use case: clicking activation email when not logged in
|
2013-05-31 11:10:14 -04:00 |
|
cahrens
|
e6dfa8e81c
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-31 09:46:17 -04:00 |
|
Valera Rozuvan
|
37cffd0835
|
Added videoalpha to advanced components in component.py file.
|
2013-05-31 13:48:17 +03:00 |
|
David Baumgold
|
4f1e6c484e
|
Put the advanced settings notifications back in
|
2013-05-30 15:08:40 -04:00 |
|
Peter Fogg
|
1ead857792
|
Working on Lettuce tests for video in LMS.
In progress, committing for the great git history rewrite.
|
2013-05-30 15:01:23 -04:00 |
|
cahrens
|
6c06599d75
|
Prepare for Peter's change.
|
2013-05-30 14:30:28 -04:00 |
|
cahrens
|
46cf5e3338
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-30 14:13:14 -04:00 |
|
cahrens
|
8fd15ce45d
|
Review feedback.
|
2013-05-30 14:13:10 -04:00 |
|
Jay Zoldak
|
86afe7279b
|
Refactor user factory usage for lettuce tests. Fix merge conflict.
|
2013-05-30 13:48:07 -04:00 |
|
cahrens
|
c0c5e920a3
|
Go back to setFixtures.
|
2013-05-30 12:56:55 -04:00 |
|
Jay Zoldak
|
2f504ec4bf
|
fix merge conflict
|
2013-05-30 12:42:50 -04:00 |
|
Jay Zoldak
|
a1b62912f3
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-30 12:33:15 -04:00 |
|
Jay Zoldak
|
4a64c0c9b6
|
Merge in from origin/feature/christina/metadata-ui
|
2013-05-30 12:33:02 -04:00 |
|
cahrens
|
14eb9c9a3b
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-30 12:27:03 -04:00 |
|
Jay Zoldak
|
6627ca5635
|
Tidy up the new lettuce tests for metadata editing a bit.
|
2013-05-30 12:26:18 -04:00 |
|
cahrens
|
5d41e2a952
|
Updates from code review.
|
2013-05-30 12:26:01 -04:00 |
|
Peter Fogg
|
6eeb12ad1c
|
Add Lettuce tests for autoplay in Studio.
|
2013-05-30 11:34:15 -04:00 |
|
Peter Fogg
|
5465bda5f3
|
Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div.
|
2013-05-29 17:00:25 -04:00 |
|
cahrens
|
f0260757c5
|
Cleanup.
|
2013-05-29 16:50:22 -04:00 |
|
cahrens
|
551a1c1516
|
pep8 and documentation cleanup.
|
2013-05-29 15:47:46 -04:00 |
|
cahrens
|
4920f08d2a
|
i18n
|
2013-05-29 15:15:31 -04:00 |
|
cahrens
|
7d07309f9d
|
Don't call setFixtures. Can stomp on other tests.
|
2013-05-29 14:03:16 -04:00 |
|
cahrens
|
24707f8f85
|
Jasmine test for views.
|
2013-05-29 12:09:42 -04:00 |
|
cahrens
|
625c6b518c
|
Cleanup, change how we load templates.
|
2013-05-28 14:07:35 -04:00 |
|
cahrens
|
aca5cbb215
|
Merge branch 'master' into bug/christina/preview_url
|
2013-05-28 12:13:19 -04:00 |
|