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

4005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Fiedler
ccc1f1dfd5 Removed padding and added line-height for the tutorials 2012-08-08 16:27:48 -04:00
Kyle Fiedler
23e52f02c3 Fix odd movement on hover for the next button on hover 2012-08-08 16:27:48 -04:00
Kyle Fiedler
643617599a Made sequnce nav black and white 2012-08-08 16:27:47 -04:00
Kyle Fiedler
17d072711b Make the sidebar links more standard, and remove some of their styling 2012-08-08 16:27:47 -04:00
Calen Pennington
6abc2d733f Merge pull request #370 from MITx/feature/bridger/django1.4 
Feature/bridger/django1.4
 2012-08-08 12:52:33 -07:00
Bridger Maxwell
9df10c5808 Updated sumbodule to compatible version of askbot. 2012-08-08 15:37:54 -04:00
David Ormsbee
d5dd59bcbb Merge pull request #369 from MITx/feature/halogenandtoast/table_of_contents 
Feature/halogenandtoast/table of contents
 2012-08-08 11:45:52 -07:00
Matthew Mongeau
bcdcd7341f include courseware js 2012-08-08 14:13:34 -04:00
Matthew Mongeau
0b03834f51 XML based table of contents for books. 2012-08-08 14:13:20 -04:00
Bridger Maxwell
7ae0005afd Fixed CMS setting for 1.4 transition. 2012-08-08 13:30:43 -04:00
Bridger Maxwell
14a35b9605 Upgrading to django 1.4. 2012-08-08 11:57:15 -04:00
Calen Pennington
80b8529f2f Merge branch 'hotfix/1.0.4' 
Conflicts:
	common/djangoapps/util/middleware.py
 2012-08-08 11:05:26 -04:00
Calen Pennington
ebd0458d6d Merge pull request #363 from MITx/feature/ichuang/improved-staff-debug-jquery 
improve staff_problem_info jquery, so the histogram is also toggled
 2012-08-08 05:57:51 -07:00
ichuang
9241841195 improve staff_problem_info jquery, so the histogram is also toggled 2012-08-07 18:36:04 -04:00
ichuang
165ffe0a4d Merge pull request #362 from MITx/ichuang/minor-disable-django-debug-dev-ike 
disable diajgo debug toolbar on mit server (dev_ike.py)
 2012-08-07 12:32:52 -07:00
ichuang
8bbf433479 disable diajgo debug toolbar on mit server (dev_ike.py) 2012-08-07 15:10:00 -04:00
Calen Pennington
d558e3a43f Merge pull request #361 from MITx/feature/disable_staff_course_check_in_dev 
Feature/disable staff course check in dev
 2012-08-07 12:05:08 -07:00
David Ormsbee
f4138cae70 re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use ACCESS_REQUIRE_STAFF_FOR_COURSE 2012-08-07 15:01:12 -04:00
David Ormsbee
fbd813ae3b disable ENABLE_LMS_MIGRATION in dev mode, so courses are always displayed 2012-08-07 14:55:59 -04:00
Calen Pennington
a237322b70 Merge pull request #359 from MITx/ichuang/minor-fix-edit-link 
change edit link showhide to use <a> instead of <input> type submit
 2012-08-07 11:40:31 -07:00
ichuang
9d2b821c26 change edit link showhide to use <a> instead of <input> type submit 
(fixes issues with edit links in multipart problems and video)
 2012-08-07 14:34:28 -04:00
Calen Pennington
9cba2232d5 Run all tests all the way through before quitting on errors 2012-08-07 13:32:58 -04:00
thomasxiii
258b9eb530 Merge pull request #349 from MITx/feature/kfiedler/courseware-style 
A bunch of various fixes and de-styling
 2012-08-07 10:20:10 -07:00
Calen Pennington
96252aea80 Merge pull request #358 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-07 09:01:41 -07:00
Kyle Fiedler
dd6ec19e80 Make the modal window work in the courseware 2012-08-07 11:59:49 -04:00
kimth
05646fbed7 Provide default xqueue in ModuleSystem 2012-08-07 11:54:09 -04:00
kimth
a9a19f40c3 Merge master 2012-08-07 11:51:44 -04:00
ichuang
c79da58175 add documentation on rake + unit tests 2012-08-07 11:48:01 -04:00
kimth
b6dc622e42 Remove temporary datetime 2012-08-07 11:43:00 -04:00
kimth
c39edb650b StudentModule lookups in queue callback use target user, rather than request.user 2012-08-07 11:38:04 -04:00
kimth
501f2ccf14 CodeResponse uses 'is_file' helper function 2012-08-07 11:30:21 -04:00
kimth
f6202e5631 Tests provide xqueue params, rather than ModuleSystem.__init__ 2012-08-07 11:16:48 -04:00
Calen Pennington
e847bae267 Merge pull request #344 from MITx/feature/victor/file-per-descriptor 
Feature/victor/file per descriptor
 2012-08-07 08:09:59 -07:00
Victor Shnayder
b4e400ba56 Make tests pass again again 
* Move lazyproperty decorator into xmodule so it's accessible during tests
* add default xqueue to test system
 2012-08-07 11:08:56 -04:00
Victor Shnayder
932a9be747 Make tests pass again 
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
 2012-08-07 11:06:47 -04:00
Victor Shnayder
55edb1ef32 always export metadata in alphabetical order 2012-08-07 11:06:47 -04:00
Victor Shnayder
47b9441af5 a few pep8 cleanups 2012-08-07 11:06:47 -04:00
Victor Shnayder
5523c2883e Generate error module url_names using sha1 
* means we get the same url_name on each import of the same data.
 2012-08-07 11:06:47 -04:00
Victor Shnayder
ecf432ad78 Make the simple course pass roundtrip test: 
- add 'type' and 'points' to capa_module metadata
- replace old 'title' tag with display_name
 2012-08-07 11:06:47 -04:00
Victor Shnayder
79e0bc25f8 Make url_names on error descriptors unique 2012-08-07 11:06:47 -04:00
Victor Shnayder
e6e290f525 Make initial import-export tests pass. 
TODO:
* need unique slugs for errors so they don't overwrite each other on export.
  - try to preserve origin slug.  If not possible, generate random one.

* figure out what metadata to strip.  e.g.
 ({'data': '<problem><p><h1>Finger Exercise 1...'},
    {'data': '<problem points="1" type="lecture"><p><h1>Finger Exercise 1...'},
    False)
  - where did points and type come from?  Do we want them there?


* separate broken and non-broken test courses
 2012-08-07 11:06:47 -04:00
Victor Shnayder
b091dcabe0 metadata and file format cleanups 
* course.xml is special--has org and course attributes in addition to url_name
* strip data_dir from metadata on export
* more asserts
* work on roundtrip import-export test
 2012-08-07 11:06:47 -04:00
Victor Shnayder
6ed9052755 minor cleanups 2012-08-07 11:06:46 -04:00
Victor Shnayder
b285f50d92 Make unknown metadata persist accross import-export 
* +improve test.
 2012-08-07 11:06:46 -04:00
Victor Shnayder
d09e2261f3 New file structure--everything in own file 
* needed for CMS performance (can now save just an item, not whole tree)
* remove split_to_file methods
* simplified AttrMap logic
* write each descriptor to a separate file
* detect format on import and adjust appropriately.
* update tests
 2012-08-07 11:06:46 -04:00
ichuang
ca177570fa Merge pull request #356 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-07 07:56:23 -07:00
ichuang
4c25baee43 Merge pull request #355 from MITx/arjun/choicegroup_text 
Removing the <text> wrapper around choice text for radiogroup and checkboxgroup
 2012-08-07 07:55:01 -07:00
ichuang
462d75936a Merge pull request #357 from MITx/hotfix-registration 
fix typo in registration button jquery
 2012-08-07 07:11:53 -07:00
ichuang
4b2091b173 fix typo in registration button jquery 2012-08-07 10:09:55 -04:00
kimth
cb2fbfa54c Added test for answers file-to-filename conversion 2012-08-07 09:38:36 -04:00