John Jarvis
|
aa895cbc6b
|
Adding mktg_iframe.html
|
2013-04-30 13:13:31 -04:00 |
|
John Jarvis
|
01f8c4c816
|
Adding iframe view
example:
http://localhost:8000/courses/HarvardX/CB22x/2013_Spring/mktg-about
|
2013-04-30 09:44:21 -04:00 |
|
John Jarvis
|
01e15c1e13
|
Merge branch 'master' into drupal-new
|
2013-04-23 18:11:40 -04:00 |
|
Will Daly
|
7e35bf1912
|
Merge pull request #1846 from MITx/feature/zoldak/test-user-profile-factory
Convert login tests to use factories
|
2013-04-11 13:57:29 -07:00 |
|
Jay Zoldak
|
bb1134b8ee
|
Convert login tests to use factories
|
2013-04-11 16:54:16 -04:00 |
|
Will Daly
|
dce0b53ca5
|
Merge pull request #1844 from MITx/feature/zoldak/cs-mock
Create a mock comment service that will listen for HTTP requests on a port
|
2013-04-11 11:26:08 -07:00 |
|
Jay Zoldak
|
88852c4b26
|
pep8 and pylint cleanup of new files
|
2013-04-11 14:11:30 -04:00 |
|
Jay Zoldak
|
442141fa04
|
Create a mock comment service that will listen for HTTP requests on a port
|
2013-04-11 14:08:32 -04:00 |
|
Christina Roberts
|
c455710cca
|
Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements
Fix/cdodge/studio forum improvements
|
2013-04-11 10:37:49 -07:00 |
|
John Jarvis
|
0c1fd783cb
|
Setting the edxloggedin cookie on registration
Previously it was only set for login
|
2013-04-11 10:44:22 -04:00 |
|
Chris Dodge
|
e0bc823365
|
remove auto-provisioning because of a dependency problem between cms and lms
|
2013-04-11 10:42:03 -04:00 |
|
Don Mitchell
|
f6434ed4fb
|
Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules
Fix/cdodge/export draft modules
|
2013-04-10 13:12:09 -07:00 |
|
chrisndodge
|
4d9dd40268
|
Merge pull request #1842 from MITx/feature/christina/metadata
Get the "Edit High Level Source" link back in for LaTeX problems. Broken with xblock work.
|
2013-04-10 12:05:06 -07:00 |
|
cahrens
|
40adfa950d
|
Get the "Edit High Level Source" link back in. Broken with xblock work.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
|
2013-04-10 14:53:26 -04:00 |
|
John Jarvis
|
54e5e3d31f
|
Adding the EDX_MKTG feature flag and links back to the marketing site
|
2013-04-10 14:29:55 -04:00 |
|
jarv
|
7102c23d6d
|
Merge pull request #1841 from MITx/fix/btalbot/loginregister-actions
Fix/btalbot/loginregister actions
|
2013-04-10 10:40:43 -07: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 |
|
Chris Dodge
|
0a2937311d
|
remove commented out code. Also fix up indents and other violations
|
2013-04-10 12:34:18 -04:00 |
|
Chris Dodge
|
d9fa723eb2
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
Conflicts:
common/lib/xmodule/xmodule/modulestore/xml_importer.py
|
2013-04-10 12:02:16 -04:00 |
|
Brian Talbot
|
b5ec11afa0
|
edx.org - adding in more UI status when processing login/register forms
|
2013-04-10 11:26:00 -04:00 |
|
Christina Roberts
|
276b86a779
|
Merge pull request #1833 from MITx/feature/btalbot/studio-courselink
Feature/btalbot/studio courselink
|
2013-04-10 07:52:19 -07:00 |
|
Brian Talbot
|
97e893b2ed
|
Merge branch 'master' into feature/btalbot/studio-courselink
|
2013-04-10 10:48:33 -04:00 |
|
Brian Talbot
|
01b2fefdd0
|
studio - revised course URL link label to match wording used elsewhere in the view/app
|
2013-04-10 10:48:12 -04:00 |
|
Chris Dodge
|
5e3ca48c8d
|
address some violations
|
2013-04-10 09:40:23 -04:00 |
|
Chris Dodge
|
07b9d6353e
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
|
2013-04-10 09:26:51 -04:00 |
|
Christina Roberts
|
81f94fc4e2
|
Merge pull request #1832 from MITx/fix/btalbot/studio-contentmargin
studio - fixing a visual margin issue with the sign up/in views
|
2013-04-09 12:51:09 -07:00 |
|
jarv
|
7a0ddb2436
|
Merge pull request #1836 from MITx/style/btalbot/password-reset-complete
edx.org - quick password reset complete view styling
|
2013-04-09 12:39:43 -07:00 |
|
Brian Talbot
|
86dbfd34a1
|
edx.org - added basic styles to match previous password reset form to complete view
|
2013-04-09 15:38:10 -04:00 |
|
Brian Talbot
|
dac88a8f84
|
Merge pull request #1835 from MITx/feature/jarv/fix-password-fields
changing password reset fields to match what is used now
|
2013-04-09 12:31:45 -07:00 |
|
John Jarvis
|
c3e5469596
|
changing password reset fields to match what is used now
|
2013-04-09 15:11:06 -04:00 |
|
John Jarvis
|
2c0b2e4d27
|
Merge branch 'master' into drupal-new
|
2013-04-09 13:27:13 -04:00 |
|
John Jarvis
|
2b309adf9c
|
Fixing cookie handling for edx-mktg-loggedin
|
2013-04-09 13:26:57 -04:00 |
|
Ned Batchelder
|
d2ed6e2c02
|
Merge pull request #1830 from MITx/fix/cale/violations
Clean up violations from ichuang's PR
|
2013-04-09 10:21:49 -07:00 |
|
Calen Pennington
|
5b8a410d12
|
Merge pull request #1829 from MITx/marketing/cale/delftx-header
Marketing request: Lighthouse [#338, fixed]
|
2013-04-09 10:14:19 -07:00 |
|
chrisndodge
|
2fce096e1c
|
Merge pull request #1834 from MITx/bug/christina/base
Need to be able to access smoothScrollTop.
|
2013-04-09 06:52:55 -07:00 |
|
cahrens
|
f36494e5dd
|
Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way.
|
2013-04-09 09:41:52 -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 |
|
Sarina
|
74104d6081
|
Merge pull request #1831 from MITx/vik/fix/pg-and-progress
Fix weighting and score generation
|
2013-04-08 14:37:07 -07:00 |
|
Brian Talbot
|
12784e3fb8
|
studio - course link final styling
|
2013-04-08 17:35:16 -04:00 |
|
Brian Talbot
|
b51e57eddf
|
studio - refining style and presentation of course link and invitation button on details settings
|
2013-04-08 17:31:14 -04:00 |
|
Christina Roberts
|
7fd8a33b3c
|
Merge pull request #1816 from MITx/feature/btalbot/studio-alerts
Feature/btalbot/studio-alerts
|
2013-04-08 14:19:12 -07:00 |
|
Brian Talbot
|
606469cd46
|
studio - fixing a visual margin issue with the sign up/in views header/content areas
|
2013-04-08 17:14:41 -04:00 |
|
Brian Talbot
|
7882845786
|
studio - alerts: correcting page title
|
2013-04-08 17:09:43 -04:00 |
|
Brian Talbot
|
27871ac9c9
|
studio - alerts: hiding alerts (in possbily inaccessible ways) in css for page load's sake
|
2013-04-08 16:55:06 -04:00 |
|
Vik Paruchuri
|
7d09617ec9
|
Fix weighting and score generation
|
2013-04-08 16:52:18 -04:00 |
|
Calen Pennington
|
45bb4d3754
|
Merge pull request #1828 from MITx/fix/cdodge/import-nesting-definition-data
import was putting the xml data into definition.data.data rather than de...
|
2013-04-08 13:50:36 -07:00 |
|
Brian Talbot
|
3f2e21f9dc
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 16:29:18 -04:00 |
|
Brian Talbot
|
3f22826e26
|
studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification
|
2013-04-08 16:28:31 -04:00 |
|