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

1676 Commits

Author SHA1 Message Date
Bridger Maxwell
3f4c4d7487 Got most of the wiki article page working. It shows the article menu now. 2012-08-10 14:46:53 -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
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
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
Mike Chen
2fae27d582 temporarily disable trending and active if no such data is passed to template. 2012-08-09 12:05:19 -04:00
Mike Chen
b449334462 generate permanent link for thread/comment on client side 2012-08-09 12:04:38 -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
Mike Chen
b06e31d2ed fix Close Thread showing for students and empty bracket in search bar 2012-08-08 14:51:49 -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
Calen Pennington
7facb262fc Remove openid link when feature is disabled. https://www.pivotaltracker.com/story/show/34090805 2012-08-08 14:10:05 -04:00
Brittany Cheng
3ec658df56 merge tom's styles, warning: LOTS OF STUFF BROKE 2012-08-08 12:45:40 -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
Mike Chen
5e6261ebb1 courseware still not working.. 2012-08-08 11:30:11 -04:00
Mike Chen
8627a5f33e Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-08 11:20:13 -04:00
Tom Giannattasio
10ff6af3bb discussion sidebar additions; inline text editor example 2012-08-08 10:56:59 -04:00
Rocky Duan
2e45b8c3c6 Merge branch 'ccp0101/moderation' into lol 2012-08-08 10:46:11 -04:00
Rocky Duan
b1e1cd57d8 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-08 10:45:04 -04:00
Rocky Duan
18fcdc4be2 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-08 10:44:24 -04:00
Mike Chen
b2a048e6fc limit permissions of a role to courses and fix bugs 2012-08-08 10:42:29 -04:00
Rocky Duan
f1dabe1575 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol 2012-08-07 18:55:34 -04:00
Rocky Duan
f3d44225cc Merge branch 'brittany' of github.com:dementrock/mitx into brittany 2012-08-07 18:51:18 -04:00
Mike Chen
e9c970e399 revert permanent link for comments 2012-08-07 18:45:26 -04:00
ichuang
9241841195 improve staff_problem_info jquery, so the histogram is also toggled 2012-08-07 18:36:04 -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
Brittany Cheng
67777ef5a2 left nav styles 2012-08-07 16:52:32 -04:00
Rocky Duan
272c7b8b0c Merge branch 'master' into merge 2012-08-07 16:49:54 -04:00
Brittany Cheng
8df3ec3dae Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:42:45 -04:00
Rocky Duan
2685a3b637 trending tags 2012-08-07 16:41:01 -04:00
Brittany Cheng
a2f0e31d90 Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:21:24 -04:00
Brittany Cheng
9ae21a878a recent activity 2012-08-07 16:21:19 -04:00
Rocky Duan
fddee7defa Merge branch 'brittany' of github.com:dementrock/mitx 
Conflicts:
	lms/templates/discussion/_recent_active_posts.html
 2012-08-07 16:19:10 -04:00
Brittany Cheng
d934142adf Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:16:32 -04:00
Rocky Duan
7ba3bdfd61 show recently active posts user's following 2012-08-07 16:16:23 -04:00
Rocky Duan
6023aca559 scaffold for trending tags 2012-08-07 16:15:43 -04:00
Brittany Cheng
338a6788c8 recent activity 2012-08-07 16:11:24 -04:00