marco
c36046bedd
Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui
2013-05-12 13:18:45 -04:00
marco
2360a111c8
attempt to trigger js event for mode button press, not breaking yet but nonfunctional
2013-05-12 12:08:04 -04:00
cahrens
f4b06b2e96
Beginnings of is-set work.
2013-05-10 16:41:07 -04:00
cahrens
fd52980a2d
Option view, changes getting persisted.
2013-05-10 16:02:22 -04:00
marco
04bb7335e7
removed extra section heading in settings DOM, placed settings after editor
2013-05-10 13:18:43 -04:00
marco
004018c1eb
Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui
2013-05-09 14:59:01 -04:00
marco
6dbfa7499b
removed metadata-edit styling
2013-05-09 14:58:54 -04:00
cahrens
b314b5ce59
Renaming of some files.
2013-05-09 14:51:16 -04:00
cahrens
4a7f7d6537
Update the other templates that include metadata-edit.html.
2013-05-09 14:34:52 -04:00
marco
cad8ae1b9b
merged in new data requirements for html
2013-05-09 14:19:31 -04:00
cahrens
60f41eb108
Cleanup.
2013-05-09 11:49:09 -04:00
cahrens
cf491b1184
Remove component.html changes.
2013-05-09 11:46:47 -04:00
cahrens
7e42512bfa
Merge branch 'ux/marco/studio-componentsettings' into feature/christina/metadata-ui
2013-05-09 11:20:04 -04:00
cahrens
bfdbcc2f32
Beginnings of Backbone views/models.
2013-05-09 11:16:12 -04:00
marco
3ebd5de744
added rest of settings list
2013-05-09 10:54:10 -04:00
marco
3284247905
restyling of the input fields, partway through adding in examples of all settings
2013-05-09 09:35:31 -04:00
marco
977d0d76c2
cleaning up styles to use list-input, field, group, label, input, tip, etc standards. also opted to try out initial pass at hierarchy splitting of css classes on items that repeat (li, for example)
2013-05-07 16:40:21 -04:00
cahrens
9e1c935b60
Merge branch 'master' into feature/christina/fields
2013-05-07 12:39:45 -04:00
Christina Roberts
729ca900e6
Merge pull request #1920 from edx/feature/christina/fields
...
Pass additional field information from editable_metadata_fields, remove system_metadata_fields variable.
2013-05-07 09:38:34 -07:00
Jay Zoldak
29a5d3b42e
Merge pull request #1955 from edx/fix/zoldak/add-gitignores-xmodule-js
...
Ignore the js files that are compiled from coffeescript when running the...
2013-05-07 06:09:54 -07:00
marco
d28c0b5f91
cleaned up styling, synced up partially to existing standards for forms, fonts, colors, etc; currently open select box issue on chrome
2013-05-07 08:59:28 -04:00
Jay Zoldak
c2cd75469b
Change the methodology to ignore .js files by default. Any .js files that are coded can be handled individually.
2013-05-06 17:05:47 -04:00
Jay Zoldak
2ffaea7ade
Merge pull request #1949 from edx/fix/zoldak/modulestore-tests
...
Fix tests that intermittently fail when run in concurrent jobs on jenkins.
2013-05-06 13:32:27 -07:00
cahrens
594d28a653
Pass default value through.
2013-05-06 16:03:41 -04:00
Jay Zoldak
522751e425
Ignore the js files that are compiled from coffeescript when running the xmodule jasmine tests
2013-05-06 14:28:05 -04:00
Greg Price
ec3c8458e7
Merge pull request #1911 from edx/feature/gprice/feedback-button
2013-05-06 11:03:41 -07:00
Greg Price
203a958e68
Outline textareas in red on a form submission error
...
This was previously done for input but not textarea.
2013-05-06 13:35:52 -04:00
Greg Price
00729a8c13
Add an omnipresent help tab to the LMS
...
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
2013-05-06 13:35:52 -04:00
Greg Price
87072a9a58
Add an endpoint for submission of Zendesk tickets by end users
...
This functionality requires the Zendesk URL, user, and API key to be specified
in django.conf.settings. Also, add a flag to MITX_FEATURES (enabled by default)
to control the endpoint and the front-end feature (yet to be added).
2013-05-06 13:35:51 -04:00
cahrens
84ff2a0941
Merge branch 'master' into feature/christina/fields
2013-05-06 12:42:18 -04:00
Christina Roberts
66185423a2
Merge pull request #1945 from edx/feature/christina/computed_default
...
Get rid of _computed_default.
2013-05-06 09:28:37 -07:00
David Baumgold
8d7eb03577
Merge pull request #1930 from edx/fix-readme
...
MOAR README
2013-05-06 09:26:49 -07:00
Victor Shnayder
fe12c64523
Merge pull request #1951 from edx/victor/epfl-desc
...
update EPFL profile. LH # 374
2013-05-06 08:34:48 -07:00
David Baumgold
a779f62716
Make rhetorical question a bit clearer
2013-05-06 11:27:06 -04:00
David Baumgold
58bc0452eb
Describe edX better
2013-05-06 11:25:52 -04:00
David Baumgold
b995842874
LMS is not a leaning management system
...
That would be a chair.
2013-05-06 11:21:05 -04:00
David Baumgold
683906cdaf
"One again" -> "Remember"
2013-05-06 11:17:28 -04:00
Victor Shnayder
06846d9187
update EPFL profile. LH # 374
2013-05-06 11:06:05 -04:00
David Baumgold
7b3646b39c
Need to install pre-requirements.txt first
2013-05-06 11:05:06 -04:00
marco
38abc0167d
label on top of input field move
2013-05-06 07:37:14 -07:00
David Baumgold
234ca0e076
Responding to @jzoldak's comments
2013-05-06 10:29:26 -04:00
David Baumgold
ee6d68e2e0
grammar
2013-05-06 10:29:26 -04:00
David Baumgold
2a09f6bac1
Clarified based on @shnayder's comment
2013-05-06 10:29:26 -04:00
David Baumgold
fa87cccb9b
Document old-style rake lms command
2013-05-06 10:29:26 -04:00
David Baumgold
98243b2b53
Document django-admin[update_templates] step
2013-05-06 10:29:26 -04:00
Ned Batchelder
03470fc48e
Add a mention of create-dev-env.sh
2013-05-06 10:29:26 -04:00
David Baumgold
06ade12f6a
Also need to install Mongo
2013-05-06 10:29:26 -04:00
David Baumgold
fccee7a1e3
Node does virtual environments using npm
2013-05-06 10:29:26 -04:00
David Baumgold
1bda218e17
Clarify purpose of data dir
2013-05-06 10:29:26 -04:00
David Baumgold
a0727ac226
Virtualenv is a tool, and should be surrounded by backticks
2013-05-06 10:29:26 -04:00