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

15870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
d61e4e50ec edx.org: abstracting new edx.org button extends and colors with other themes in mind 2013-07-29 10:21:54 -04:00
Brian Talbot
049794463a edx.org: revising base link color variable to use darker value for accessibility 2013-07-29 10:21:54 -04:00
Brian Talbot
76b0a03bc2 edx.org: revises iframe-based register/status buttons to match revised styles 2013-07-29 10:21:54 -04:00
Brian Talbot
10964eec88 edx.org: handles letter-spacing on buttons 2013-07-29 10:21:54 -04:00
Brian Talbot
69c792f5e9 edx.org: applies edx.org visual changes (with overrides/new mixins) 2013-07-29 10:21:53 -04:00
Brian Talbot
71c3f5e5a7 edx.org: adds in variables/mixins to support edx.org visual changes 2013-07-29 10:21:53 -04:00
Christina Roberts
166aea62bb Merge pull request #341 from edx/talbs/studio-authorship 
Studio: Authorship Rights Request UI + Dashboard Clean-up
 2013-07-26 03:59:07 -07:00
Brian Talbot
8a715c1a16 Studio: using defined red color variables for error-based system messages 2013-07-25 17:09:57 -04:00
Sarina Canelake
b143de1f99 Merge pull request #502 from edx/sarina/fix-discussion-acceptance 
Fix failing acceptance test
 2013-07-25 13:23:27 -07:00
Sarina Canelake
50d35b30b1 Fix failing acceptance test 2013-07-25 14:56:22 -04:00
David Baumgold
a90d7b5dbb Merge pull request #491 from edx/lettuce-improvements 
Misc improvements to make lettuce testing a bit saner
 2013-07-25 11:37:50 -07:00
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00
Calen Pennington
c6b5178261 Merge pull request #498 from edx/cale/make-the-service-variant-flag-on-manage.py-longform-only 
Make the service-variant flag on manage.py longform only
 2013-07-25 09:38:24 -07:00
cahrens
628994daf1 i18n "Create a New Course". 2013-07-25 12:25:06 -04:00
cahrens
60d60de2c4 Use format for strings instead of %. 2013-07-25 12:21:17 -04:00
ihoover
aad6dc4345 Merge pull request #417 from edx/ihoover/feature_flag_auto_auth 
Ihoover/feature flag auto auth
 2013-07-25 08:11:22 -07:00
Sarina Canelake
c80a05f4d8 Merge pull request #471 from edx/giulio/fix-tooltips 
override .sr class from keeping tooltips hidden in sequence nav
 2013-07-25 08:03:23 -07:00
Renzo Lucioni
30baebd7b5 Merge pull request #494 from edx/renzo/blank-problem-score 
Blank common and advanced problems now display an inline score of "0 points" upon creation
 2013-07-25 07:56:15 -07:00
Adam Palay
2efcb0cdca Change default names for various LMS components 
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"

These default names show up in tooltips.
 2013-07-25 10:38:47 -04:00
Calen Pennington
1bcafd32a9 Make the service-variant flag on manage.py longform only 2013-07-25 09:34:51 -04:00
Giulio Gratta
214a814b94 Adjustment to show sequence tool tips in LMS 2013-07-25 00:48:36 -04:00
Sarina Canelake
6923687c8e Merge pull request #460 from edx/sarina/update-diffcover 
Update diff-cover to latest version
 2013-07-24 20:18:15 -07:00
ihoover
56883d65a1 csrf test fix 
remove test that csrf middleware is disabled (since we can't seem to reload middleware between tests)

move definitions from setuo into test method
 2013-07-24 17:08:18 -04:00
Renzo Lucioni
1a0055ae77 Blank common and advanced problems now display an inline score of '0 points' upon creation. 2013-07-24 16:44:22 -04:00
Calen Pennington
a569a5f6a7 Merge pull request #490 from edx/cale/make-cms.dev-environment-work-with-manage.py 
Make cms.dev environment work with manage.py
 2013-07-24 13:26:50 -07:00
Don Mitchell
e223d753e3 Merge pull request #489 from edx/dhm/export_policy 
change of defaults for rerandomize/showanswer
 2013-07-24 12:54:32 -07:00
Calen Pennington
dd338c17a5 Merge pull request #477 from edx/cale/xmodule-student-vieww 
Add an XBlock student_view to XModule
 2013-07-24 12:08:25 -07:00
Calen Pennington
3e9bbe2550 Make cms.dev environment work with manage.py 2013-07-24 14:49:07 -04:00
Don Mitchell
400ff494cb Remove presumption of user's intent for imported xml attrs 
Moved to xlint rather than setting to old default.
 2013-07-24 14:08:34 -04:00
Don Mitchell
2d085c426d Add xlint check for any policy fields whose default changed. 
Warn user that the course behavior may change.
 2013-07-24 14:07:39 -04:00
Calen Pennington
3774ea1565 Add an XBlock student_view to XModule 
This just wraps XModule.get_html, and ignores javascript and css for
now.

[LMS-189]
 2013-07-24 12:23:26 -04:00
Calen Pennington
8e12590668 Merge pull request #451 from edx/cale/add-a-manage.py-command-that-understands-the-extra-edx-options 
Add a manage.py command that understands the extra edX options
 2013-07-24 07:34:13 -07:00
Calen Pennington
76055aa211 Add a manage.py command that understands the extra edX options 2013-07-24 09:04:12 -04:00
Adam
420b092033 Merge pull request #467 from edx/fix/adam/file-upload 
Fix/adam/file upload
 2013-07-23 15:05:18 -07:00
Diana Huang
86ee2bca7a Merge branch 'release' 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-07-23 17:57:07 -04:00
Diana Huang
09dc468342 Merge pull request #482 from edx/hotfix-2013-07-23 
Hotfix 2013 07 23
 2013-07-23 14:49:36 -07:00
chrisndodge
077f0a2a10 Merge pull request #481 from edx/fix/cdodge/regression-on-tabs-initialization 
It seems like self.tabs is getting set to an empty set [] now rather tha...
 2013-07-23 14:32:47 -07:00
ihoover
402ae4d8bd added csrf tests 2013-07-23 17:32:21 -04:00
Brian Talbot
31e1b0e5e9 Studio: revises spacing fix for welcome to edX studio title 
Conflicts:
	cms/templates/howitworks.html
 2013-07-23 17:26:52 -04:00
Diana Huang
2926c94330 Prevent XSS attack via submission_history page. 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-07-23 17:23:59 -04:00
ihoover
4148c00cc4 resolve conflicts 2013-07-23 16:26:11 -04:00
ihoover
c6c3e4b9d3 working under cms too 2013-07-23 16:23:54 -04:00
Jay Zoldak
ea31b17d57 Fix up auto auth tests. 2013-07-23 16:22:51 -04:00
Chris Dodge
0b6932f4b8 add new test to assert that course creation will populate default tabs as expected. Also update factory to not override defaults on tabs array. Also simplfy self.tab test condition. 2013-07-23 16:15:39 -04:00
Chris Dodge
8584aae866 It seems like self.tabs is getting set to an empty set [] now rather than None. This causes the tab defaulting to not populate, leading to crashes in the LMS if someone makes a new course with additional tabs (e.g. static tabs or pdf-textbooks) 2013-07-23 15:34:02 -04:00
chrisndodge
b76e7387aa Merge pull request #452 from edx/feature/cdodge/add-jump-to-substituions 
add a /jump_to_id/ shortcut for producing more durable links between cou...
 2013-07-23 12:15:31 -07:00
jkarni
3a5e1c7021 Merge pull request #463 from edx/fix/jkarni/linkoutline 
Link section to course outline
 2013-07-23 10:59:11 -07:00
Chris Dodge
6f3b49a6f9 add some chinese characters to the test content 2013-07-23 12:15:56 -04:00
Chris Dodge
c5ef8dc526 add line break between arguments 2013-07-23 12:15:56 -04:00
Chris Dodge
f78e3a221b fix fat finger string formatting 2013-07-23 12:15:56 -04:00