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

643 Commits

Author SHA1 Message Date
Rocky Duan
97f1e2f5e4 removed debug line 2012-08-14 16:39:22 -07:00
Rocky Duan
eef24a5ebe added administrator role 2012-08-14 15:58:04 -07:00
Rocky Duan
529c323771 fixed bug caused by missing course_id in retrieved comments 2012-08-14 15:57:02 -07:00
Rocky Duan
50e95de9ef a place to start for the user profiel & fixed some bugs 2012-08-14 15:04:36 -07: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
Rocky Duan
3c32aff123 disable asc sorting for now 2012-08-14 12:50:22 -07:00
Rocky Duan
0992be3749 make top sort by last_activity_at for now 2012-08-14 12:45:22 -07:00
Rocky Duan
49e840d62b adjust new post button in forum view 2012-08-14 12:43:15 -07:00
Rocky Duan
dd4f89638d hide empty brackets when not filtering through tags 2012-08-13 16:38:18 -07:00
Rocky Duan
62bc1aaef7 make following and recent tags display actual things 2012-08-13 16:32:08 -07:00
Rocky Duan
2dde3b00d5 removed edit button in the bottom bar 2012-08-13 16:23:32 -07:00
Rocky Duan
1742775262 added configuration parameter to turn on / off discussion service 2012-08-13 15:35:19 -07:00
ichuang
a111a44da0 when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately should still work 2012-08-13 18:09:14 -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
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
Tom Giannattasio
ee0cbf66f9 added a cleaner arrow implementation 2012-08-13 10:19:06 -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
Rocky Duan
12897ffff0 added title & tag for new post & fixed error handling; reply button in generated thread doesn't work 2012-08-12 22:54:02 -07:00
David Ormsbee
0aad62d6a8 Remove extra braces that were causing mako syntax errors 2012-08-13 00:48:35 -04:00
Rocky Duan
322828fbff removed unnecessary template 2012-08-12 16:41:16 -07:00
Rocky Duan
44f7b37bfb refactored comment_client working 2012-08-12 12:56:55 -07:00
ichuang
656a162aba allow xqa server url to be set by MITX_FEATURES['USE_XQA_SERVER'] 2012-08-12 12:43:08 -04:00
ichuang
453d623b43 use mitx content-qa central server for staff_problem_info 2012-08-11 23:42:39 -04:00
ichuang
da64c8f0a1 add xqa interface to staff_problem_info, make staff_debug a modal 
window, add xqa modal window, add xqa_key to course metadata
 2012-08-11 20:12:37 -04:00
Rocky Duan
2d256dfe1d attempt to fix sort 2012-08-11 16:35:34 -07:00
Rocky Duan
7030d1f1a2 fixed endorse&edit&delete 2012-08-11 14:38:37 -07:00
Rocky Duan
39590116f7 make some indentation 2012-08-10 18:51:12 -07:00
Rocky Duan
ab6cf914a0 Merge branch 'brittany' of github.com:dementrock/mitx into lol 
Conflicts:
	lms/templates/discussion/_thread.html
 2012-08-10 17:59:19 -07:00
Brittany Cheng
f44358ab78 merge tom's styles 2012-08-10 17:52:07 -07:00
ichuang
b159eb4825 add feature flag to disable login button (for systems which autologin) 2012-08-10 15:57:41 -04:00
Victor Shnayder
38a89e9f1a Make courseware navigation work again. 
* bodyclass block got accidentally deleted
 2012-08-10 14:51:47 -04:00
Calen Pennington
310788ca08 Merge pull request #384 from MITx/feature/tomg/fall-design 
fixed course name title bar bug
 2012-08-10 10:05:59 -07:00
Tom Giannattasio
c6d5d4aaae fixed instructor tab active state 2012-08-10 11:42:54 -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
1903a66bea Style cleanup in gradebook 
* don't display thousands of '%' characters
* s/percentage/fraction/, since that's what it is
 2012-08-10 11:42:53 -04:00
Tom Giannattasio
022c65a6b4 fixed class name header bug 2012-08-10 11:40:16 -04:00
Calen Pennington
1f1a87d970 Merge pull request #379 from MITx/feature/victor/keep-accordion-state 
Make accordion remember state
 2012-08-10 07:15:57 -07:00
Calen Pennington
e29feb089a Merge pull request #377 from MITx/feature/tomg/fall-design 
wayfinding style changes
 2012-08-10 05:51:50 -07: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
Tom Giannattasio
ced521c17d cleaned up textbook nav styles 2012-08-09 14:44:50 -04:00
David Ormsbee
b78c038bf2 Merge pull request #375 from MITx/dormsbee/new_jobs 
Dormsbee/new jobs
 2012-08-09 10:00:14 -07:00
Tom Giannattasio
3d3ee02e52 started textbook nav styles 2012-08-09 12:16:13 -04:00
David Ormsbee
775ddf6fcc Add updated jobs descriptions for content related positions 2012-08-09 12:11:37 -04:00
Tom Giannattasio
e82582e329 added course name to global nav bar 2012-08-09 11:17:26 -04:00
Tom Giannattasio
5c14a1ce65 added admin controls to main post and comments 2012-08-08 16:42:19 -04:00
Bridger Maxwell
3930dabdc9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 2012-08-08 16:00:22 -04:00
Tom Giannattasio
9b9bb22cda tightened white space; fixed double margin in comments 2012-08-08 14:36:19 -04:00
Matthew Mongeau
bcdcd7341f include courseware js 2012-08-08 14:13:34 -04:00
Matthew Mongeau
0b03834f51 XML based table of contents for books. 2012-08-08 14:13:20 -04:00