Chris Dodge
6fb97d52c0
fix typos
2013-06-05 11:21:35 -04:00
Chris Dodge
4bade8d286
allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox)
2013-06-05 10:30:28 -04:00
JonahStanley
bbd34235b8
Made finding place to click a bit nicer
2013-06-04 16:40:18 -04:00
JonahStanley
7f2fa8ff3a
Fixed issue with code mirror editing
...
It turns out that code mirror things can be edited. Once the div is clicked, a new text area appears that can be obtained and sent keys
2013-06-04 16:33:54 -04:00
Peter Fogg
90a1a8cb72
Merge pull request #63 from edx/peter-fogg/single-click-video-creation
...
Unbreak acceptance tests in the cms.
2013-06-04 13:10:39 -07:00
Peter Fogg
2b6a449b2a
Unbreak acceptance tests in the cms.
2013-06-04 15:48:20 -04:00
Peter Fogg
779f86c440
Merge pull request #46 from edx/peter-fogg/single-click-video-creation
...
Peter fogg/single click video creation
2013-06-04 11:08:40 -07:00
Peter Fogg
70736c1da8
Remove tabs from unit.html for the third time.
2013-06-04 13:23:09 -04:00
Peter Fogg
e982d7fcdc
Refactor test_contenstore to remove code duplication.
2013-06-04 13:22:08 -04:00
Christina Roberts
2cfea12dfe
Merge pull request #51 from edx/bug/christina/about_page_url
...
Fix bug STUD-103. The url base for about page links needs to be www.edx....
2013-06-04 10:02:57 -07:00
Brian Talbot
3bcbc9f979
studio - replaces iconography for advanced component button within the unit view
2013-06-04 11:26:16 -04:00
Peter Fogg
266938a7b3
Finish the comment I forgot about...
2013-06-03 16:55:28 -04:00
Peter Fogg
90bbff8965
Add test to be sure that advanced components require multiple clicks.
2013-06-03 16:53:14 -04:00
Peter Fogg
bf88e5ce6a
Be more explicit about template location.
2013-06-03 15:48:07 -04:00
Peter Fogg
8a67454f98
Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention.
2013-06-03 15:36:55 -04:00
cahrens
38e3ff13ed
pep8 cleanup.
2013-06-03 15:32:42 -04:00
cahrens
93be67d49a
Fix bug STUD-103. The url base for about page links needs to be www.edx.org for Drupal site, vs. LMS_BASE which is used for Studio. Note that the complete URL is still not correct, but a redirect exists to take it to the new location.
2013-06-03 15:21:02 -04:00
Peter Fogg
d3ec1cb915
Add tests for single-click discussion creation.
2013-06-03 14:57:34 -04:00
Peter Fogg
eff78bfd86
Add doc for click_component_from_menu and make sure css is present in any case.
2013-06-03 14:39:02 -04:00
Peter Fogg
ff0c56b7fb
Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method.
2013-06-03 14:21:50 -04:00
Jonah Stanley
cdadcba9da
Merge pull request #10 from edx/jonahstanley/add-more-tests
...
Jonahstanley/add more tests
2013-06-03 10:25:53 -07:00
Nate Hardison
1001b315a3
Preprocess assets as Django management command
...
Rather than directly invoke command-line Python (and Mako) from the
assets Rakefile, or call an external Python script, use a Django
management command to preprocess all asset template files.
An "asset template file" is defined as a static asset file with a
file extension indicating that it needs to be run through a template
engine prior to Sass/CoffeeScript compilation or packaging with other
assets. The preprocess_assets management command will look through
all of the files listed in the `STATICFILES_DIRS`, preprocessing each
as needed. Preprocessing strips off the special template file
extension, creating a new file in the process.
Currently, the only variable accessible in an asset template file is
the `THEME_NAME`, defined in the settings.
2013-06-03 09:58:01 -07:00
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
JonahStanley
a17c487f16
Merged from Master
2013-06-03 09:46:19 -04:00
JonahStanley
8cc93cb5d8
Merge branch 'master' into jonahstanley/add-more-tests
2013-06-03 09:37:25 -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
