Commit Graph

7303 Commits

Author SHA1 Message Date
valera-rozuvan
7a8d83a17f Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c5cd67a6a5 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
f2cce07bd7 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
37c7967e8c Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
213ca3fa32 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
fd0ec0ed8a Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
de63541049 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
d0c72ebe16 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
8af93229d3 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
7cf848db9e Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c4f336d8fd Added RequireJS.js to the files.json config so that is it also loaded when testing with Jasmine. 2013-01-03 10:14:06 +02:00
valera-rozuvan
8f120f1d27 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c94530cb01 Added initial RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
62271fe5c6 Added namespaced RequireJS. 2013-01-03 10:14:06 +02:00
David Ormsbee
8bf393fbba Merge pull request #1182 from MITx/bridger/feature/ungraded_course
Visual changes for ungraded courses
2013-01-02 07:19:34 -08: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
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
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
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
Carlos Andrés Rocha
3a4b626e62 Remove unused code from accounts login page 2012-12-20 14:19:06 -05:00
Carlos Andrés Rocha
6ad6d348e6 Correct some spring courses announcement information
[#41545421]
2012-12-20 13:25: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
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
Brian Talbot
37e0d98fec course listings - new html and css for ordering - wip 2012-12-20 09:32:15 -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
Brian Talbot
4d13744622 added new visual status to course listings on edx.org 2012-12-19 16:56:32 -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
Calen Pennington
6905f7dfd1 Merge pull request #1183 from MITx/bug/dhm/ie7
Bug/dhm/ie7
2012-12-19 12:58:07 -08:00
Brian Talbot
4bcfa84519 adding zendesk logo for styling purposes 2012-12-19 14:25:59 -05:00
Bridger Maxwell
d911297670 The progress page now checks course.metadata.get(no_grade, False) to see if the course has a grade. 2012-12-19 12:47:43 -05:00
Bridger Maxwell
5a65c24507 Added parameters to hide grade totals and grade cutoffs in progress graph. 2012-12-19 12:37:02 -05:00
David Ormsbee
a53959a770 Merge pull request #1181 from MITx/content/rocha/new-courses-2013
Add news announcement for spring 2013 courses
2012-12-19 09:36:10 -08:00
David Ormsbee
ed051a50a2 Merge pull request #1180 from MITx/feature/rocha/google-analytics-on-registration
Add google analytics to model signup and login panels
2012-12-19 09:12:50 -08:00
David Ormsbee
4a283218ca Merge pull request #1179 from MITx/content/rocha/job-and-faq-update
Update jobs and faq page
2012-12-19 09:12:02 -08:00
Carlos Andrés Rocha
a239fe2ee7 Add google analytics to model signup and login panels
[# 40805407]
2012-12-19 12:07:34 -05:00
Carlos Andrés Rocha
6d85accad8 Add news announcement for spring 2013 courses
[# 41258693]
2012-12-19 11:49:55 -05:00