Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,478 Commits 1 Branch 0 Tags
01ac01b62ca00ba99140ef4c32633935e68cb33f
Commit Graph

2602 Commits

Author SHA1 Message Date
David Ormsbee
01ac01b62c Re-enable change name, and fix up change email styles 2012-10-12 14:31:20 -04:00
David Ormsbee
96bdd03406 re-enable email change functionality 2012-10-12 09:54:47 -04:00
Victor Shnayder
bcf835532b Pass course_id instead of course to get_site_status_msg 
* makes testing easier -- don't need course objects
 2012-10-08 14:06:58 -04:00
Victor Shnayder
9e43664498 Add support for per-course site status. 
Now looks for a status_message.json file, looks for 'global' and ${course.id} keys. Return any global message and any course-specific message, joined by <br>.

fab files need to be updated to use this new format (new filename, possibly also help manage per-course messages, or at least test for valid json)
 2012-10-07 23:09:26 -04:00
Victor Shnayder
36917b0036 Merge pull request #829 from MITx/feature/tomg/ie-banner 
added ie warning banner to courseware; displayed by ie conditional style...
 2012-10-05 13:53:15 -07:00
Victor Shnayder
4fd530dbac fix python syntax in template for adding google analytics 2012-10-05 11:49:17 -04:00
Tom Giannattasio
1804d5410c fixed ie banner showing outside of courseware bug 2012-10-04 15:50:02 -04:00
Tom Giannattasio
49bd3ac905 added ie warning banner to courseware; displayed by ie conditional stylesheet 2012-10-04 15:34:50 -04:00
Tom Giannattasio
69f8734893 changed vote button icon display mode to fight zoom bugs 2012-10-04 14:09:01 -04:00
Calen Pennington
41b0eb9df4 Merge pull request #824 from MITx/feature/tomg/google-analytics 
added google analytics to all pages without a course object
 2012-10-04 07:54:29 -07:00
Victor Shnayder
5b79352aba Merge pull request #806 from MITx/feature/rocha/support-additional-video-sources 
Add support for video download link
 2012-10-03 17:15:46 -07:00
Tom Giannattasio
33378bbafd added google analytics to all pages without a course object 2012-10-03 19:33:12 -04:00
Victor Shnayder
b2cc462562 Merge pull request #812 from MITx/feature/victor/status-banner 
Firefox bug fix
 2012-10-03 08:04:39 -07:00
Tom Giannattasio
a15ef161a9 ff bug fix 2012-10-03 10:59:24 -04:00
Victor Shnayder
227cc58d30 fix a bug: can_load() should check for the 'load' permission. 
- triggered by anon users when all courses have started (or start dates are off).
 2012-10-02 18:59:04 -04:00
David Ormsbee
13c8cbf5af Merge pull request #807 from MITx/feature/victor/status-banner 
Feature/victor/status banner
 2012-10-02 14:19:36 -07:00
Victor Shnayder
f4623bf155 address comments on #807 2012-10-02 17:17:15 -04:00
Victor Shnayder
2f30a717a5 only display site status inside the courseware 2012-10-02 16:54:03 -04:00
David Ormsbee
13bfbc820d Prevent caching of block showing top status bar (used for system alert notifications). 2012-10-02 16:38:28 -04:00
Carlos Andrés Rocha
f357e90dc0 Add support for video download link 
Add a download link to the video player. The link is defined in the
content xml using the following structure:

<video youtube="youtubestring">
  <source src="video_link"/>
</video>
 2012-10-02 14:23:31 -04:00
Tom Giannattasio
671f2af387 added image 2012-10-02 13:39:42 -04:00
Tom Giannattasio
18a66a0b9c styled site status banner 2012-10-02 13:36:36 -04:00
Victor Shnayder
8ad1e7fba1 Add framework for a site status banner. 
- still needs style
- will cache for 10 seconds
 2012-10-02 11:48:16 -04:00
Calen Pennington
258a210556 Don't ignore .py files in static files dirs 2012-10-02 11:04:43 -04:00
Tom Giannattasio
1870db5fb1 fixed custom tab box-sizing glitch in firefox 2012-10-01 10:09:56 -04:00
David Ormsbee
cd0991469e Merge pull request #786 from MITx/feature/tomg/moderator-tag 
added moderator label styles
 2012-09-30 19:10:19 -07:00
David Ormsbee
1c823b375c Merge pull request #790 from MITx/feature/bridger/max_grade_cache_fix 
Fix to update the max_grade cache on StudentModule
 2012-09-30 19:08:50 -07:00
Victor Shnayder
af6dd84af0 Merge pull request #789 from MITx/feature/bridger/course_grading 
Feature/bridger/course grading
 2012-09-30 11:52:36 -07:00
Bridger Maxwell
fd43e94318 If an problem was updated and had a new max score it wasn't recached. Now it is fixed. 2012-09-28 23:38:49 -04:00
Bridger Maxwell
fc73916e05 Removed django.conf.settings dependency from graders. 2012-09-28 23:14:55 -04:00
kimth
7750bb471c Merge pull request #788 from MITx/bug/tomg/new-collapsibles 
Added HTML and Problem collapsibles
 2012-09-28 10:03:50 -07:00
Tom Giannattasio
04119cce3f remove collapsible from problem template 2012-09-28 12:37:25 -04:00
Calen Pennington
1977b42d5b Merge pull request #783 from MITx/feature/rocha/update-jobs-page 
Remove Fellow and Course Manager positions from the jobs page
 2012-09-28 09:09:32 -07:00
Calen Pennington
8838c50f0d Merge pull request #770 from MITx/feature/dave/progress_reverse_quickfix 
Put tests to check ordering of scores returned on progress page.
 2012-09-28 05:56:56 -07:00
Tom Giannattasio
10227e8cdf added moderator label styles 2012-09-28 07:27:57 -04:00
Carlos Andrés Rocha
70b91813a9 Remove Fellow and Course Manager positions from the jobs page 2012-09-27 19:29:42 -04:00
David Ormsbee
7a6eedb3f1 Make it so we don't require HTTP basic auth to talk to the queue server 2012-09-27 19:02:34 -04:00
kimth
8210bfdff5 Remove vestigial js include 2012-09-26 19:51:04 -07:00
Carlos Andrés Rocha
ed3d944371 Fix display of email address on 404 pages 2012-09-26 13:35:48 -04:00
Carlos Andrés Rocha
52bde562ce Correct Terms of Use and Privacy static pages 2012-09-26 13:19:33 -04:00
Carlos Andrés Rocha
e05c7be1ab Update Terms of Use and Privacy static pages 2012-09-26 10:42:08 -04:00
ichuang
35569d1086 Merge pull request #731 from MITx/feature/ichuang/symmath_improvements 
improvements in symbolic math checking.

Merging now because it is needed for Physics courses.
 2012-09-25 19:36:02 -07:00
David Ormsbee
305dcfc4e9 Put tests to check ordering of scores returned on progress page. 2012-09-25 12:54:06 -04:00
Calen Pennington
d0cfd16bfa Merge pull request #769 from MITx/feature/rocha/elsevier-press-release 
Fix news and announcements icons on the frontpage
 2012-09-25 07:39:19 -07:00
Calen Pennington
0c6a6a6e53 Merge pull request #750 from MITx/feature/cale/cms-save-validation 
Feature/cale/cms save validation
 2012-09-25 07:34:09 -07:00
Carlos Andrés Rocha
52a9bd2d1e Fix news and announcements icons on the frontpage 2012-09-25 10:33:38 -04:00
Calen Pennington
2554413291 Hook up link to create modules from templates 2012-09-25 10:10:44 -04:00
Carlos Andrés Rocha
17820fef3b Made small correction to Elseview announcement on front page 2012-09-25 09:41:50 -04:00
Carlos Andrés Rocha
7fd6e0e23f Change subtitle of Elsevier announcement on the frontpage 2012-09-25 09:41:50 -04:00
Carlos Andrés Rocha
a948c13496 Resize images for the news feed on the frontpage 2012-09-25 09:41:50 -04:00