Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,893 Commits 1 Branch 0 Tags
0cc763bc126deffe96b4e35c0a5cee596af6c141
Commit Graph

4562 Commits

Author SHA1 Message Date
Piotr Mitros
0cc763bc12 Removed debug code 2013-05-12 08:44:48 -04:00
Piotr Mitros
21e0d4fe61 Fixed whitespace bug 2013-05-11 21:19:14 -04:00
Piotr Mitros
911110c6bc Imports djanalytics, and adds URLs 2013-05-11 16:19:04 -04:00
Greg Price
c765906fc5 Merge pull request #1986 from edx/feature/gprice/fix-help-modal-text 
Update "thank you" text in help modal
 2013-05-09 14:37:13 -07:00
Greg Price
89d0dc1963 Update "thank you" text in help modal 
As per request from Mary.
 2013-05-09 17:16:43 -04:00
Diana Huang
f9023fd112 Merge pull request #1983 from edx/diana/jobs-page-update 
Jobs page updates.
 2013-05-09 11:04:14 -07:00
Diana Huang
e5b18a5688 Put Front End Developer back in. 2013-05-09 13:58:25 -04:00
Diana Huang
ec5f239d91 Add in new Coordinator position. 2013-05-09 09:12:07 -04:00
Jason Bau
1354cd412a Set SERVER_EMAIL so that mail_admins works 2013-05-08 14:16:20 -07:00
Diana Huang
1e61bbd1c8 Jobs page updates. 2013-05-08 16:06:08 -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
VikParuchuri
fb4685fe9a Merge pull request #1976 from edx/vik/fix/oe-bugs 
Vik/fix/oe bugs
 2013-05-07 14:54:17 -07: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
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
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
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 acfd0d9fd6, reversing
changes made to e4194c99d8.
 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 57427f9ac5, reversing
changes made to 37621c26cd.
 2013-04-26 12:40:02 -04:00
Calen Pennington
8c54d5d610 Fix accidental force push that reset master 
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410. 5d912b8a is a merge commit
that merged a branch onto master, so I am merging the same commit
back into master.
 2013-04-26 10:50:53 -04:00
Diana Huang
886e74342d Move the testcenter login to external_auth 
* hide the login behind a setting that is turned off by default
* clean out some of the outdated settings and hardcoded test strings
 2013-04-25 11:12:19 -04:00
Calen Pennington
9d94adbd1f Merge pull request #1871 from MITx/feature/cale/fast-dev-server 
Speed up local development
 2013-04-24 12:12:05 -07:00
cahrens
cc2d06975e Remove duplicated StringyX definitions. 2013-04-24 14:59:32 -04:00
Steve Strassmann
8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n 2013-04-24 10:41:09 -04:00
Kevin Chugh
57427f9ac5 Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs 
use new API verbs
 2013-04-24 06:47:38 -07:00