Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,877 Commits 1 Branch 0 Tags
97df5aa997381c8996293f8a812f0d5fc924a3d0
Commit Graph

16877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Chris Dodge
596fed78f1 add docstrings 2013-08-20 22:45:37 -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
jkarni
e79f8c437a Merge pull request #665 from edx/feature/msteele/remove-log_event 
Remove js log_event (keep compatibility)
 2013-08-20 14:09:59 -07:00
Miles Steele
cb7a3ad8eb switch from log_event to Logger.log 
keep log_event for compatibility
 2013-08-20 16:52:18 -04:00
Peter Baratta
5692867b14 Merge pull request #750 from edx/peterb/numerical/add-docs 
Add docs for changes in #726
 2013-08-20 13:22:43 -07:00
Peter Fogg
9065023132 Merge pull request #749 from edx/peter-fogg/fix-rename-fail-grade 
Fix failing grade label being editable but not saved.
 2013-08-20 12:53:27 -07:00
Carlos Andrés Rocha
a35a2fd389 Merge branch 'release' 2013-08-20 14:55:20 -04:00
Peter Baratta
ab2570a7bd Add docs for changes in #726 2013-08-20 14:04:38 -04:00
Peter Fogg
533e0da101 Add acceptance test for noneditable failing grade range. 2013-08-20 13:34:41 -04:00
Peter Fogg
38165efd18 Fix failing grade label being editable but not saved. 2013-08-20 12:42:36 -04:00
jkarni
6c5d3e66c9 Merge pull request #731 from edx/jkarni/feature/docchanges 
Incorporate Anant's suggestions
 2013-08-20 07:00:05 -07:00
Peter Baratta
8211600bde Merge pull request #726 from edx/peterb/numerical/evaluate-staff 
Use calc's evaluator for staff answers in `Numercial` type
 2013-08-20 06:53:27 -07:00
Brian Talbot
f14e93029e Merge pull request #748 from edx/talbs/lms-fix-resetbutton 
Sync up Reset Action Button Styling for Capa xmodules
 2013-08-20 06:43:40 -07:00
Brian Talbot
fb7fe13061 adds in the .reset type of action to the x module capa styling 2013-08-20 09:21:04 -04:00
Christina Roberts
1a8b2fa0eb Merge pull request #735 from edx/fix/cdodge/pylint-violations 
address some pylint violations in the mixedmodulestore build report
 2013-08-20 05:42:55 -07:00
Christina Roberts
05712da6e9 Merge pull request #744 from edx/dhm/pep_pylint_cleanups 
Add doc strings and fix spaces
 2013-08-20 05:28:21 -07:00
chrisndodge
4129c1cffd Merge pull request #636 from edx/fix/cdodge/dont-process-osx-hidden-files-on-imports 
on import, when enumerating through the 'draft content', OSX environment...
 2013-08-19 21:42:19 -07:00
Chris Dodge
e576c7be15 pylint error fix 2013-08-20 00:40:20 -04:00
chrisndodge
c33571ff98 Merge pull request #732 from edx/fix/cdodge/get_items_needs_courseid 
Fix/cdodge/get items needs courseid
 2013-08-19 21:26:12 -07:00