Commit Graph

10228 Commits

Author SHA1 Message Date
Brian Talbot
a3a0e8b5e5 studio - view header UI: unit page revamp WIP 2013-02-11 09:57:16 -05:00
Brian Talbot
0983df9463 studio - view header UI: added in initial markup for several pages WIP 2013-02-11 09:35:31 -05:00
Brian Talbot
1936b47ba5 studio - small display tweaks to setting form new/remove actions 2013-02-11 09:01:52 -05:00
Brian Talbot
5730cf45b7 studio - window class revamp 2013-02-11 08:57:34 -05:00
Brian Talbot
a5ccfc61cd studio - hiding footer links until we have copy/pages 2013-02-11 08:48:58 -05:00
Brian Talbot
ed15997259 studio - settings: grading revamp WIP 2013-02-11 08:48:01 -05:00
David Ormsbee
754493597d Merge pull request #1469 from MITx/feature/ichuang/fix-verbose-staff-debug
Fix "staff debug" so it only appears where useful, instead of everywhere
2013-02-10 22:10:53 -08:00
chrisndodge
de060a6085 Merge pull request #1477 from MITx/bugfix/dave/mmlans_check
Make type check for self.code a little more robust,
2013-02-10 16:12:32 -08:00
David Ormsbee
fb1e7f3dc1 Make type check for self.code a little more robust, give default val for mmlans so it's never undefined 2013-02-10 19:03:25 -05:00
David Ormsbee
f94df6e3f5 Merge pull request #1476 from MITx/fix/cdodge/mitx-feature-disallow-new-courses
quick hack to give some protection from unauthorized users from making n...
2013-02-10 13:53:00 -08:00
Chris Dodge
4f67c6c052 quick hack to give some protection from unauthorized users from making new courses. Make it so only is_staff people see the 'Create New Course' button. 2013-02-10 16:17:08 -05:00
David Ormsbee
9b6f8a3673 Merge pull request #1475 from MITx/feature/brian/pearson-exam
change missingExamSeriesCode to missingPartnerID
2013-02-09 08:08:37 -08:00
Brian Wilson
2a1c89bec5 change missingExamSeriesCode to missingPartnerID 2013-02-09 02:24:51 -05:00
David Ormsbee
80843c1561 Merge pull request #1463 from MITx/feature/brian/pearson-exam
Feature/brian/pearson exam
2013-02-08 11:07:15 -08:00
David Ormsbee
1e197df3c1 Merge pull request #1471 from MITx/victor/jobs-page
Posting lots of new jobs
2013-02-08 10:53:27 -08:00
chrisndodge
891e350a83 Merge pull request #1464 from MITx/bug/bug161
On first request for handouts, create the db record. (bug 160)
2013-02-08 10:49:01 -08:00
Brian Wilson
f51876da6a cosmetic changes 2013-02-08 13:42:54 -05:00
Brian Talbot
210086fed3 studio - settings: grading revamp WIP 2013-02-08 13:42:36 -05:00
Don Mitchell
2cdfed9efe Merge pull request #1472 from MITx/feature/christina/misc2
A couple minor bug fixes.
2013-02-08 10:15:11 -08:00
cahrens
98026e4325 A couple minor bug fixes.
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
2013-02-08 12:46:32 -05:00
Brian Talbot
1b679750ad studio - settings: more revamp of tabs to views WIP 2013-02-08 12:36:21 -05:00
Victor Shnayder
a68094515c fix capitalization and spacing 2013-02-08 12:33:19 -05:00
Victor Shnayder
83a4f40ac6 fix typo; fix phrasing for software engineer job 2013-02-08 12:24:07 -05:00
Victor Shnayder
61f5991885 Posting lots of new jobs 2013-02-08 12:15:09 -05:00
Jay Zoldak
0d0049ec76 Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional
fix test_conditional
2013-02-08 08:13:01 -08:00
chrisndodge
7244425996 Merge pull request #1467 from MITx/feature/cale/cms-no-collect-course-static
Make it so that cms doesn't try to run collectstatic on course content
2013-02-08 08:05:56 -08:00
ichuang
96d119965c limit staff debug verbosity to locations of specific categories 2013-02-08 10:52:03 -05:00
Calen Pennington
33a3d5dbb7 Make it so that cms doesn't try to run collectstatic on course content 2013-02-08 10:49:43 -05:00
Calen Pennington
dd4db0601f Remove generated files 2013-02-08 10:45:59 -05:00
Brian Talbot
dc07e7375f studio - settings: revamp of tabs to views WIP 2013-02-08 09:36:18 -05:00
Brian Wilson
ab6f383be1 support for Pearson test user 2013-02-08 03:05:28 -05:00
Brian Wilson
f1198b5f5f for starting pearson exam, just call jump_to() instead of reverse(jump_to...) 2013-02-08 02:15:45 -05:00
ichuang
7b7b0690b6 fix test_conditional 2013-02-07 18:19:48 -05:00
Brian Wilson
290368ef0d merge out from master 2013-02-07 17:40:54 -05:00
Don Mitchell
fa5537ab71 On first request for handouts, create the db record. (bug 160) 2013-02-07 17:09:57 -05:00
Christina Roberts
7f70637331 Merge pull request #1462 from MITx/bug/bug161
bug 171
2013-02-07 13:31:57 -08:00
Don Mitchell
48e582647c bug 171 2013-02-07 16:24:43 -05:00
Victor Shnayder
095ec9d3b9 Merge pull request #1457 from MITx/feature/cale/dev-staticfiles
Fix loads of local static files when running in dev mode
2013-02-07 13:23:30 -08:00
Brian Wilson
80e4944314 minor cleanup 2013-02-07 16:12:02 -05:00
Brian Wilson
2974b9eec3 Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam 2013-02-07 15:58:12 -05:00
Brian Wilson
cc11dc2aa3 switch to using timelimit module for Pearson test 2013-02-07 15:57:43 -05:00
Ned Batchelder
3ccbd504aa Pillow needs libjpeg-dev to build JPG support. 2013-02-07 15:20:42 -05:00
Don Mitchell
9f5eeaf815 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
Conflicts:
	cms/templates/settings.html
	cms/templates/widgets/header.html
2013-02-07 14:56:48 -05:00
Don Mitchell
31393043d0 More for that commit 2013-02-07 14:46:42 -05:00
Don Mitchell
9cd1162a60 Grading and details split out. Put the unimplemented tabs into a single
file not used.
2013-02-07 14:45:24 -05:00
Brian Talbot
ed42fa8830 studio - soft landing: revised page title structure and values 2013-02-07 14:23:00 -05:00
Brian Talbot
5b9609abf6 studio - soft landing: various fixes/tweaks 2013-02-07 14:09:47 -05:00
Brian Talbot
6d4cb558d3 lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav 2013-02-07 12:35:52 -05:00
Brian Talbot
fedd0aac9a studio - course nav: added in styling to account for stateful menus 2013-02-07 11:25:11 -05:00
David Ormsbee
1c07fae501 Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump
add instructor dashboard feature to download profile & problem state
2013-02-07 08:19:52 -08:00