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

4201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bridger Maxwell
ceaa6a4ff2 You can now click around in the wiki without losing your course nav bar. 2012-08-14 18:44:23 -04:00
Bridger Maxwell
85f1899cb6 Wiki pages can now be viewed from the course URL and the course nav is shown. It doesn't follow the user yet. 2012-08-14 17:15:44 -04:00
Bridger Maxwell
1f43ae6d3e Renamed namespace to wiki_slug in course_module.py. 2012-08-14 13:49:53 -04:00
Bridger Maxwell
3dce1c2884 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-14 11:40:00 -04:00
Bridger Maxwell
eeeb677354 Fixed wiki urls bug. Fixed reverse for course wiki. 2012-08-14 11:39:49 -04:00
Bridger Maxwell
dd56fd0916 Added some comments for the mitxmako additions. 2012-08-14 09:13:42 -04:00
Bridger Maxwell
a2841af834 Added views for automatic course article creation. 2012-08-14 08:39:41 -04:00
Bridger Maxwell
c8fc7bed3e Small template change. 2012-08-14 08:39:19 -04:00
Calen Pennington
d0e51a2df2 Merge pull request #406 from MITx/feature/ichuang/fix-signup-modal-for-ssl 
when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately ...
 2012-08-13 18:01:21 -07:00
Calen Pennington
2504880e57 Merge pull request #404 from MITx/feature/ichuang/consistent-customresponse 
fix customresponse be consistent with "no answer entered" behavior
 2012-08-13 17:55:24 -07:00
ichuang
ae80ae0f62 Merge pull request #402 from MITx/kimth/generic-coderesponse 
Kimth/generic coderesponse
 2012-08-13 16:08:52 -07:00
kimth
afd78febfb Frontend queue polling doesn't render HTML until content changes 2012-08-13 19:07:44 -04:00
Bridger Maxwell
66d1259d4b Created copy of main.html that is django template. Using this for wiki instead of converting every view. 2012-08-13 19:07:41 -04:00
ichuang
a111a44da0 when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately should still work 2012-08-13 18:09:14 -04:00
kimth
9324ae3485 Merge branch 'master' into kimth/generic-coderesponse 2012-08-13 17:56:06 -04:00
ichuang
1b06f51fd8 fix customresponse be consistent with "no answer entered" behavior 2012-08-13 17:41:24 -04:00
Bridger Maxwell
0a9ad1a5f9 Added settings template. 2012-08-13 16:42:57 -04:00
jarv
9b7dd91997 Merge pull request #403 from MITx/jarv/update-create-dev 
adding maya to supported distro list for create-dev-env.sh
 2012-08-13 13:42:49 -07:00
John Jarvis
99f26e4ea8 adding maya to supported distro list for create-dev-env.sh 2012-08-13 16:40:46 -04:00
kimth
666c0bd56c Merge branch 'master' into kimth/generic-coderesponse 2012-08-13 16:26:27 -04:00
kimth
99e7711aca Generic CodeResponse XML (+ support for old ExternalResponse XML) 2012-08-13 15:48:33 -04:00
Victor Shnayder
276f22b965 remove debugging print stmt 2012-08-13 15:32:04 -04:00
Calen Pennington
a7b88550c7 Merge pull request #401 from MITx/feature/kfiedler/courseware-style 
Added tooltip styles, made all buttons the same, and other small changes...
 2012-08-13 12:29:48 -07:00
Calen Pennington
0297aff761 Merge pull request #400 from MITx/feature/victor/enrollment-windows 
add course enrollment windows
 2012-08-13 12:29:14 -07:00
Calen Pennington
76c4259c15 Merge pull request #399 from MITx/feature/fix_replication_side_effects 
Feature/fix replication side effects
 2012-08-13 12:25:42 -07:00
Kyle Fiedler
731f1cd7a8 Added tooltip styles, made all buttons the same, and other small changes throughout the courseware 2012-08-13 15:05:43 -04:00
Victor Shnayder
8716f88155 add course enrollment windows 
* if the course metadata have enrollment_start and/or enrollment_end,
  only allow normal users to enroll post start and pre end.
* If DARK_LAUNCH is on, staff can enroll outside the window
 2012-08-13 15:03:46 -04:00
Bridger Maxwell
ff1a0ba274 Added wiki create and create_root. Fixed some mitxmako bugs. 2012-08-13 14:25:11 -04:00
Victor Shnayder
add050593a address comment on #392 2012-08-13 14:23:41 -04:00
Victor Shnayder
706fd99cab Address comments on #394 2012-08-13 14:21:19 -04:00
David Ormsbee
c4d89cd535 One more test to make sure users are really being copied 2012-08-13 13:34:24 -04:00
David Ormsbee
a25f289ca7 re-enable User save signal handler 2012-08-13 13:16:33 -04:00
David Ormsbee
301695a5c4 Remove outdated comment 2012-08-13 13:11:27 -04:00
David Ormsbee
b5beb13964 Fix side-effect related problems with User replication. 
1. Multiple save()s on the same model are now handled properly. We
   had to unmark model objects after the appropriate signals had
   fired.
2. There was a side-effect where we were saving the portal User
   object to the course_db with the using kw param, but models
   remember where they were last saved to, so a later save on that
   model object would go to the wrong database.
 2012-08-13 13:06:35 -04:00
kimth
fe954ca1c7 Unbreak frontend polling 2012-08-13 10:46:01 -04:00
Calen Pennington
ecffe3e088 Merge pull request #389 from MITx/feature/tomg/fall-design 
Feature/tomg/fall design
 2012-08-13 07:35:45 -07:00
Tom Giannattasio
d5ef8d7c31 Merge branch 'feature/tomg/fall-design' of github.com:MITx/mitx into feature/tomg/fall-design 2012-08-13 10:27:59 -04:00
Tom Giannattasio
6a50da3d16 Merge branch 'master' into feature/tomg/fall-design 2012-08-13 10:26:28 -04:00
Tom Giannattasio
7b4cd3e4b3 added additional processing class 2012-08-13 10:20:54 -04:00
Calen Pennington
32924d8bfe Merge pull request #398 from MITx/kimth/partialgrading 
Partial scoring
 2012-08-13 07:19:50 -07:00
Tom Giannattasio
ee0cbf66f9 added a cleaner arrow implementation 2012-08-13 10:19:06 -04:00
Tom Giannattasio
4eefa73336 changed field border color 2012-08-13 10:19:06 -04:00
Tom Giannattasio
8b79d811d4 added spinner gif 2012-08-13 10:19:06 -04:00
Calen Pennington
95b7957491 Merge pull request #350 from MITx/arjun/javascript_response 
Adding a javascript-based response type
 2012-08-13 07:14:44 -07:00
kimth
1ff8e271f5 Partial scoring 2012-08-13 10:14:29 -04:00
Calen Pennington
801df37872 Merge remote-tracking branch 'origin/master' into arjun/javascript_response 
Conflicts:
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/module_render.py
 2012-08-13 10:13:21 -04:00
Calen Pennington
bd95c03d9b Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches 
Provide content QA (quality assessment) interface
 2012-08-13 06:55:05 -07:00
Calen Pennington
a3d7c4892d Merge pull request #397 from MITx/feature/server_split 
Model replication to course databases
 2012-08-13 06:39:03 -07:00
David Ormsbee
4ac7862975 Merge branch 'master' into feature/server_split 
Conflicts:
	lms/urls.py
 2012-08-13 09:21:02 -04:00
Calen Pennington
a984fbb65f Merge pull request #394 from MITx/feature/victor/hide-error-modules 
Hide errors from non-staff users
 2012-08-13 06:17:13 -07:00