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

880 Commits

Author SHA1 Message Date
Brian Talbot
126c9f9f37 edx.org - further revision to iframe register button states: coming soon styling 2013-05-07 11:00:21 -04:00
Brian Talbot
3b84d77131 edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment 2013-05-07 10:25:41 -04:00
jarv
f18321cda2 Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration 
Update course registration flow for non-modal registration and login
 2013-05-06 10:31:29 -07:00
jarv
bf5ac6c263 Merge pull request #1950 from edx/jarv/drupal-new/iframe 
Jarv/drupal new/iframe
 2013-05-06 07:46:28 -07:00
Brian Talbot
7dd763212e edx.org - fixes to the iframe-based register button's styling 2013-05-03 11:55:14 -04:00
Greg Price
e5846e64bd Modify course registration flow for new login and registration pages 
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
 2013-05-03 10:01:11 -04:00
Diana Huang
45baf013fe Merge branch 'master' into drupal-new 2013-05-02 17:04:39 -04:00
Brian Talbot
7705941a65 edx.org - added in isolated register button styling/states for <iframe>-based registration fix 2013-05-02 11:54:16 -04:00
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo 
Fix/btalbot/studio courseinfo
 2013-04-30 13:34:52 -07:00
Brian Talbot
c28647be2d lms - cleared document flow for .teacher elements within a course's about view to coincide with Studio's default HTML for the course overview settings field 2013-04-29 14:47:57 -04:00
Calen Pennington
8dc0df3e6b Don't ignore the old directories for xmodule sass and coffeescript 2013-04-29 07:32:16 -04:00
Diana Huang
2df3fe9344 Revert "fix merge conflict" 
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
 2013-04-26 12:40:35 -04:00
Calen Pennington
9d94adbd1f Merge pull request #1871 from MITx/feature/cale/fast-dev-server 
Speed up local development
 2013-04-24 12:12:05 -07:00
Your Name
acfd0d9fd6 fix merge conflict 2013-04-23 10:30:51 -04:00
Calen Pennington
729daf5cbf Move xmodule asset gathering out of server startup 
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
 2013-04-18 15:19:19 -04:00
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
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
Kevin Chugh
2b2621e20c Merge branch 'master' into feature/kevin/pinning_inline 2013-04-08 17:19:19 -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
Kevin Chugh
5534d8bdce fix mega merge conflicts 2013-03-29 07:33:52 -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
7ecf0e5bc1 small positioning adjustments to inline pins; 2013-03-21 14:27:10 -04:00
marco
f45cc6fb35 changes to textbook styling 2013-03-20 21:30:05 -04:00
Your Name
32f75bfe9e added pinning UI to inline 2013-03-20 11:58:47 -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
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
Kevin Chugh
8d766c4b51 fix conflict 2013-03-13 21:01:37 -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
Brian Wilson
cd95872b52 htmlbook-specific styling to make Heroes text presentable. 2013-03-11 11:56:48 -04:00
Brian Wilson
fcb618f04e fix basic alignment issue with html textbook display 2013-03-11 10:38:32 -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
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
Your Name
ff68853990 Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-21 13:30:24 -05:00
Brian Talbot
6f2e6116f9 LMS - adding back in a Sass mixin that seems to still have dependencies 2013-02-21 09:16:06 -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
Brian Talbot
f2abc3c3e5 lms - revised classes and styling mechanics for login/register forms and added necessary screen-reader mixin for other visually hidden text in those pages 2013-02-20 09:15:27 -05:00
John Jarvis
bfbd7de042 Adding baseFontColor to _variables.scss 2013-02-19 19:36:15 -05:00
Brian Talbot
6f922570ff made flex-grid references consistent within different page element Sass files 2013-02-19 17:36:28 -05:00