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

10188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
03e79cc819 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-27 11:22:29 -05:00
Don Mitchell
da343fd1d7 Finally! Details unit tests work and pass. Grading ones are fairly far 
along.
 2012-12-27 11:22:15 -05:00
Diana Huang
f8a528f327 Merge branch 'master' into feature/diana/rubric-input 2012-12-27 10:47:15 -05:00
Chris Dodge
fe408be1cc message edit 2012-12-27 10:32:07 -05:00
Chris Dodge
7088821233 fix command error message. There are really only two arguments supported (the optional 6 had been removed, but I forgot to change the message 2012-12-27 10:30:26 -05:00
Chris Dodge
28d9827468 fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course 2012-12-27 10:20:28 -05:00
chrisndodge
9f04f19a1c Merge pull request #1205 from MITx/bug/dhm/dec12 
Bug/dhm/dec12
 2012-12-27 07:03:34 -08:00
Don Mitchell
83bc9d7bf8 Grader unit tests (partial) 2012-12-26 15:48:37 -05:00
Don Mitchell
8d9a221945 Delete not-yet-implemented file 2012-12-26 13:50:01 -05:00
Don Mitchell
88b2457c13 Bug 98: no unit tests b/c it's just text in hmtl 2012-12-26 11:47:42 -05:00
Don Mitchell
a35c1386f2 Bug 99: don't show date as 'Unset' but leave out altogether if not set 
plus commented out failing unit tests until I can get someone to help
debug them.
 2012-12-26 11:30:31 -05:00
Don Mitchell
58abb10c2d Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-26 10:31:10 -05:00
Don Mitchell
ff490599fa Debugging unit tests 2012-12-26 10:29:35 -05:00
Brian Talbot
c9e5c47b30 removed progress bar UI from export UI 2012-12-26 09:19:08 -05:00
Brian Talbot
ed3f3b02d6 studio - course export UI alpha - roughing in states/views 2012-12-26 09:10:05 -05:00
David Ormsbee
e4dff3f788 Merge pull request #1201 from MITx/feature/rocha/change-courses-layout 
Fix broken display of courses in university profile
 2012-12-21 13:40:08 -08:00
Carlos Andrés Rocha
1ac41787a7 Fix broken display of courses in university profile 2012-12-21 16:38:17 -05:00
David Ormsbee
bcb5eda222 Merge pull request #1190 from MITx/fix/alex/opendocs_linux 
Fix/alex/opendocs linux
 2012-12-21 12:24:04 -08:00
David Ormsbee
8532d79ea5 Merge pull request #1198 from MITx/feature/ichuang/update-tracking-log-sql-schema 
update schema for tracking sql logs - larger fields; add hostname
 2012-12-21 12:23:45 -08:00
David Ormsbee
5171fe6871 Merge pull request #1199 from MITx/fix/zoldak/test-logger-settings 
Remove logger setting override from test settings configuration file.
 2012-12-21 12:22:47 -08:00
David Ormsbee
241b4eb0fe Merge pull request #1196 from MITx/feature/rocha/change-courses-layout 
New Layout for course listings with new course graphical overlay
 2012-12-21 12:18:05 -08:00
Brian Talbot
e170afa927 test center registration - forgot to add/commit corresponding SASS file 2012-12-21 13:23:20 -05:00
Brian Talbot
45ed4a410c resolving merge conflict around test_center_register.html template 2012-12-21 13:22:31 -05:00
Brian Talbot
3bd8f408b5 test center registration - added final styling and label focus JS 2012-12-21 13:16:39 -05:00
Diana Huang
8bb9156389 Merge branch 'master' into feature/diana/rubric-input 2012-12-21 13:08:41 -05:00
Brian Talbot
3987120496 test center registration - further UI design and styling on form and dashboard tweaks 2012-12-21 13:04:22 -05:00
David Ormsbee
02151d39e8 Merge pull request #1200 from MITx/content/rocha/job-page-update 
Add Instructional Designer Job Post
 2012-12-21 10:01:55 -08:00
Carlos Andrés Rocha
4959dc6005 Add Instructional Designer Job Post 2012-12-21 11:44:45 -05:00
David Ormsbee
f43c93e1d8 Merge pull request #1189 from MITx/fix/rocha/login-redirect 
Fix django auth login redirection
 2012-12-21 08:20:18 -08:00
Carlos Andrés Rocha
8ac89c39a7 Use course metadata instead of setting attributes to display new course overlay 2012-12-21 11:12:21 -05:00
Jay Zoldak
3bbfb4851b Remove logger setting override from test settings configuration file. 2012-12-21 10:25:14 -05:00
ichuang
320f1b4141 update schema for tracking sql logs - larger fields; add hostname 2012-12-21 08:44:40 -05:00
Brian Wilson
2788ad8629 switch back to returning json to test_center_register template, and enable jquery handling in template. 2012-12-21 01:39:18 -05:00
Carlos Andrés Rocha
22de7cbb4e Add logic to display courses by start date and show the new overlay 2012-12-20 20:05:11 -05:00
Carlos Andrés Rocha
a0d1d98c92 Merge branch 'style/btalbot/homepage-courselistings' into feature/rocha/change-courses-layout 2012-12-20 17:45:19 -05:00
Don Mitchell
b65775c300 Merge pull request #1195 from MITx/feature/christina/misc 
Fix typo in Formula Response name (Studio #101).
 2012-12-20 14:15:01 -08:00
cahrens
37b83c1ecf Fix typo in Formula Response name (Studio #101). 2012-12-20 17:06:12 -05:00
Don Mitchell
866ce8d2ae Merge pull request #1194 from MITx/feature/christina/misc 
Feature/christina/misc
 2012-12-20 13:45:27 -08:00
David Ormsbee
ecc4d79f55 Merge pull request #1193 from MITx/content/rocha/new-courses-2013 
Correct some spring courses announcement information
 2012-12-20 12:39:32 -08:00
cahrens
91ce214964 Fix for Studio #96. 2012-12-20 14:59:21 -05:00
cahrens
90ce6967aa Fix for Studio #96. 2012-12-20 14:58:02 -05:00
Don Mitchell
90e12ff46b Merge pull request #1192 from MITx/feature/cdodge/clone-course 
implement course clone and delete functionality from the command line
 2012-12-20 11:29:49 -08:00
Carlos Andrés Rocha
3a4b626e62 Remove unused code from accounts login page 2012-12-20 14:19:06 -05:00
Chris Dodge
b40a8a3e9e implement course clone and delete functionality from the command line 2012-12-20 13:55:15 -05:00
Don Mitchell
43d1542977 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-20 13:43:09 -05:00
Don Mitchell
17a1e281b1 Unit tests now work!!! 2012-12-20 13:42:57 -05:00
Carlos Andrés Rocha
6ad6d348e6 Correct some spring courses announcement information 
[#41545421]
 2012-12-20 13:25:10 -05:00
Brian Talbot
76f6ee1877 test center - reorg of HTML - wip 2012-12-20 13:00:08 -05:00
Brian Talbot
5119257f3e test center - fixed dashboard link font issue and started cleaning up markup in reg form - wip 2012-12-20 12:24:31 -05:00
chrisndodge
a82113dc7e Merge pull request #1191 from MITx/bug/dhm/dec12 
Another bug for when the content for an update is more than one element.
 2012-12-20 08:51:42 -08:00