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

52 Commits

Author SHA1 Message Date
Calen Pennington
5eae41ee70 Merge branch 'master' into asset-pipeline 2012-05-22 15:44:27 -04:00
Calen Pennington
0af8502c6d Dirt-simple heartbeat page for use by AWS load balancers 2012-05-22 15:39:40 -04:00
Calen Pennington
ed3f081701 Merge branch 'master' into asset-pipeline 2012-05-21 10:22:59 -04:00
Calen Pennington
6b15303d89 Make collectstatic compile .coffee files, and preserve the askbot workflow using guard 2012-05-18 15:10:10 -04:00
ichuang
5e8fbcdc8d fix multicourse; fix bug in I4xSystem - self.filestore not set when 
filestore not None.  mitxhome.html now properly automatically lists
all courses given in settings.COURSE_SETTINGS.  mitxhome now served
from multicourse.views.  optioninput.html was missing; fixed. cleaned
up access to request.session for coursename in courseware/views.py
 2012-05-17 22:29:45 -04:00
Calen Pennington
bc823d3bfe Merge branch 'master' into asset-pipeline 
Conflicts:
	djangoapps/multicourse/__init__.py
	requirements.txt
	sass/_info.scss
	sass/_textbook.scss
	sass/courseware/_sequence-nav.scss
	sass/courseware/_video.scss
	sass/index/_base.scss
	sass/index/_extends.scss
	sass/index/_footer.scss
	sass/index/_header.scss
	sass/index/_index.scss
	sass/index/_variables.scss
	sass/layout/_calculator.scss
	sass/print.scss
	static/css
	static/css/application.css
	static/css/marketing.css
	templates/main.html
	templates/marketing.html
	templates/sass/index/_base.scss
	templates/sass/index/_extends.scss
	templates/sass/index/_footer.scss
	templates/sass/index/_header.scss
	templates/sass/index/_index.scss
	templates/sass/index/_variables.scss
	templates/sass/marketing/_base.scss
	templates/sass/marketing/_extends.scss
	templates/sass/marketing/_footer.scss
	templates/sass/marketing/_header.scss
	templates/sass/marketing/_index.scss
	templates/sass/marketing/_variables.scss
 2012-05-17 16:32:39 -04:00
Isaac Chuang
ad44882835 Ike's changes to enable multicourse, new response types, etc. 2012-05-16 21:18:47 -04:00
Prem Sichanugrist
2c37950472 Add Jasmine to do a JavaScript unit test 2012-05-07 18:01:21 -04:00
Piotr Mitros
6b6ef01cf0 Masquerading works 2012-05-04 16:29:44 -04:00
Calen Pennington
e8c4d1dbef Replace links to static in problems with links to fingerprinted data 2012-04-23 11:42:42 -04:00
David Ormsbee
c23d2804be slightly simplified urlpatterns setting in urls.py 2012-04-19 10:50:32 -04:00
David Ormsbee
98ff3d5bfb Merge branch 'master' into move_settings 
Conflicts:
	djangoapps/student/views.py
	urls.py
 2012-04-02 14:26:05 -04:00
David Ormsbee
2eedce0139 Allow gunicorn_django to serve static files when DEBUG=True 2012-03-21 17:54:58 -04:00
Piotr Mitros
edfff32338 Incorporated Dave's feedback 2012-03-21 14:19:36 -04:00
Piotr Mitros
75c5c1ce74 Name changes work, but meta storage not tested 2012-03-20 22:27:30 -04:00
Piotr Mitros
2e905dc70c More of e-mail change process works 2012-03-19 21:24:21 -04:00
Piotr Mitros
9882b30c83 Unknown changes/pre-git transition 
--HG--
branch : pmitros-name-change
 2012-03-19 09:25:42 -04:00
Piotr Mitros
7c73d7ef41 Non-working code; Cale needs a commit/push 
--HG--
branch : pmitros-name-change
 2012-03-15 15:50:15 -04:00
Piotr Mitros
837b9c9075 Basic gradebook 2012-03-10 22:31:40 -05:00
Piotr Mitros
a995ef0f0f Instructors can see grades -- syncing machines -- nonworking code 
--HG--
branch : visible-grades
 2012-03-10 17:11:49 -05:00
Piotr Mitros
f83c492720 per-section rendering works, if unclean 
--HG--
branch : pmitros-section
 2012-02-20 16:35:12 -05:00
Bridger Maxwell
0d699f2895 Added links from profile to courseware. Updated names in urls to accomodate. 2012-02-03 17:05:34 -05:00
David Ormsbee
b7fe049f04 merged and updated urls to point to student and not auth 2012-02-02 17:37:49 -05:00
Ernie Park
66bec4b895 merge 
--HG--
rename : auth/views.py => student/views.py
 2012-02-02 16:38:17 -05:00
David Ormsbee
7e1d23308c yet another rename, from auth -> user -> student 
--HG--
rename : user/__init__.py => student/__init__.py
rename : user/migrations/0001_initial.py => student/migrations/0001_initial.py
rename : user/migrations/0002_text_to_varchar_and_indexes.py => student/migrations/0002_text_to_varchar_and_indexes.py
rename : user/migrations/__init__.py => student/migrations/__init__.py
rename : user/models.py => student/models.py
rename : user/tests.py => student/tests.py
rename : user/views.py => student/views.py
 2012-02-02 14:31:42 -05:00
David Ormsbee
72c45e8bbb Move UserProfile and Registration out of courseware and into a renamed auth (now user) 
--HG--
rename : auth/__init__.py => user/__init__.py
rename : auth/tests.py => user/tests.py
rename : auth/views.py => user/views.py
 2012-02-01 19:32:18 -05:00
Ernie Park
a6977aae4c update routes and new password_reset 2012-02-01 11:59:27 -05:00
Piotr Mitros
ef1bc23971 JSON password reset 2012-01-30 20:19:11 -05:00
Piotr Mitros
9ad26e0646 Bug in tracking framework when no cookie 2012-01-29 22:17:04 -05:00
fischerl
859afccd27 added handi book indexing url and view 2012-01-29 17:14:43 -05:00
Piotr Mitros
8125180edc Major number of minor cleanups. Fixed from e-mail, import order, ==None, etc. 2012-01-28 12:10:56 -05:00
Piotr Mitros
04a7be0ae7 Fixed e-mail in URLs.py, fixed 2 gjs bugs 2012-01-27 22:37:34 -05:00
Piotr Mitros
028dac5491 Info tab 2012-01-17 21:28:23 -05:00
Piotr Mitros
6e9e9c7627 Slightly better name. PROFILE to PERFSTATS 2012-01-15 14:13:40 -05:00
Piotr Mitros
36281387d6 Profiling. Also, preliminary dummy code for tracking in capa_problem 2012-01-15 14:12:46 -05:00
Piotr Mitros
5b7a59bc58 Staging page works 2012-01-13 07:26:53 -05:00
Bridger Maxwell
53155d228a Getting the names more consistent 2012-01-11 15:52:23 -05:00
Bridger Maxwell
de52b657b0 Adding hooks for a new course info page 2012-01-11 15:42:52 -05:00
Piotr Mitros
4a28fd3b13 Working calculator 2012-01-05 20:28:05 -05:00
Piotr Mitros
85e8b3a2e9 Wiki now supports circuits, modulo bugs 2012-01-04 19:00:52 -05:00
Piotr Mitros
4405bef7a3 Supports askbot dir 2012-01-01 15:22:54 -05:00
Piotr Mitros
fc15438f26 Added help page 2012-01-01 12:49:41 -05:00
Piotr Mitros
576ac4b80a Askbot integrated 2012-01-01 08:57:05 -05:00
Piotr Mitros
4355de794b Tracking is partially in place 2011-12-31 11:38:28 -05:00
Piotr Mitros
646fc0b18f simplewiki 2011-12-30 00:09:16 -05:00
Piotr Mitros
881a57e3e5 New textbook structure 2011-12-29 16:40:01 -05:00
Piotr Mitros
fccfbb7d2f Textbook browser 2011-12-29 09:51:32 -05:00
Piotr Mitros
e25939acc3 Basic textbook functionality 2011-12-23 16:43:14 -05:00
Piotr Mitros
a8037f03e5 Laying ground work for formula support. Adding Anant's content 2011-12-15 07:51:07 -05:00
Piotr Mitros
49a000a3ad Folding stuff in capa_module from views 2011-12-07 20:47:50 -05:00