Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,421 Commits 1 Branch 0 Tags
7102c23d6d6dd768614bbbb11b2c729a2af3a7bb
Commit Graph

1540 Commits

Author SHA1 Message Date
Brian Talbot
22a56fddb4 edx.org - adding in an intermediate disabled state for login/register submit buttons when the form is first processed 2013-04-10 13:38:25 -04:00
John Jarvis
2c0b2e4d27 Merge branch 'master' into drupal-new 2013-04-09 13:27:13 -04:00
Brian Talbot
78079d1ca7 Merge branch 'master' into drupal-new 2013-04-08 22:35:29 -04:00
Brian Talbot
d8368447fd edx.org - adjusted input height and padding to handle previously uneditable fieldsin firefox 2013-04-08 22:35:06 -04:00
Brian Talbot
13b741750a edx.org - basic styling of password reset form 2013-04-08 22:16:32 -04:00
Calen Pennington
8288202008 Marketing request: Lighthouse [#338, fixed] 2013-04-08 14:42:15 -04:00
Greg Price
ffc1259496 Apply text and image changes reqeusted by UTAustinX 
Lighthouse LMS tickets:
[#307 state:resolved]
[#310 state:resolved]
[#319 state:resolved]
[#322 state:resolved]
 2013-04-04 13:52:33 -04:00
John Jarvis
ea6174af28 fixing image resolution for the stanford-university image 2013-04-04 11:40:44 -04:00
John Jarvis
d2313d851a renaming image 2013-04-03 16:02:41 -04:00
John Jarvis
b2e8780f9b adding a smaller stanford image 2013-04-03 16:01:15 -04:00
John Jarvis
e8ee6616c4 removing old logo 2013-04-03 15:39:46 -04:00
John Jarvis
6d78425a82 dding stanford-univ logo 2013-04-03 15:39:22 -04:00
John Jarvis
7b226c34f8 Adding new logo for stanford 2013-04-03 15:34:54 -04:00
Brian Talbot
f501000825 edx.org - hiding the login nav element when on the login view 2013-04-03 09:46:36 -04:00
Carlos Andrés Rocha
a15baa97c5 Add UTAustinX landing page 2013-03-28 13:23:58 -04:00
Brian Talbot
f5aaf309e8 edx.org - added in visual spacing for confirmed state of password recovery modal 2013-03-25 15:16:50 -04:00
Brian Talbot
e716530692 edx.org - added necessary JS and Sass to disabled login/register button when form is submitting 2013-03-25 14:52:13 -04:00
Brian Talbot
dc1a7f5d6a edx.org - changed status message UI to be hidden by default (rather than with JS) for the time being for page load/render's sake 2013-03-25 13:59:30 -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
Brian Talbot
fe59ca5b89 edx.org - replacing visual banners with updated marketing ones 2013-03-19 17:14:57 -04:00
John Jarvis
78987cc400 resolving merge conflicts 2013-03-19 16:16:32 -04:00
Brian Talbot
a455c6b1e4 edx.org - added in error state revisions and modal window tweaks 2013-03-19 13:57:14 -04:00
Brian Talbot
dc60d107e9 edx.org - added in new login and registration visual banners per marketing request 2013-03-19 09:53:52 -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
Brian Talbot
d23679ea4e edx.org redesign - revised temporary login/register views to fit with design requirements/fixes from marketing team's overall design changes to site's visual theme 2013-03-12 15:04:00 -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