Steve Strassmann
8e735b4deb
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/transifex
2013-05-06 14:06:12 -04:00
Steve Strassmann
bec2ca4086
cleanup headers of files pulled from transifex.
2013-05-06 14:05: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
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
Steve Strassmann
65dd3cc9ba
pull from master
2013-05-06 11:29:55 -04:00
Steve Strassmann
c0278d0ff1
refactor config file; fix duplicate merge
2013-05-06 11:29:27 -04: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
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
Steve Strassmann
03b9a9e22a
tweak file reference
2013-05-03 15:42:39 -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
Steve Strassmann
138e0569dd
pull master
2013-05-03 15:18:45 -04:00
Steve Strassmann
e6334584d6
rakefile cleanup
2013-05-03 15:18:29 -04:00
David Baumgold
b344976fe7
Making linters happier
2013-05-03 15:08:28 -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
63e6ff16c3
merge with master
2013-05-03 12:46:29 -04:00
Steve Strassmann
55dd0fc8bc
workaround for gettext parser bug
2013-05-03 12:45:55 -04: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
e0d
22e147b2c9
Merge pull request #1931 from edx/fix/zoldak/gcli-status
...
Change org for gcli status command from mitx to edx
2013-05-02 11:48:05 -07:00
jarv
161c8cb12e
Merge pull request #1929 from edx/jtauber/fix-forks
...
fix requirements to use moved forks
2013-05-02 10:16:46 -07:00
James Tauber
f566b4f003
fix requirements to use moved forks
2013-05-02 13:05:20 -04:00
Jay Zoldak
fc1a22de55
Merge pull request #1921 from edx/fix/zoldak/cms-jasmine-tests
...
Remove localization middleware from jasmine test execution
2013-05-02 09:45:58 -07:00
Jay Zoldak
0b452f6195
Change org for gcli status command from mitx to edx
2013-05-02 12:41:59 -04:00
