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

4290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
272c7b8b0c Merge branch 'master' into merge 2012-08-07 16:49:54 -04:00
Rocky Duan
2685a3b637 trending tags 2012-08-07 16:41:01 -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
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
Brittany Cheng
e1a564108b Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 15:41:29 -04:00
Rocky Duan
5309592f01 scaffold for recent active posts 2012-08-07 15:40:36 -04:00
ichuang
165ffe0a4d Merge pull request #362 from MITx/ichuang/minor-disable-django-debug-dev-ike 
disable diajgo debug toolbar on mit server (dev_ike.py)
 2012-08-07 12:32:52 -07:00
ichuang
8bbf433479 disable diajgo debug toolbar on mit server (dev_ike.py) 2012-08-07 15:10:00 -04:00
Calen Pennington
d558e3a43f Merge pull request #361 from MITx/feature/disable_staff_course_check_in_dev 
Feature/disable staff course check in dev
 2012-08-07 12:05:08 -07:00
David Ormsbee
f4138cae70 re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use ACCESS_REQUIRE_STAFF_FOR_COURSE 2012-08-07 15:01:12 -04:00
David Ormsbee
fbd813ae3b disable ENABLE_LMS_MIGRATION in dev mode, so courses are always displayed 2012-08-07 14:55:59 -04:00
Brittany Cheng
39dc6a63da cleanup css 2012-08-07 14:41:28 -04:00
Calen Pennington
a237322b70 Merge pull request #359 from MITx/ichuang/minor-fix-edit-link 
change edit link showhide to use <a> instead of <input> type submit
 2012-08-07 11:40:31 -07:00
ichuang
9d2b821c26 change edit link showhide to use <a> instead of <input> type submit 
(fixes issues with edit links in multipart problems and video)
 2012-08-07 14:34:28 -04:00
Brittany Cheng
ed8595ad95 error styles 2012-08-07 14:31:04 -04:00
Brittany Cheng
7962813014 info styles 2012-08-07 13:53:57 -04:00
Brittany Cheng
49840933c0 error handling 2012-08-07 13:48:43 -04:00
Calen Pennington
9cba2232d5 Run all tests all the way through before quitting on errors 2012-08-07 13:32:58 -04:00
thomasxiii
258b9eb530 Merge pull request #349 from MITx/feature/kfiedler/courseware-style 
A bunch of various fixes and de-styling
 2012-08-07 10:20:10 -07:00
Rocky Duan
dbb467365b fixed error field for new post 2012-08-07 12:08:38 -04:00
Rocky Duan
aeb2d73cba Merge branch 'discussion3' of github.com:dementrock/mitx 2012-08-07 12:05:52 -04:00
Rocky Duan
a9b171c81f Merge branch 'discussion3' of github.com:dementrock/mitx 
Conflicts:
	lms/static/coffee/src/discussion/templates.coffee
 2012-08-07 12:05:46 -04:00
Brittany Cheng
391d173018 similar posts styles 2012-08-07 12:05:01 -04:00
Rocky Duan
0560bb7eb7 add hide similar post button 2012-08-07 12:03:41 -04:00
Calen Pennington
96252aea80 Merge pull request #358 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-07 09:01:41 -07:00
Kyle Fiedler
dd6ec19e80 Make the modal window work in the courseware 2012-08-07 11:59:49 -04:00
Brittany Cheng
4b9358fb72 similar posts styles 2012-08-07 11:55:31 -04:00
kimth
05646fbed7 Provide default xqueue in ModuleSystem 2012-08-07 11:54:09 -04:00
kimth
a9a19f40c3 Merge master 2012-08-07 11:51:44 -04:00
ichuang
c79da58175 add documentation on rake + unit tests 2012-08-07 11:48:01 -04:00
kimth
b6dc622e42 Remove temporary datetime 2012-08-07 11:43:00 -04:00
Rocky Duan
0863e34619 display actual username 2012-08-07 11:40:58 -04:00
kimth
c39edb650b StudentModule lookups in queue callback use target user, rather than request.user 2012-08-07 11:38:04 -04:00
Brittany Cheng
5bec964606 Merge branch 'master' of github.com:dementrock/mitx into discussion3 2012-08-07 11:36:34 -04:00
Rocky Duan
547114a823 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-07 11:31:26 -04:00
kimth
501f2ccf14 CodeResponse uses 'is_file' helper function 2012-08-07 11:30:21 -04:00
Rocky Duan
6c2f53a495 to make it appear at least normal.. 2012-08-07 11:28:52 -04:00
Rocky Duan
25c05e702e Merge branch 'brittany' of github.com:dementrock/mitx 2012-08-07 11:23:19 -04:00
Rocky Duan
0c311b8f13 search for similar posts without any styling.. 2012-08-07 11:22:41 -04:00
kimth
f6202e5631 Tests provide xqueue params, rather than ModuleSystem.__init__ 2012-08-07 11:16:48 -04:00
Brittany Cheng
1fb0e352b4 blank slate 2012-08-07 11:10:24 -04:00
Calen Pennington
e847bae267 Merge pull request #344 from MITx/feature/victor/file-per-descriptor 
Feature/victor/file per descriptor
 2012-08-07 08:09:59 -07:00
Victor Shnayder
b4e400ba56 Make tests pass again again 
* Move lazyproperty decorator into xmodule so it's accessible during tests
* add default xqueue to test system
 2012-08-07 11:08:56 -04:00
Victor Shnayder
932a9be747 Make tests pass again 
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
 2012-08-07 11:06:47 -04:00
Victor Shnayder
55edb1ef32 always export metadata in alphabetical order 2012-08-07 11:06:47 -04:00
Victor Shnayder
47b9441af5 a few pep8 cleanups 2012-08-07 11:06:47 -04:00
Victor Shnayder
5523c2883e Generate error module url_names using sha1 
* means we get the same url_name on each import of the same data.
 2012-08-07 11:06:47 -04:00