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

288 Commits

Author SHA1 Message Date
Piotr Mitros
911110c6bc Imports djanalytics, and adds URLs 2013-05-11 16:19:04 -04:00
Jason Bau
1354cd412a Set SERVER_EMAIL so that mail_admins works 2013-05-08 14:16:20 -07: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
Calen Pennington
dfd369b9e9 Make ordering of js bundles during jasmine tests consistant 2013-04-30 14:09:17 -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
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
Calen Pennington
346aee8863 Make django-pipeline only work with raw js and css 2013-04-18 07:18:36 -04:00
ichuang
3b4093ab7b url and mitx_settings for masquerade 2013-04-13 22:47:04 -04:00
Chris Dodge
b609a96902 ummm. forgot to commit stuff 2013-03-27 22:51:52 -04:00
David Ormsbee
67a0cccba9 Addressing some pep8/pylint concerns 2013-03-15 11:08:09 -04:00
David Ormsbee
d0bff1ed3c Merge branch 'master' into jmpm-analytics 
Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html
 2013-03-06 17:09:09 -05:00
David Ormsbee
b0afbba58d Merge pull request #1516 from MITx/hack/dave/submission_history 
Record and report submission history for a problem
 2013-03-04 11:39:54 -08:00
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -05:00
Vik Paruchuri
4d57f1b9ee Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule 2013-02-19 10:43:55 -05:00
David Ormsbee
8f17e6ae9e First pass at implementing problem history. 2013-02-15 01:30:14 -05:00
Victor Shnayder
4f8757600a merge 2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596 Foldit integration. 
- ops view for the desktop app to talk to
  - xmodule that talks to the foldit model and displays the student's state
  - grading tweak to make grade updates from an external service work:
    - Add an always_recalculate_grades property to XModuleDescriptor.
 2013-02-14 12:45:06 -05:00
Ned Batchelder
857edaf6f3 Remove dogfood and quickedit. 2013-02-13 12:23:08 -05:00
Vik Paruchuri
9bca4ebf21 Start to refactor grading settings 2013-02-11 17:32:11 -05:00
David Ormsbee
976776643b Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue. 2013-02-06 22:46:22 -05:00
David Ormsbee
a470a62d12 Hack to disable YouTube <iframe> API when they break it. 2013-02-06 22:37:41 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
David Ormsbee
b68aff72f2 Merge pull request #1436 from MITx/debug/dave/sass 
undo pipeline changes
 2013-02-05 13:26:22 -08:00
David Ormsbee
1ef9d6388f re-add compression flag to sass 2013-02-05 16:25:59 -05:00
David Ormsbee
706a1072b9 undo pipeline changes 2013-02-05 16:24:53 -05:00
Diana Huang
120aa3cd3b Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule 
Feature/vik/peer grading xmodule
 2013-02-05 12:55:48 -08:00
Calen Pennington
2551243dfa Install the static_replace app for the management command 2013-02-05 11:06:46 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -05:00
David Ormsbee
ecce3e5761 Merge pull request #1426 from MITx/debug/dave/sass 
Comment out YUI compressor (cause *something* is still causing CSS compression)
 2013-02-05 05:59:59 -08:00
David Ormsbee
818cd3aa48 Comment out YUI compressor (cause *something* is still causing CSS compression) 2013-02-05 08:58:59 -05:00
David Ormsbee
fae51815d8 Merge pull request #1420 from MITx/debug/dave/sass 
Force it to do expanded mode, because it's still generating compressed CSS output
 2013-02-04 15:04:03 -08:00
David Ormsbee
aeaad6f58d Force it to do expanded mode, because it's still generating compressed CSS output 2013-02-04 18:03:05 -05:00
Vik Paruchuri
bf97a6a9a9 Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule 
Conflicts:
	lms/djangoapps/open_ended_grading/peer_grading_service.py
 2013-02-04 17:55:55 -05:00
Diana Huang
fb777de18d Merge pull request #1401 from MITx/feature/vik/peer-grading-flagging 
Feature/vik/peer grading flagging
 2013-02-04 14:45:59 -08:00
David Ormsbee
9f634aba3c Remove compressed flag from SASS call in pipeline so we can diff the generated CSS 2013-02-04 17:33:26 -05:00
Vik Paruchuri
bdb82cda65 Strip out JS, old urls 2013-01-31 18:23:30 -05:00
Vik Paruchuri
10c7155d4d Add open ended to JS pipeline 2013-01-30 21:28:42 -05:00
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
Calen Pennington
d132f2e18a Only put data repos in STATICFILES_DIRS if we're serving them from django (which is only in dev) 2013-01-30 09:12:50 -05:00
Victor Shnayder
0e78eaaf80 Add a course_groups djangoapp with a CourseUserGroup model. 2013-01-24 15:12:52 -05:00
jmvt
549a5e9fe9 Merge remote-tracking branch 'origin/master' into jmpm-analytics 2013-01-23 12:02:48 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Valera Rozuvan
61c68b740c Set up of basic RequireJS skeleton structure. 2013-01-21 15:53:44 +02:00
David Ormsbee
0f035b7692 Remove extra RequireJS.js entry. 2013-01-18 17:03:55 -05:00
jmvt
bc268aa791 Merged to lastest master. 2013-01-17 17:39:12 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
Brian Wilson
3b28e328c4 disable export of testcenter_exam from course module (and add test). 2013-01-15 17:54:10 -05:00
Brian Wilson
32b2d1b97f Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations 2013-01-15 15:42:09 -05:00
valera-rozuvan
0913e9ef69 Work on GST. 2013-01-15 12:51:55 +02:00
Calen Pennington
fc2d5c43f1 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/envs/aws.py
 2013-01-14 12:51:19 -05:00