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

4540 Commits

Author SHA1 Message Date
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
Calen Pennington
621a935577 Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3 
Allow course staff to masquerade as students in viewing courseware
 2013-04-24 04:17:34 -07:00
Your Name
67f57a7145 use new API verbs 2013-04-23 13:28:23 -04:00
Your Name
acfd0d9fd6 fix merge conflict 2013-04-23 10:30:51 -04:00
Your Name
e4194c99d8 Merge branch 'master' of github.com:MITx/mitx 2013-04-23 10:28:40 -04:00
Kevin Chugh
d6bc426ecd Merge pull request #1731 from MITx/feature/kevin/pinning_inline 
Feature/kevin/pinning inline
 2013-04-23 07:24:22 -07:00
Your Name
068e02efd5 make unflag all permissions match javascript 2013-04-22 17:51:48 -04:00
Your Name
3f1d97b065 Merge branch 'master' into feature/kevin/flagging 2013-04-22 17:22:33 -04:00
Your Name
5e73e8f286 Merge branch 'master' of github.com:MITx/mitx 2013-04-22 17:22:24 -04:00
Your Name
30104979e7 fix downvoting url 2013-04-22 16:25:16 -04:00
Your Name
af1c411ddf gentler url diff 2013-04-22 16:23:21 -04:00
Your Name
0bcef4ddb7 fix merge conflicts 2013-04-22 12:54:33 -04:00
Your Name
7994e1b344 pep8 fixes 2013-04-22 12:53:30 -04:00
chrisndodge
0eed587571 Merge pull request #1839 from MITx/feature/sef/pressreleases 
Press Releases: generic matching rule instead of explicit lines in url.py
 2013-04-22 07:01:36 -07:00
ichuang
977eb6530c allow staff to toggle masquerade on info pages (otherwise can get 
blocked from courseware pages, if course hasn't started yet)
 2013-04-21 21:43:18 -04:00
Kevin Chugh
7bc75844b2 fix indentation 2013-04-21 06:24:23 -04:00
Kevin Chugh
e8c646142f Merge branch 'master' into feature/kevin/flagging 2013-04-21 06:15:55 -04:00
Kevin Chugh
649578ea2f unify flag moderator permissions 2013-04-21 06:15:23 -04:00
ichuang
f1a899ac1c Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3 2013-04-20 12:25:47 -04:00
ichuang
81621fbe3a for staff masquerading as student be kind and don't 404 for inaccessible content 2013-04-20 12:12:25 -04:00
ichuang
6cbd353992 make masquerade work properly even if DISABLE_START_DATES true 2013-04-20 11:57:56 -04:00
Your Name
0a627bb5d9 update permissions for flagging 2013-04-19 17:40:13 -04:00
Calen Pennington
729daf5cbf Move xmodule asset gathering out of server startup 
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
 2013-04-18 15:19:19 -04:00