Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
17,039 Commits 1 Branch 0 Tags
461b4da349c0d67bf5754bf318f1dd0411bbe21f
Commit Graph

17039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JonahStanley
682d85c2f3 Changed feature to being one dictionary 
Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:01 -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
97df5aa997 Added feature flag for device type. Needed for android tablets 2013-08-21 16:05:01 -04:00
JonahStanley
1d7284b7cd Refactored out more for feature flags 
Refactored more for feature flags
 2013-08-21 16:05:01 -04:00
JonahStanley
010fd5771d Pass/Fail status updated properly 
Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:00 -04:00
JonahStanley
28d9bbaff2 Change build name generation 
Browser Matrix Data only applies to latest build information
 2013-08-21 16:05:00 -04:00
JonahStanley
f4c19919cd Beginnings of a feature flag 
Conflicts:
	common/djangoapps/terrain/browser.py

Changed way feature flag was checked

Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:00 -04:00
JonahStanley
876651009e Logging out no longer uses cookies. 
Removed other cookie reference
 2013-08-21 16:05:00 -04:00
JonahStanley
eb7fe7c927 Added browser matrix (might not display yet) 
Added build information.  Status image will now display properly
 2013-08-21 16:05:00 -04:00
Jay Zoldak
81151ab67a Prototype for running acceptance tests via Sauce Labs Connector 
Added in more desired capabilities and fixed the browser creation

Sauce Labs is now updated if the test suite passes or fails
 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
chrisndodge
9dce9d1e23 Merge pull request #755 from edx/fix/cdodge/STUD-671 
update the PDF textbook url paths as well as update wiki_slug when impor...
 2013-08-21 10:54:51 -07:00
Diana Huang
deb55380d5 Merge pull request #760 from edx/diana/move-course-modes-to-common 
Move course modes to common and enable in Studio admin
 2013-08-21 10:12:26 -07:00
Kevin Chugh
2f4665375f Merge pull request #745 from edx/dave/block_forums_for_unenrolled 
Make it so that students who are not enrolled cannot see the forum
 2013-08-21 09:13:10 -07:00
Your Name
25d98778cc Merge branch 'master' into dave/block_forums_for_unenrolled 2013-08-21 12:00:06 -04:00
Your Name
541aa08471 update forum access to include check for valid date range 2013-08-21 11:59:39 -04:00
ichuang
42af561a17 pep8 and pylint for tests of nostatic import 2013-08-21 11:23:00 -04:00
Your Name
a36e3b1957 CourseEnrollment no longer needed in forum/views 2013-08-21 11:06:30 -04:00
Peter Fogg
32de5aa09f Fix up some SASS issues. 2013-08-21 11:03:40 -04:00
Chris Dodge
938b094679 disable the 'dont verify HTML modules' in test_export.py. This better traps the bug whereby XML-parseable HTML content was being dropped on export serialization 2013-08-21 10:32:54 -04:00
Diana Huang
70e1c70e4f Move course modes to common and enable in Studio 2013-08-21 09:59:15 -04:00
Your Name
b317d45ffb add missing imports 2013-08-21 09:49:09 -04:00
Peter Fogg
b539a4cb94 Update copy to include PNGs, add tests, remove default MIME type. 2013-08-21 09:42:01 -04:00
Peter Fogg
a601ede781 Update CHANGELOG. 2013-08-21 09:42:01 -04:00
Peter Fogg
f9aecb2778 Add support for PNGs as course images. 
Also change the file uploader to accept multiple file types.
 2013-08-21 09:42:00 -04:00
Brian Talbot
c626c773d8 Studio: revises styling/copy around course image management in settings 2013-08-21 09:42: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
Peter Fogg
ce1a13f32c Generalize file uploader. 
Previously the file upload dialog was PDF- and textbook-specific. The
changes are adding parameters to the FileUpload model for the file
type, and adding an onSuccess callback to the UploadDialog view. Also
moved upload-specific SASS into its own file.
 2013-08-21 09:42:00 -04:00
ichuang
9b26e5bc78 dummy commit - trigger jenkins rebuild 2013-08-21 07:14:16 -04:00
ichuang
d2e93f7f7b remove unncessary images from new test course 2013-08-20 23:46:15 -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
b8a8b202a4 update comments and some code violation drive by fixes 2013-08-20 22:53:03 -04:00
Chris Dodge
cf7b744fec add test files 2013-08-20 22:47:22 -04:00
Chris Dodge
596fed78f1 add docstrings 2013-08-20 22:45:37 -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
Kevin Chugh
08aafc58ea refactor to add access control to already_existing access control routines in access.py 2013-08-20 19:43:46 -04:00
Kevin Chugh
a2bbb65dcf refactor to add access control to already_existing access control routines in access.py 2013-08-20 19:42:03 -04:00
ichuang
91bf6ad86d remove extra debugging line from courses.py 2013-08-20 18:11:40 -04:00
ichuang
fedfa7cab7 fix tabs.py to properly handle static_asset_path 2013-08-20 18:09:57 -04:00
ichuang
2fe4895e43 more static_asset_path handling in courses.py 2013-08-20 18:09:27 -04:00