Arthur Barrett
c7197cd567
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-08 18:04:24 -04:00
Arthur Barrett
bf21211b25
adding some tests
2013-05-08 18:03:41 -04:00
Jason Bau
1354cd412a
Set SERVER_EMAIL so that mail_admins works
2013-05-08 14:16:20 -07:00
Arthur Barrett
1eb05cfd4e
remove unnecessary count
2013-05-08 15:07:36 -04:00
Arthur Barrett
0f70b0aa8a
refactored api resource map and added total to search query
2013-05-08 14:09:29 -04:00
Diana Huang
d522b53f6d
Merge pull request #1974 from edx/diana/hide-api-key
...
Hide the Comments Service API key during logging.
2013-05-08 07:50:31 -07:00
Arthur Barrett
894cfd1f48
update doc strings in api
2013-05-07 18:45:40 -04:00
VikParuchuri
fb4685fe9a
Merge pull request #1976 from edx/vik/fix/oe-bugs
...
Vik/fix/oe bugs
2013-05-07 14:54:17 -07:00
Arthur Barrett
eca155f99a
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-07 17:27:40 -04:00
Diana Huang
c6f63140a2
Hide the API key during logging.
2013-05-07 16:38:38 -04:00
Giulio Gratta
91e2a39ec7
moving preventDefault() statements to the local script tag
2013-05-07 12:50:59 -07:00
Vik Paruchuri
1398b55713
Comment touched modules
2013-05-07 15:48:19 -04:00
Giulio Gratta
87362aa887
Merge branch 'master' of github.com:edx/mitx into feature/giulio/accessibility
2013-05-07 11:21:44 -07:00
Giulio Gratta
f7719a60c7
changed offending javascript:void() hrefs on anchors to preventDefault()
2013-05-07 11:20:47 -07:00
Giulio Gratta
953af59b0d
fixing some more LMS accessibility issues
2013-05-07 10:25:16 -07:00
Giulio Gratta
a266330b2d
made signup form labels and close modal button accessible friendly and tweaked login form to match signup form
2013-05-07 10:25:08 -07:00
Giulio Gratta
3eac9376dd
made forgot password form close modal button accessible friendly
2013-05-07 10:25:08 -07:00
Giulio Gratta
2dde742f38
made login form labels and close modal button accessible friendly
2013-05-07 10:25:08 -07:00
Vik Paruchuri
258aebed20
Fix anonymoususer 500 error
2013-05-07 12:58:49 -04:00
Arthur Barrett
cd4bec8750
merged master branch into feature/abarrett/lms-notes-app
2013-05-07 12:32:22 -04:00
Arthur Barrett
ade6d4085d
turn off notes js debugging
2013-05-06 19:35:41 -04:00
Arthur Barrett
4070e019e4
modified the html static book to only enable annotator.js when notes are enabled for the course
2013-05-06 19:29:44 -04:00
Arthur Barrett
45cca10fb9
remove debugging from default notes view
2013-05-06 17:01:35 -04:00
Arthur Barrett
0e1b3999e8
add limit and offset params to search endpoint
2013-05-06 17:01:17 -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
Arthur Barrett
ceefdf0161
user must be authenticated to view notes tab
2013-05-06 15:52:32 -04:00
Arthur Barrett
c5728fb036
fix undefined variable name error in mako template
2013-05-06 14:48:51 -04:00
Greg Price
ec3c8458e7
Merge pull request #1911 from edx/feature/gprice/feedback-button
2013-05-06 11:03:41 -07:00
Arthur Barrett
04e75485ba
merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.
2013-05-06 13:40:38 -04: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
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
Victor Shnayder
06846d9187
update EPFL profile. LH # 374
2013-05-06 11:06:05 -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
b344976fe7
Making linters happier
2013-05-03 15:08:28 -04: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
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
Jay Zoldak
f2fd90bc61
Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests
...
Fix/cale/lms jasmine tests
2013-05-01 08:23:41 -07: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
Calen Pennington
771937b3da
Remove duplicate libraries used while jasmine testing the LMS (as they are also defined in vendor)
2013-04-30 14:09:42 -04:00
Calen Pennington
dfd369b9e9
Make ordering of js bundles during jasmine tests consistant
2013-04-30 14:09:17 -04:00
Diana Huang
32b30cef92
Merge pull request #1909 from MITx/diana/accessibility-update
...
Add accessibility text to the Contact page.
2013-04-29 13:58:43 -07:00
Diana Huang
befe7beccb
Add accessibility text to the Contact page.
2013-04-29 16:55:29 -04: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 acfd0d9fd6e4194c99d8
2013-04-26 12:40:35 -04:00
Diana Huang
5560a4add4
Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs"
...
This reverts commit 57427f9ac537621c26cd
2013-04-26 12:40:02 -04:00
Calen Pennington
8c54d5d610
Fix accidental force push that reset master
...
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410
2013-04-26 10:50:53 -04:00
