Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,549 Commits 1 Branch 0 Tags
2f55583ee7100b1bfb0ea0dfa1fd383ea33df46b
Commit Graph

1254 Commits

Author SHA1 Message Date
Chris Dodge
71f16d40e1 wire through course asset path information to the video playback module and corresponding .coffee files 2012-11-26 11:19:51 -05:00
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
Bridger Maxwell
ba57e8a7a5 Fixed redunant rounding of final grade percent, which was causing floating point weirdness. 2012-11-15 13:24:19 -05:00
David Ormsbee
1ab7019607 Merge pull request #1044 from MITx/feature/brian/press-updates 
Feature/brian/press updates
 2012-11-14 10:01:16 -08:00
Brian Wilson
08d9cd7e79 clean up commented-out links on main page 2012-11-14 12:01:04 -05:00
Brian Wilson
515d2f4b1e add press mentions for October, update missing logos, and add sorting. 2012-11-14 11:55:08 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
 2012-11-13 10:22:42 -05:00
Brian Wilson
f9f5850a55 update press page mentions through September, and home page pointers for early November. 2012-11-12 23:14:20 -05:00
Arjun Singh
5f97533caa add meta tag for google verification 2012-11-12 13:52:58 -08:00
Vik Paruchuri
d5702fc712 Add in ability to define score points 2012-11-12 14:19:04 -05:00
Victor Shnayder
6a313fd562 more css tweaks 2012-11-12 13:17:26 -05:00
Victor Shnayder
0ad2154b86 merge in origin/master 2012-11-12 13:10:21 -05:00
Victor Shnayder
4922ab33c0 hook up reset button 2012-11-12 12:43:55 -05:00
Victor Shnayder
0ec7043e05 mostly working version of self-assessment 
TODO:
* better css
* green checkmark
* reset button
* tests
 2012-11-12 12:14:12 -05:00
John Jarvis
1e956d448f Do not display the grade when student is not passing 2012-11-10 02:18:59 -05:00
Carlos Andrés Rocha
5f5f56bbbd Fix syntax on dashboard template 2012-11-09 21:40:55 -05:00
Carlos Andrés Rocha
8c2cbede9e Quickfix to render the dashboard when there is no certificate db tables 2012-11-09 20:58:02 -05:00
Victor Shnayder
c27913c505 bugfixes in template 2012-11-09 18:18:37 -05:00
Victor Shnayder
ca9cb86a7d show proper course will-start/started/ended text on dashboard 2012-11-09 18:18:37 -05:00
Victor Shnayder
21c30002b1 fix syntax in template 2012-11-09 18:18:37 -05:00
Victor Shnayder
cf33d85ef9 Wire up cert status 2012-11-09 18:18:36 -05:00
Brian Talbot
c6bfb67b1a revised no certificate state for dashboard messages and removed course message UI for future work on separate branch 2012-11-09 18:18:36 -05:00
Brian Talbot
d155869f16 added in course-wide completion message static states and styling 2012-11-09 18:18:36 -05:00
Brian Talbot
be13bc6026 added in completed course status to dashboard and certificate availability states 2012-11-09 18:18:36 -05:00
Victor Shnayder
fb3b52b99f refactor + style self-assessment in progress 2012-11-08 18:01:09 -05:00
Calen Pennington
171e932266 Merge branch 'master' into feature/cale/cms-master 
Conflicts:
	rakefile
 2012-11-08 12:28:40 -05:00
chrisndodge
e3d65a0c08 Merge pull request #997 from MITx/feature/cale/js-tests 
Feature/cale/js tests
 2012-11-08 06:44:49 -08:00
Carlos Andrés Rocha
25d482099e Merge pull request #955 from MITx/louis/srt_downloads 
Add support for subtitle download link
 2012-11-07 15:31:02 -08:00
Victor Shnayder
e3c213dd38 Refactor html and js. 
Next:
  - more clear states (logic in python, view in js)
  - style
 2012-11-07 18:18:35 -05:00
Chris Dodge
87ff18dc56 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-11-07 09:35:21 -05:00
Calen Pennington
bca0134a35 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-06 16:13:31 -05:00
Chris Dodge
55c69a1e13 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 
Conflicts:
	lms/djangoapps/courseware/module_render.py
 2012-11-06 14:20:59 -05:00
Calen Pennington
6212507b55 Merge pull request #1008 from MITx/ie8patch 
merge to master
 2012-11-06 06:18:01 -08:00
Vik Paruchuri
88491f7bb1 moved everything to templates, added hint prompt 2012-11-05 19:13:48 -05:00
Vik Paruchuri
dfbfc7905f Work on templating, bugfix 2012-11-05 18:48:41 -05:00
Vik Paruchuri
e94a78c6bb Refactor code to make it simpler, pull out templates 2012-11-05 18:42:55 -05:00
Don Mitchell
7f4bb63dff Final ie8 fixes hopefully. Now renders correctly for staff. Moved the 
debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.
 2012-11-05 13:55:09 -05:00
Carlos Andrés Rocha
31d3144532 Remove openings from job page 2012-11-05 10:23:58 -05:00
Don Mitchell
afabb4ab16 Don't call fn before defined. [ie8 is only browser which seems to care.] 2012-11-02 14:25:25 -04:00
Calen Pennington
0bfa443520 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-02 11:09:19 -04:00
Carlos Andrés Rocha
32498f3468 Remove learning designer and producer openings from job page 2012-11-01 13:21:40 -04:00
David Ormsbee
8a453e99ca Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view. 2012-11-01 04:37:16 -04:00
David Ormsbee
5223e9d3ca Merge pull request #995 from MITx/features/rocha/google-analytics-for-course-pages 
Add google analytics to course info pages
 2012-10-30 13:48:36 -07:00
Carlos Andrés Rocha
8ec2c34ea5 Add google analytics to course info pages 2012-10-30 16:05:06 -04:00
Carlos Andrés Rocha
376dcb7982 Correct job description item 2012-10-30 15:44:28 -04:00
Calen Pennington
684b98505d Make rake commands to run jasmine tests in browser and via phantomjs 2012-10-30 10:41:02 -04:00
Chris Dodge
206b1e26d3 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-10-26 10:02:45 -04:00
Chris Dodge
ba15735214 implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff 2012-10-25 14:27:26 -04:00
Carlos Andrés Rocha
2db84a757e Update to learning designer job description 2012-10-25 12:43:57 -04:00
Calen Pennington
f19ec64659 Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment 2012-10-25 10:47:41 -04:00