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

6956 Commits

Author SHA1 Message Date
Adam
50ef0d1c09 Merge pull request #503 from edx/fix/back-button 
fixes back nav button
 2013-07-29 10:29:40 -07:00
Your Name
6276997180 update checkbox with get settings 2013-07-29 13:26:31 -04:00
Don Mitchell
0578175a7c Merge pull request #505 from edx/dhm/xblock_save 
More xblock.save() calls to handle fields set during inits
 2013-07-29 09:34:46 -07:00
Don Mitchell
393aa1da26 Ensure parent update of children decaches correctly 2013-07-29 12:23:19 -04:00
Don Mitchell
d1ed6fbc34 More xblock.save() calls to handle fields set during inits 2013-07-29 09:08:37 -04:00
Vasyl Nakvasiuk
57bc010a0a gst integration into studio 2013-07-26 17:22:27 +03: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
Vik Paruchuri
12a2c06fb1 Remove console.log statements 2013-07-25 15:57:21 -04:00
Vik Paruchuri
2d966209f4 fix test 2013-07-25 15:55:34 -04:00
Vik Paruchuri
1a4be13d4c Improve rubric look and feel 2013-07-25 15:40:09 -04:00
Adam Palay
62a54555b6 fixes back nav button 2013-07-25 15:32:43 -04:00
Vik Paruchuri
29bd64555f Get table to take up the width of the page 2013-07-25 15:30:11 -04:00
Vik Paruchuri
b6ff513e33 Add in get last response functionality 2013-07-25 15:06:40 -04:00
Vik Paruchuri
d23d354ab3 Change top text 2013-07-25 14:41:54 -04:00
Vik Paruchuri
172bc5cfa5 Change naming, edit border radius 2013-07-25 14:23:11 -04:00
Calen Pennington
802d36c192 Add an XBlock studio_view to XModuleDescriptors 
This just wraps get_html, and ignores javascript and css for now.

[LMS-187]
 2013-07-25 13:59:52 -04:00
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00
Vik Paruchuri
c059a31623 Fix border locations, remove open ended response text 2013-07-25 12:33:12 -04:00
Vik Paruchuri
9cb7d448c6 Border between prompt element 2013-07-25 12:15:05 -04:00
Vik Paruchuri
5ae6ce9d47 Add in css borders 2013-07-25 12:10:16 -04:00
Vik Paruchuri
579b66d9dd Redesign header css 2013-07-25 11:44:42 -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
Vik Paruchuri
5365d54202 Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 2013-07-25 11:09:53 -04: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
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
Kevin Chugh
d95693ebb7 hook up panel to new stats service 2013-07-25 03:23:04 -04:00
Giulio Gratta
214a814b94 Adjustment to show sequence tool tips in LMS 2013-07-25 00:48:36 -04:00
Kevin Chugh
5d106ee048 Merge branch 'master' into feature/kevin/email_notifications_panel 2013-07-25 00:31:42 -04: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
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
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
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
ihoover
402ae4d8bd added csrf tests 2013-07-23 17:32:21 -04:00
ihoover
4148c00cc4 resolve conflicts 2013-07-23 16:26:11 -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
Chris Dodge
6f3b49a6f9 add some chinese characters to the test content 2013-07-23 12:15:56 -04:00
Chris Dodge
565564a46e add input/output information in doc strings 2013-07-23 12:15:56 -04:00
Chris Dodge
e24eb3e4eb added explicit unit test to verify the link rewriting 2013-07-23 12:15:55 -04:00
Chris Dodge
80e0b99342 add a reference in the toy course to the test jump_to_id HTML module 2013-07-23 12:11:41 -04:00
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 2013-07-23 12:10:49 -04:00
chrisndodge
8c94be8083 Merge pull request #436 from edx/fix/cdodge/stop-using-unmunged-urlnames-as-display-names 
change from_xml class method on video class to make sure we honor the fa...
 2013-07-23 08:33:27 -07:00
Calen Pennington
4c3a017486 Merge pull request #462 from edx/cale/use-xblock-children-api 
Make XModuleDescriptor use the XBlock children API
 2013-07-23 04:56:44 -07:00
Adam Palay
2b40462263 convert all datetime.now() to datetime.now(UTC) 2013-07-22 17:39:11 -04:00