Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,667 Commits 1 Branch 0 Tags
90a9c386eb67d4201d769544628eff3e28362d2d
Commit Graph

825 Commits

Author SHA1 Message Date
David Baumgold
8e384a73be Remove proof-of-concept page 2013-05-22 15:55:51 -04:00
Arthur Barrett
cf502e2349 Fix advanced modules list. 2013-05-21 17:49:20 -04:00
Christina Roberts
f4044ed1e8 Merge pull request #2061 from edx/bug/christina/static-pages 
Make sure to get the correct modulestore on delete (static tabs do not e...
 2013-05-17 09:59:59 -07:00
cahrens
944d2d61f1 Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore). 
#324
 2013-05-16 17:15:53 -04:00
Arthur Barrett
1fbe43a650 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-16 13:23:12 -04:00
Arthur Barrett
430e009b5d added TODO for open ended and notes tab advanced policy settings. 2013-05-16 13:22:40 -04:00
Will Daly
1e1e6450df Pep8 fixes 2013-05-16 11:33:50 -04:00
Will Daly
342b3bb0e9 Merge branch 'master' into feature/will/ci-lettuce-tests 
Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile
 2013-05-16 11:21:59 -04:00
Will Daly
59f68c2179 Added comments for skipped tests 2013-05-15 15:45:12 -04:00
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Chris Dodge
6cec66979a fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test 2013-05-15 11:16:47 -04:00
Arthur Barrett
3a178bab1f Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-15 11:12:42 -04:00
Will Daly
3217989de5 Fixed/skipped CMS tests in subsection and signup. 2013-05-15 10:14:37 -04:00
Will Daly
8e069c1faa Skip tests that break on Ubuntu due to alerts (which will be removed 
soon anyway).  Removed @skip-phantom and @skip-firefox tags

Fixed sign up test to work in Ubuntu

Added comments
 2013-05-15 09:39:07 -04:00
Jay Zoldak
5d783d33ad Update lettuce test for new css changes. 2013-05-14 17:16:51 -04:00
Arthur Barrett
5e39971fcc merge master. resolved conflicts in component.py and course.py. 2013-05-14 10:54:21 -04:00
Calen Pennington
bd6bb8e9c1 Fix advanced modules list 2013-05-14 09:39:25 -04:00
Arthur Barrett
bea943d537 merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules. 2013-05-13 16:26:28 -04:00
Steve Strassmann
7b71271bc1 prefix unused vars with _ 2013-05-13 15:21:29 -04:00
Steve Strassmann
10b7622018 declare exports from course, component 2013-05-13 15:06:52 -04:00
Arthur Barrett
55942b8a0b fix brokn tab test 2013-05-13 14:57:36 -04:00
Steve Strassmann
b3cc9a1174 pep8 cleanups 2013-05-13 14:55:41 -04:00
Arthur Barrett
8f07072d3d added unit tests to add/remove course tab utility functions. 2013-05-13 14:44:56 -04:00
Arthur Barrett
8cddec41bf updated comments about adding/removing tab types for advanced modules 2013-05-13 13:55:59 -04:00
Steve Strassmann
96c37089dc whitespace for pep8 2013-05-13 13:47:51 -04:00
Arthur Barrett
be98b5fa3e merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list) 2013-05-13 13:26:55 -04:00
Steve Strassmann
cdc2de7e65 Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views 
pull from master
 2013-05-13 13:22:39 -04:00
Steve Strassmann
8bb6ad3689 relative imports 2013-05-13 11:31:56 -04:00
Chris Dodge
4d197e10ec fix some violations. Build up karma 2013-05-13 11:10:11 -04:00
Steve Strassmann
e03585d85c pylint: refactor imports 2013-05-13 11:07:08 -04:00
Chris Dodge
d32e7a5b61 Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-13 11:06:49 -04:00
Chris Dodge
3cf865a88f added another unit test check point for export/import of classic textbooks 2013-05-13 10:16:18 -04:00
Steve Strassmann
b288a8e3bd fix export from tabs.__all__ 2013-05-13 10:03:20 -04:00
Steve Strassmann
979e3be174 fix pep8: imports and blank lines 2013-05-13 09:58:30 -04:00
Alexander Kryklia
bdc62e7d2e word cloud studio integration 2013-05-13 14:44:09 +03:00
Arthur Barrett
beabdf1434 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-11 14:52:39 -04:00
Steve Strassmann
c071ee448f pep8 compliance 2013-05-10 16:51:26 -04:00
Steve Strassmann
571a9af0c0 declared exports 2013-05-10 16:37:28 -04:00
Chris Dodge
1db66957af Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-10 15:44:55 -04:00
Steve Strassmann
70cca0540d reorder imports for pep8 2013-05-10 15:23:28 -04:00
Steve Strassmann
01d4fbeb7c reorder imports 2013-05-10 14:14:36 -04:00
Steve Strassmann
8c8377f1df Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views 
pull master
 2013-05-10 13:59:07 -04:00
Steve Strassmann
9350a2c067 refactoring views 2013-05-10 13:56:30 -04:00
Chris Dodge
1b0eff52ed create test cases to simulate error exporting/importing textbooks 2013-05-10 10:01:10 -04:00
Steve Strassmann
0bea50ede1 start refactoring views.py 2013-05-09 16:24:21 -04:00
Calen Pennington
ea859bd6c7 Filter out the template course from the mongo modulestore get_courses function 2013-05-09 16:22:23 -04:00
Arthur Barrett
eca155f99a Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-07 17:27:40 -04:00
Arthur Barrett
0ed07779c8 kludged in the note tab panel so it can be turned on and off using the policy editor by adding "notes" to "advanced_modules." 2013-05-07 17:27:06 -04:00
cahrens
e0ebe6dacb Remove TODO. 2013-05-02 13:53:17 -04:00
cahrens
01ede40b03 Switching branches 2013-05-02 09:43:03 -04:00