Carlos Andrés Rocha
a15baa97c5
Add UTAustinX landing page
2013-03-28 13:23:58 -04:00
marco
f8eacff683
styled textbook css to look closer to the discussion forum navigation
2013-03-22 11:04:44 -04:00
marco
9fdac385e1
Merge branch 'master' into ux/marco/textbook
2013-03-22 10:29:05 -04:00
marco
f45cc6fb35
changes to textbook styling
2013-03-20 21:30:05 -04:00
Carlos Andrés Rocha
c5385ff42c
Update Berkeley logos
...
LMS Lighthouse [#260 ]
2013-03-20 14:46:08 -04:00
Jay Zoldak
b6e82afb0e
Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests
...
Fix/will/fix broken jasmine lms tests
2013-03-18 11:53:22 -07:00
Calen Pennington
029d8c8085
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
2013-03-15 09:46:47 -04:00
Carlos Andrés Rocha
b4d83a5f44
Add 2.01x announcement to news feed
...
LMS Lighthouse [#259 ]
2013-03-14 06:49:07 -07:00
Kevin Chugh
8d766c4b51
fix conflict
2013-03-13 21:01:37 -04:00
Your Name
6ee14ec34a
candidate without inline
2013-03-13 18:51:40 -04:00
Your Name
8280c55992
pinning .1
2013-03-12 17:40:26 -04:00
Kevin Chugh
a2be6dd420
first cut of UI
2013-03-12 10:31:05 -04:00
Calen Pennington
2113541632
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
.ruby-version
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/models/settings/course_metadata.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/tests/factories.py
2013-03-12 07:23:28 -04:00
Will Daly
9d8c023acb
Removed calls to Navigation.bind() and Calculator.bind()
...
that were causing phantomjs interpreter to fail
with undefined method error.
2013-03-11 15:58:31 -04:00
David Ormsbee
0605c94113
Merge pull request #1636 from MITx/feature/brian/htmlbook
...
Initial implementation of htmlbook.
2013-03-11 11:38:46 -07:00
Brian Wilson
cd95872b52
htmlbook-specific styling to make Heroes text presentable.
2013-03-11 11:56:48 -04:00
Will Daly
a777a9e6e3
Updated broken tabs.js Jasmine tests.
2013-03-11 11:27:49 -04:00
Will Daly
618de5df25
Fixed import error for histogram.coffee
2013-03-11 11:27:49 -04:00
Will Daly
20b04c9bf2
Fixed broken calculator test in lms coffee scripts
2013-03-11 11:27:49 -04:00
Calen Pennington
95f8f811c5
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
2013-03-11 10:49:29 -04:00
Brian Wilson
fcb618f04e
fix basic alignment issue with html textbook display
2013-03-11 10:38:32 -04:00
David Ormsbee
a8ff7911f6
Update of Delft logo (lighthouse ticket #234 )
2013-03-11 10:21:03 -04:00
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
David Ormsbee
b0afbba58d
Merge pull request #1516 from MITx/hack/dave/submission_history
...
Record and report submission history for a problem
2013-03-04 11:39:54 -08:00
Victor Shnayder
9cde21b591
Update edX media kit (LH #221 )
2013-02-28 20:16:19 -05:00
David Ormsbee
51a863bd6b
Merge pull request #1557 from MITx/feature/brian/pdfchapter
...
Feature/brian/pdfchapter
2013-02-26 15:00:58 -08:00
Brian Wilson
310073ddef
use same images for prev/next as used in image-based textbooks
2013-02-26 16:43:48 -05:00
VikParuchuri
df01064e77
Merge pull request #1536 from MITx/diana/rubric-hot-keys
...
Add in rubric hotkeys
2013-02-26 06:46:26 -08:00
Your Name
9f58f6890d
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-25 09:31:28 -05:00
Diana Huang
f9667849b8
Fix some minor bugs in event handling and add enter key support
2013-02-22 09:47:50 -05:00
Diana Huang
3ecafa9b42
Add hot keys to rubrics
2013-02-22 09:47:50 -05:00
Your Name
ff68853990
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-21 13:30:24 -05:00
Diana Huang
3a8b7156a0
Merge branch 'master' into diana/click-tracking
2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0
Address code review feedback
...
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
2013-02-21 10:17:08 -05:00
Victor Shnayder
bf454382d0
Merge pull request #1525 from MITx/press/international
...
Press/international
2013-02-20 14:14:11 -08:00
Vik Paruchuri
d5ba5457dc
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-02-20 16:49:59 -05:00
Brian Talbot
d0fca477a8
edx.org - university pages' main banner images are now centered when window resizes
2013-02-20 16:12:36 -05:00
Diana Huang
13d4cfa4d4
Merge branch 'master' into diana/click-tracking
2013-02-20 11:40:14 -05:00
Victor Shnayder
2981f532c1
Integrate Brian T's front-page changes, add epfl and delft
...
- removed duplicate logos.
- cover images are still in the 200-350 KB range.
2013-02-19 22:04:20 -05:00
Victor Shnayder
105cbd3bfc
Merge remote-tracking branch 'origin/style/btalbot/homepage-newxunis' into press/international
2013-02-19 21:52:06 -05:00
Brian Talbot
1f247ceb0c
edX Homepage - revised layout (HTML/CSS) for new edX universities and created logo assets
2013-02-19 16:40:21 -05:00
Vik Paruchuri
72d069825d
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
...
Conflicts:
lms/templates/instructor/staff_grading.html
2013-02-19 15:21:09 -05:00
Victor Shnayder
45c80abecf
Add initial images for ANU, McGill, Rice, Toronto.
...
Still waiting on transparent logos.
2013-02-19 14:04:17 -05:00
Diana Huang
f4addddf42
Merge pull request #1484 from MITx/feature/vik/improve-oe-ui
...
Feature/vik/improve oe ui
2013-02-19 07:27:29 -08:00
Victor Shnayder
c37238d592
Initial landing pages for ANU, McGill, Rice, Toronto
2013-02-19 08:22:09 -05:00
Diana Huang
3e23b9e1f2
Merge pull request #1480 from MITx/diana/staff-grading-flagging
...
Flag submissions from staff grading view
2013-02-15 13:08:16 -08:00
Diana Huang
7b11843086
Merge branch 'master' into diana/click-tracking
2013-02-15 12:53:21 -05:00
Alexander Kryklia
059b9f66e3
poll and conditional finished
2013-02-15 18:48:39 +02:00
David Ormsbee
8f17e6ae9e
First pass at implementing problem history.
2013-02-15 01:30:14 -05:00
Victor Shnayder
4f8757600a
merge
2013-02-14 12:49:14 -05:00
