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

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
0114366c36 settings - revised discussion settings UI to include standard discussion categories and adding new ones 2012-11-19 08:05:52 -05:00
Brian Talbot
bf4f678bde settings - revised faculty photo and syllabus states to either has or does not have 2012-11-19 07:38:59 -05:00
Brian Talbot
731ea22687 settings - added disabled states for course name/org/number 2012-11-19 07:19:13 -05:00
Carlos Andrés Rocha
57da84ef66 Update gates foundation press release 2012-11-19 06:14:08 -05:00
Carlos Andrés Rocha
cabbc8906a Add press release text and update news feed 
[#39636489 #39636491 #39636495 #39636903]
 2012-11-19 06:14:08 -05:00
Carlos Andrés Rocha
6326e4dc7e Add stub for Gates foundation announcement 
[#39636489 #39636491 #39636495 #39636903]
 2012-11-19 06:14:08 -05:00
Brian Wilson
8b1b63003b add listing forum moderator to instructor dash 2012-11-19 00:37:43 -05:00
ichuang
f84f08fae4 xml_importer bugfix - when importing without policy override use course_location 2012-11-17 21:38:15 -05:00
Victor Shnayder
71b585bb61 move unique_id_for_user into student/models.py 2012-11-17 16:33:00 -05:00
Victor Shnayder
61ddec46dd Use params from view in template. 2012-11-17 16:20:17 -05:00
Victor Shnayder
003dc7ef51 Get rid of check for non-existent CERTIFICATES_ENABLED flag... 2012-11-17 16:19:52 -05:00
Victor Shnayder
03dd7b375a get rid of submodule init--not needed post-askbot 2012-11-17 15:59:12 -05:00
Victor Shnayder
3a44f043d2 Add tests, make them pass. 2012-11-17 15:58:49 -05:00
Victor Shnayder
5bc0b4864a moving cert link and survey logic into views, adding tests. In-progress. 2012-11-17 15:24:38 -05:00
Brian Wilson
8f38f04b1f Merge remote-tracking branch 'origin/master' into feature/brian/dashboard-manage-mods 2012-11-16 21:23:42 -05:00
Brian Wilson
c9f7558d6d first pass at add/remove moderators 2012-11-16 18:34:26 -05:00
Calen Pennington
650f537763 Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests 
Make jasmine testing quieter
 2012-11-16 13:35:45 -08:00
Calen Pennington
3b2b8ad4fa Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests 
Capa Problem jasmine tests running independently
 2012-11-16 13:35:19 -08:00
Calen Pennington
719277876f Merge pull request #1051 from MITx/fix/cdodge/code-mirror-crash-on-style-blocks 
remove 'mode' property when creating a new CodeMirror control. This appe...
 2012-11-16 12:52:33 -08:00
Jay Zoldak
8d0abcb974 Merge branch 'feature/cale/cms-master' into feature/jzoldak/common-jasmine-tests 2012-11-16 15:10:19 -05:00
Jay Zoldak
ea4c0ed86a Refactor fixtures for capa problems. 2012-11-16 14:59:46 -05:00
Jay Zoldak
a10a3209aa Fix all but 4 broken tests. 2012-11-16 14:47:09 -05:00
Jay Zoldak
6ae0add931 Fix the new problem create statements in the describe blocks for the capa display spec. 2012-11-16 13:26:16 -05:00
Jay Zoldak
718ce4db28 Get Problem constructor working again, and copy the helper file from lms. 2012-11-16 13:02:38 -05:00
Don Mitchell
842bbe92d1 Everything tested and ready for Tom to fix 2012-11-16 12:53:49 -05:00
Don Mitchell
fbc48026f2 Hopefully the course-info changes I had made w/o link destruction 2012-11-16 12:51:31 -05:00
Brian Talbot
968b604b94 adding in datepicker functionality - wip 2012-11-16 12:25:06 -05:00
Brian Talbot
8918762493 roughed in all form fields - wip 2012-11-16 12:17:36 -05:00
Victor Shnayder
dd97392ecd Merge pull request #1047 from MITx/feature/jarv/cert-commands 
Django commands for certificates
 2012-11-16 08:03:00 -08:00
Brian Talbot
5b44a330d2 added and wired in SymbolSet font icon library assets 2012-11-16 09:32:09 -05:00
Brian Talbot
6f52fea09c added and wired in SymbolSet font icon library assets 2012-11-16 09:23:33 -05:00
Brian Talbot
74dec7f172 settings - wip 2012-11-16 09:14:18 -05:00
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
Chris Dodge
975d75c116 When importing a course, we need to set the 'display_name' on the static tab module from the course module's policy. This isn't ideal, but the static tab definition on disk does not encapsulate the tab's display name on the LMS - we have to take it from the course 2012-11-15 21:45:20 -05:00
Chris Dodge
2a35132b2a When importing a course, we need to set the 'display_name' on the static tab module from the course module's policy. This isn't ideal, but the static tab definition on disk does not encapsulate the tab's display name on the LMS - we have to take it from the course 2012-11-15 21:44:20 -05:00
Chris Dodge
9ae8558382 put htmlmixed.js and css.js includes in CMS base.html so that we can support html mode in CodeMirror 2012-11-15 20:35:45 -05:00
John Jarvis
9a12435f6b Removing print 2012-11-15 19:47:33 -05:00
John Jarvis
efaf39ea76 cleanup 2012-11-15 19:42:47 -05:00
John Jarvis
626e6c7e08 Addresses review comments 
* List of courses that have ended is now a generator
* Using db-aggregation to speed up query for tallies
 2012-11-15 19:05:28 -05:00
David Ormsbee
7c7ca3ff6b Merge pull request #1052 from MITx/feature/victor/actual-askbot-removal 
Removing Askbot
 2012-11-15 13:56:58 -08:00
Brian Talbot
6014a7a299 Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/btalbot/cms-settings 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-11-15 16:51:53 -05:00
Brian Talbot
4c220ea420 in progress discussion work 2012-11-15 16:45:16 -05:00
Jay Zoldak
bf6a147c85 Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc. 2012-11-15 15:43:39 -05:00
Chris Dodge
0be0889d9c in order to support CodeMirror mode of 'text/html' we also have to include 'htmlmixed.js' as well as 'css.js' from the CodeMirror distro 2012-11-15 15:21:40 -05:00
David Ormsbee
eff3a7c3c7 Batch together alter statements to minimize how long we lock the auth_users table 2012-11-15 14:55:21 -05:00
Brian Talbot
1a297674ce added in fields for problems and discussions portions of CMS settings 2012-11-15 14:31:16 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
Chris Dodge
39c33b42b2 remove 'mode' property when creating a new CodeMirror control. This appears to completely crash if the user puts in a <style ...> tag in the input. This was causing imported static tabs to not be editable 2012-11-15 13:56:42 -05:00
David Ormsbee
dbe7346aae Merge pull request #1050 from MITx/bridger/feature/progress_percent_fix 
Fixed redunant rounding of final grade percent, which was causing floating point weirdness.
 2012-11-15 10:29:24 -08:00
Bridger Maxwell
ba57e8a7a5 Fixed redunant rounding of final grade percent, which was causing floating point weirdness. 2012-11-15 13:24:19 -05:00