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

1435 Commits

Author SHA1 Message Date
chrisndodge
0191ae9417 Merge pull request #652 from edx/feature/ichuang/import-with-no-static 
Enable mongodb to be used as back-end for git-based authoring workflow
 2013-08-22 11:05:02 -07:00
chrisndodge
1e9621cf4f Merge pull request #763 from edx/fix/cdodge/strip-transient-draft-serialization-attributes 
fix some gaps which would allow the temporary xml attributes 'parent_seq...
 2013-08-22 11:00:55 -07:00
Chris Dodge
bd412182c7 verticals shouldn't have 'data' 2013-08-22 12:01:17 -04:00
chrisndodge
2699ba65ba Merge pull request #756 from edx/fix/cdodge/incorrect-html-serialization 
Fix/cdodge/incorrect html serialization
 2013-08-22 08:58:56 -07:00
JonahStanley
d96595318a Stylistic changes 
CMS tests should now run on IE

CMS tests will now run on Safari

Rebased wrong

Forgot to update the test_acceptance.sh

Changed way of string splitting
 2013-08-22 10:08:35 -04:00
Chris Dodge
0c1c3f11af loop in static import testing into common/* tests 2013-08-21 20:48:56 -04:00
Chris Dodge
fb3a5bf9db remove unused class 2013-08-21 20:10:36 -04:00
Chris Dodge
ef98c54f5b fix some pylint violations 2013-08-21 20:06:10 -04:00
Chris Dodge
2ba0d40d7b fix pep8 violations 2013-08-21 20:02:58 -04:00
JonahStanley
b2480b5f00 Changed way feature flags are interpreted 
Configurations must be defined before hand

Reduced pylint violations

We only support 4 browsers
 2013-08-21 16:05:53 -04:00
JonahStanley
21f75ff250 Various stylistic and pylint fixes / changes 
Version numbers have very different ranges for different browsers so not having a dictionary of those.

Fixed a whitespace issue

Fixed pylint/pep8 violations

Don't need django_url

Spacing issues

Changed how commenting works

Forgot one

Used wrong name

Changed around importing

Remove django_url

Fixed function orderingn

Made logic nicer for getting a new browser

Modifying tests to run in opera

Needed to increase time to account for slow sauce loading

Now safari LMS works

Forgot an assert statement

Skipping a few tests for opera
 2013-08-21 16:05:52 -04:00
JonahStanley
58bb6e1ea3 Changed tags to be lowercase to prevent preprocessing 
Changed to have a default for device since it isn't always needed

Tags are more clear

Fixed stylistic issues
 2013-08-21 16:05:02 -04:00
JonahStanley
3746c654d8 Added a tag for things that will not work on Firefox 
Added tags for tests that will not work on Sauce

Changed build name

Tightened up logic

Conflicts:
	common/djangoapps/terrain/browser.py

Added flag for session name
 2013-08-21 16:05:01 -04:00
JonahStanley
876651009e Logging out no longer uses cookies. 
Removed other cookie reference
 2013-08-21 16:05:00 -04:00
Peter Fogg
7fc8fcde7b Merge pull request #752 from edx/peter-fogg/unlimited-graceperiod 
Allow grace periods of > 24 hours.
 2013-08-21 13:00:15 -07:00
Jonah Stanley
0138c08288 Merge pull request #758 from edx/jonahstanley/fix-courseteam-test 
Made the lambda statement more resistant to errors
 2013-08-21 12:47:35 -07:00
JonahStanley
af028efd00 Made the lambda statement more resistant to errors 
Made the statement better

pylint fix

Accidently left off parameter

Removed logout
 2013-08-21 15:01:33 -04:00
Chris Dodge
21f4b05813 fix some gaps which would allow the temporary xml attributes 'parent_sequential_url' and 'index_in_children_list' to get persisted in the database, whereas they are meant to be only scoped during export/import 2013-08-21 14:46:38 -04:00
Peter Fogg
eb5b6cc6ea Allow grace periods of > 24 hours. 2013-08-21 14:37:12 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload 
WIP: Peter fogg/course image upload
 2013-08-21 11:17:12 -07:00
ichuang
42af561a17 pep8 and pylint for tests of nostatic import 2013-08-21 11:23:00 -04:00
Peter Fogg
9632f4fed8 Address PR comments: 
- Internationalize upload errors.
- Move upload tests into their own files.
- Refactor upload dialog acceptance tests.
 2013-08-21 09:42:00 -04:00
Peter Fogg
e4302e62d2 Allow course image uploads in the settings page. 
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
 2013-08-21 09:42:00 -04:00
ichuang
8a84e6790b clean up test_import_nostatic.py 2013-08-20 23:44:33 -04:00
ichuang
0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-08-20 23:40:09 -04:00
ichuang
95952bd693 add tests of static_asset_path and importing with no static; 
fix (again) static_replace to work with static_asset_path
 2013-08-20 23:30:26 -04:00
Chris Dodge
d523167bdd add another piece of test data. just an img tag. 2013-08-20 23:16:39 -04:00
Chris Dodge
5a7bcd7bb3 always serialize out HTML content to a separate .html file 2013-08-20 22:43:53 -04:00
Chris Dodge
5989bf6bdc update the PDF textbook url paths as well as update wiki_slug when importing 2013-08-20 21:50:28 -04:00
Peter Fogg
533e0da101 Add acceptance test for noneditable failing grade range. 2013-08-20 13:34:41 -04:00
ichuang
2249692f9a pylint 2013-08-19 10:19:14 -04:00
ichuang
220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
 2013-08-19 08:24:35 -04:00
Anton Stupak
a921e44aa3 Fix steps. 2013-08-19 10:39:52 +03:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore 
Feature/cdodge/add a mixed modulestore
 2013-08-17 07:32:51 -07:00
Chris Dodge
bd71a2ceb3 add unit test for video_caption asset path 2013-08-16 15:24:43 -04:00
Don Mitchell
7f126f13e9 Merge pull request #624 from edx/dhm/flatten_kvs 
xblock fields persist w/o breaking by scope
 2013-08-16 12:18:02 -07:00
Jay Zoldak
e91205aff3 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/video_module.py
 2013-08-16 14:25:03 -04:00
Don Mitchell
4c28684014 pass xblock fields as top-level keywords on factories 2013-08-16 14:01:16 -04:00
Don Mitchell
438bbffb93 Add field iterator which includes namespaced fields 
And fix get_explicitly_set to use it and to get the json not native
field values.
 2013-08-16 10:42:53 -04:00
Don Mitchell
929597ce84 Move load_from_json to the test file only 
It's a reasonable demo of in memory xblock creation, but doesn't fit
the xblock pattern. Moving temporarily to keep the dag persistence test.
 2013-08-16 10:42:53 -04:00
Don Mitchell
e4a69373d0 xblock fields persist w/o breaking by scope 
Letting xblocks handle scope rather than separating fields into
different attrs. Although, split still shunts content fields to a
different collection than setting and children fields.

The big difference is that content fields will always be a dict and not
sometimes just a string and there's no special casing of 'data' attr.

The other mind change is no more 'metadata' dict.
 2013-08-16 10:42:52 -04:00
Peter Fogg
346fb7b4fa Merge pull request #698 from edx/peter-fogg/grading-cutoffs-fix 
Fix grade range names not being editable.
 2013-08-15 20:06:54 -07:00
Chris Dodge
ed584a9abb fix pep8 violations 2013-08-15 22:58:04 -04:00
Chris Dodge
61219169d4 change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration 2013-08-15 22:58:04 -04:00
Chris Dodge
e4eea6cc4f some additional comments to clarify the partially bogus course_id. 2013-08-15 22:58:03 -04:00
Chris Dodge
5298f54f4c fix tests 2013-08-15 22:58:02 -04:00
Chris Dodge
cff93d324b WIP 2013-08-15 22:58:02 -04:00
jkarni
a260115b01 Merge pull request #685 from edx/jkarni/fix/cms_pylint 
Contentstore views pylint fixes
 2013-08-15 16:05:09 -07:00
Peter Fogg
a93d7229ac Fix grade range names not being editable. 2013-08-15 16:30:14 -04:00
Chris Dodge
958597ac71 was getting unicode errors when exporting CB22x 2013-08-15 16:10:02 -04:00