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
Don Mitchell
683535d913
Another bug for when the content for an update is more than one element.
2012-12-20 11:09:10 -05:00
Alexander Kryklia
cc76e0518d
fix
2012-12-20 17:28:53 +02:00
Alexander Kryklia
4811e73645
enabled rake docs for ubuntu
2012-12-20 17:25:43 +02:00
chrisndodge
6ec046cefc
Merge pull request #1188 from MITx/bug/dhm/dec12
...
Implemented grader drop down on subsections
2012-12-20 06:58:42 -08:00
Brian Talbot
f92266d659
course listings - new html and css for ordering - finished sass changes and static markup example
2012-12-20 09:55:52 -05:00
Diana Huang
b98743eb8d
Merge branch 'master' into feature/diana/rubric-input
2012-12-20 09:38:05 -05:00
Brian Talbot
37e0d98fec
course listings - new html and css for ordering - wip
2012-12-20 09:32:15 -05:00
Brian Wilson
d5bd2313c1
fix migrations, removing one field and making another nullable. Update registration page to allow for editing only demographics.
2012-12-20 04:16:00 -05:00
Chris Dodge
0bf79eb587
append some character, in this case a '_', if the course number is really a full-on number. The Wiki library interprets this incorrectly - to date we've always used non-numerical values.
2012-12-19 20:54:43 -05:00
Carlos Andrés Rocha
5d85fab283
Fix django auth login redirection
...
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.
We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.
[#41499213 ]
2012-12-19 18:48:30 -05:00
Don Mitchell
d66f33956e
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
2012-12-19 17:31:30 -05:00
Don Mitchell
e37180e074
Generalized the grader drop down and applied to edit_subsection
2012-12-19 17:31:06 -05:00
Don Mitchell
14330ebc4a
Merge pull request #1187 from MITx/feature/christina/misc
...
Fix for Studio #87 , plus some cleanup.
2012-12-19 14:03:05 -08:00
Brian Talbot
4d13744622
added new visual status to course listings on edx.org
2012-12-19 16:56:32 -05:00
cahrens
61c19dbc70
Fix for Studio #87 , plus some cleanup.
2012-12-19 16:55:39 -05:00
Brian Wilson
ee99080687
add additional fields to testcenter user and update test center registration.
2012-12-19 16:53:13 -05:00
David Ormsbee
89527281e8
Merge pull request #1186 from MITx/content/rocha/new-courses-2013
...
Fix links for Software as a Service courses
2012-12-19 13:16:27 -08:00
David Ormsbee
65ec8ae056
Merge pull request #1185 from MITx/style/btalbot/edxsupportlogo
...
edX's Zendesk Logo
2012-12-19 13:15:26 -08:00
Carlos Andrés Rocha
b334394473
Fix links for Software as a Service courses
2012-12-19 16:13:17 -05:00
