cahrens
bfdbcc2f32
Beginnings of Backbone views/models.
2013-05-09 11:16:12 -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
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
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
David Baumgold
a58f39695a
Remove install.txt, because all that information is in the README.md file now
2013-05-06 10:29:25 -04:00
David Baumgold
457b678af7
Wrote a proper README file
...
So that no one else will have to go through what I went through. Hopefully.
2013-05-06 10:29:25 -04:00
Jay Zoldak
8ef88fa5b0
Fix tests that randomly fail when run in concurrent jobs on jenkins.
2013-05-06 10:24:38 -04:00
David Baumgold
5e288b60ca
Merge pull request #1943 from edx/cleanup
...
One more attempt at making linters happier
2013-05-06 07:15:21 -07:00
cahrens
e44c6b6bf8
Don't reach in to default value.
2013-05-03 17:05:02 -04:00
cahrens
32d67be5f5
Get rid of _computed_default.
2013-05-03 16:42:41 -04:00
Sarina
72584b5937
Merge pull request #1914 from edx/fix/sarina/new_formularesponse_defaults
...
Fix/sarina/new formularesponse defaults
2013-05-03 12:32:10 -07:00
cahrens
5c3719b915
Get HTML LaTeX "working" again.
2013-05-03 15:31:18 -04:00
cahrens
9dd074f25b
Cleanup.
2013-05-03 15:09:02 -04:00
David Baumgold
b344976fe7
Making linters happier
2013-05-03 15:08:28 -04:00
cahrens
37d594ce37
Get rid of non-editable scope.
2013-05-03 14:58:33 -04:00
jarv
5d729c306b
Merge pull request #1942 from edx/fix/jbau/email_timezone_config
...
Inserts overrides in env.lms.aws for email settings and timezone
2013-05-03 11:54:51 -07:00
Jason Bau
7720c0fc8d
Inserts overrides in env.lms.aws for email settings and timezone
...
overrides what is set in env.lms.common using the lms.env.json
file
2013-05-03 11:45:21 -07:00
Steve Strassmann
dea1198d75
Merge pull request #1925 from edx/bug/straz/date
...
Bug/straz/date - fix date interpolation
2013-05-03 09:32:00 -07:00
brianhw
a294e2d1ac
Merge pull request #1937 from edx/victor/press
...
Press updates
2013-05-03 07:50:26 -07:00
Greg Price
0f7378a171
Modify UserFactory to create a profile for the user
...
This allows specification of profile parameters when creating a user. Because
the profile contents are always accessed from the database, the user must be
saved to the database before the profile is created. This means that the
profile cannot be created if the user is merely being built (and not saved)
rather than created.
2013-05-03 10:31:35 -04:00
Victor Shnayder
aae40b4378
Press updates
...
LH: 381, 382, 383
2013-05-03 08:55:40 -04:00
cahrens
0a1902e7da
Merge branch 'master' into feature/christina/fields
2013-05-02 16:29:03 -04:00