Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

814 Commits

Author SHA1 Message Date
Rocky Duan
5009b78150 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py
 2012-08-14 17:32:30 -07:00
Bridger Maxwell
9f770ef921 Visiting the wiki from a course you aren't in does a redirect to the regular wiki. 2012-08-14 19:16:45 -04:00
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
Rocky Duan
eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-14 12:54:43 -07: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
a2841af834 Added views for automatic course article creation. 2012-08-14 08:39:41 -04:00
Rocky Duan
1742775262 added configuration parameter to turn on / off discussion service 2012-08-13 15:35:19 -07:00
David Ormsbee
4ac7862975 Merge branch 'master' into feature/server_split 
Conflicts:
	lms/urls.py
 2012-08-13 09:21:02 -04:00
David Ormsbee
c6ed6fc066 Merge branch 'master' into feature/server_split 2012-08-13 00:36:31 -04:00
Victor Shnayder
d7f94a05b7 Add DARK_LAUNCH functionality 
* pass user to check_course
* if dark launch feature enabled, users with staff access to course
can see courseware before start date.  Students still can't.
* tests.
* Remaining: enrollment view has custom access control.  Need to check it.
 2012-08-12 16:23:31 -04:00
kimth
d41f709c92 Moved xqueue_callback URLs into the course 2012-08-10 18:51:35 -04:00
Bridger Maxwell
e462fad367 Converted wiki edit page and breadcrumbs. 2012-08-10 18:15:21 -04:00
Victor Shnayder
c9fd7b22a0 Add instructor dashboard 
* dashboard links to gradebook and dummy grade summary page
 2012-08-10 11:42:53 -04:00
Victor Shnayder
43d6948f02 Fix links to student profile pages from gradebook 2012-08-10 11:42:53 -04:00
Victor Shnayder
2005492f7f Remove noisy debug message 
* also adds a comment to lms/urls.py
 2012-08-10 11:41:05 -04:00
Bridger Maxwell
45baccae85 Added a django template loader that can return Mako templates. Started pulling in new wiki. 2012-08-10 11:31:29 -04:00
David Ormsbee
0d824c6c02 Move modx_dispatch URL calls into the course 2012-08-10 02:02:44 -04:00
Victor Shnayder
1c3038ff3a Make accordion remember state 
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
 2012-08-09 19:47:08 -04:00
Rocky Duan
65f849637f Merge branch 'ccp0101/moderation' into lol 
Conflicts:
	lms/urls.py
 2012-08-08 14:39:10 -04:00
Mike Chen
eaf8279451 Merge branch 'lol' of github.com:dementrock/mitx into ccp0101/moderation 
Conflicts:
	lms/urls.py
 2012-08-08 12:04:41 -04:00
Bridger Maxwell
14a35b9605 Upgrading to django 1.4. 2012-08-08 11:57:15 -04:00
Mike Chen
5e6261ebb1 courseware still not working.. 2012-08-08 11:30:11 -04:00
Rocky Duan
2fb02f1a73 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/urls.py
 2012-08-07 16:58:14 -04:00
Rocky Duan
0ae68e7324 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-06 22:38:31 -04:00
Bridger Maxwell
4fedca5bf9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
 2012-08-06 16:49:05 -04:00
Bridger Maxwell
2348f71cc6 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 
Conflicts:
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/views.py
 2012-08-06 11:48:42 -04:00
Bridger Maxwell
7f5246f653 Removed test view for grading. 2012-08-06 10:17:53 -04:00
ichuang
c42960c172 add feature ENABLE_SQL_TRACKING_LOGS and url view /event_logs 2012-08-05 16:32:58 -04:00
Rocky Duan
7c58fd27a1 Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/templates/profile.html
 2012-08-04 18:07:27 -04:00
ichuang
84ed806f0d start on lms migration path: view for loaded modules, and reload method 2012-08-03 20:20:35 -04:00
Bridger Maxwell
6d650d1825 Got the gradebook working again with the new fast grading method. 2012-08-03 17:55:25 -04:00
Calen Pennington
b1494da02c Merge pull request #330 from MITx/ExternalAuth 
External auth
 2012-08-03 13:18:55 -07:00
Bridger Maxwell
408e988fbc Started working on fast_grade method. It skips loading sections that a student doesn't have any answers for. 2012-08-03 11:41:06 -04:00
ichuang
dff380e807 cleanup lms urls (remove cruft from debugging openid) 2012-08-02 14:19:56 -04:00
Rocky Duan
de2f48b3bf Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-02 12:55:09 -04:00
David Ormsbee
73fb8f5464 Merge branch 'hotfix/1.0.3' 
Conflicts:
	lms/urls.py
 2012-08-02 11:51:50 -04:00
Calen Pennington
aa215bc316 Merge remote-tracking branch 'origin/hotfix/1.0.1' into hotfix/1.0.3 2012-08-01 15:59:06 -04:00
ichuang
10ebcefd54 add openid authentication 2012-08-01 14:59:55 -04:00
Rocky Duan
8228bebc2a Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
 2012-07-30 17:41:19 -04:00
Victor Shnayder
73b3826820 Initial integration tests! 
* new env file to run integration tests with mongo backend
  - needs askbot to get db in the right state
  - needs wiki to load pages successfully
  - not using migrations to make it run faster
* import test courses, check that each page loads without erroring.
* fix NonePointerException in index view to make tests pass
* misc formatting cleanups
 2012-07-27 16:09:25 -04:00
Victor Shnayder
3cc601b398 Clean up course_info views 
* catch exceptions and return a 404 if course not found
* add Location.is_valid(), tests
* stub of jumpto/ view.
 2012-07-27 16:08:23 -04:00
Piotr Mitros
c8b2b4d464 Miniture staff dashboard. Not really tested, but should be safe to merge 2012-07-27 10:14:07 -04:00
Rocky Duan
9d2bccbee7 Merge branch 'master' of github.com:MITx/mitx 2012-07-26 10:43:42 -04:00
Calen Pennington
73d6565fac Merge remote-tracking branch 'origin/hotfix/1.0.1' 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-26 09:05:57 -04:00
Rocky Duan
048deaa87f show news & options when submit comment 2012-07-25 18:16:57 -04:00
Rocky Duan
aab9f8dc1c make course id available in xmodule 2012-07-25 18:15:52 -04:00
Rocky Duan
fb408a99b5 add discussion app & url conf 2012-07-25 18:09:34 -04:00
Matthew Mongeau
bd9da89fe9 Move press articles to json. 2012-07-25 17:31:34 -04:00