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

15599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
d2eca92f93 edx.org: abstracting new edx.org button extends and colors with other themes in mind 2013-07-24 15:17:25 -04:00
Brian Talbot
95478a3499 edx.org: revising base link color variable to use darker value for accessibility 2013-07-24 15:17:25 -04:00
Brian Talbot
3094471efc edx.org: revises iframe-based register/status buttons to match revised styles 2013-07-24 15:17:24 -04:00
Brian Talbot
cc95d004b5 edx.org: handles letter-spacing on buttons 2013-07-24 15:17:24 -04:00
Brian Talbot
5f15e4227e edx.org: applies edx.org visual changes (with overrides/new mixins) 2013-07-24 15:17:24 -04:00
Brian Talbot
b5fda6d26d edx.org: adds in variables/mixins to support edx.org visual changes 2013-07-24 15:17:24 -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
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
Calen Pennington
ab482277be Merge pull request #420 from edx/fix/cdodge/hotfix-export-crash 
[HOTFIX] add a default XML serialization if the 'data' field is empty or None. So...
 2013-07-17 12:14:06 -07:00
Chris Dodge
8325e28a10 add a default XML serialization if the 'data' field is empty or None. Some XModules now - like video XModule - do not have XML set in the 'data' field 2013-07-17 12:31:33 -04:00
Calen Pennington
e9d400cbde Merge remote-tracking branch 'origin/release' into rc/2013-07-16 2013-07-15 13:03:47 -04:00
Peter Fogg
f9f0d9ccf6 Merge pull request #402 from edx/peter-fogg/fix-section-release-tests 
Fix section release acceptance test failure.
 2013-07-15 07:08:30 -07:00
Peter Fogg
60d151497f Fix section release acceptance test failure. 2013-07-15 09:21:25 -04:00
David Baumgold
7f5aedb215 Merge pull request #380 from edx/db/studio-i18n 
Studio internationalization
 2013-07-13 05:45:50 -07:00
chrisndodge
dcc63be4b5 Merge pull request #388 from edx/fix/cdodge/dont-display-github-links-in-mongo-lms 
[STUD-431] Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRAT...
 2013-07-12 18:03:43 -07:00
Chris Dodge
db7434fa18 add comment as to why we are turning off this feature flag 2013-07-12 20:02:23 -04:00
ichuang
547f230002 Merge pull request #381 from edx/feature/ichuang/export_all_courses 
Add management command to Studio for exporting all courses; useful for periodic backups of course content in Studio
 2013-07-12 16:59:53 -07:00
ichuang
8b6a55e2a8 fix pep-8 in export_all_courses 2013-07-12 19:58:16 -04:00
chrisndodge
8f743424ba Merge pull request #387 from edx/fix/cdodge/unescape-quote-strings 
[STUD-406] Fix/cdodge/unescape quote strings
 2013-07-12 15:32:55 -07:00
David Baumgold
04ddb63dad i18n the studio nav help button 2013-07-12 16:27:54 -04:00
Frances Botsford
260b5ccef4 i18n the view live button on the studio dashboard 2013-07-12 16:25:44 -04:00
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
Chris Dodge
ac4e20b4f3 change serialize_field to check for type. If value is a string, simply return that, otherwise do a json.dumps 2013-07-12 15:27:36 -04:00
David Baumgold
5a5b3cfe8a Merge pull request #384 from antoviaque/vagrant-mount 
vagrant: Always mount `node_modules` folder after Vagrant NFS mount
 2013-07-12 12:17:51 -07:00
Jonah Stanley
1bca87caf0 Merge pull request #383 from edx/jonahstanley/add-test-documentation 
Added documentation to new acceptance test features and techniques
 2013-07-12 11:08:06 -07:00
Jason Bau
e7bb85dee1 Merge pull request #259 from edx/features/jbau/stanford-shib 
Bugfix for stanford shib
 2013-07-12 10:19:58 -07:00
mikigoyal
0a05cdc21b Merge pull request #389 from edx/lms/bug/lms-605 
Fixed a spelling mistake. LMS-605
 2013-07-12 10:05:10 -07:00
Chris Dodge
958ecdb053 raise a more appropriate Exception 2013-07-12 12:47:51 -04:00
Chris Dodge
547f4633d5 use better syntax for asserting that exception is thrown 2013-07-12 12:47:23 -04:00
Miki Goyal
ae45f5461c Fixed a spelling mistake. LMS-605 2013-07-12 12:19:15 -04:00
e0d
b8346f2bcf Merge branch 'release' 2013-07-12 12:11:23 -04:00
Jonah Stanley
72c9a24dd6 Merge pull request #274 from edx/jonahstanley/refactor-global-to-world 
Jonahstanley/refactor global to world
 2013-07-12 09:10:25 -07:00
Chris Dodge
1060cf5cec Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRATION feature flag. So when running as mongo-backed, set that to False 2013-07-12 11:51:57 -04:00
Calen Pennington
772dd30259 Merge pull request #249 from edx/feature/cale/release-email-list 
Tidy up argument parsing in release email script
 2013-07-12 08:47:42 -07:00
Chris Dodge
ab4012cc59 fix up some of the test courses which had hardcoded that quot; escaping 2013-07-12 11:33:46 -04:00
Chris Dodge
5aae3c6971 add new tests for the string literal serialization 2013-07-12 11:14:35 -04:00
Chris Dodge
50bea28d75 Add a 'string literal' serialization method and use it in the lambda function mapping table when the value to xml serialize is of basestring type. Also a couple of drive-by pep8 fixes. 2013-07-12 11:13:59 -04:00
mikigoyal
4eb82224f0 Merge pull request #382 from edx/bug/lms-600 
Fix alt text for the login page: LMS-600
 2013-07-12 07:45:50 -07:00
ichuang
a3e4f21a9c use unicode instead of str for casting track.views args in idashboard 2013-07-12 10:43:06 -04:00
ichuang
e62cb45da4 tracking in idashboard should only log json-serializable objects 2013-07-12 10:42:48 -04:00
JonahStanley
940113efee Fixed long lines 2013-07-12 10:32:49 -04:00
JonahStanley
484e217de3 Fixed some errors 2013-07-12 10:32:48 -04:00
JonahStanley
1f1bba5507 Scenario Dictionary now holds objects 2013-07-12 10:32:48 -04:00
JonahStanley
8110307ba9 CMS now refactored to use world dictionary 2013-07-12 10:32:48 -04:00
JonahStanley
131f1a49c4 All lms acceptance tests refactored to use world dictionaries 2013-07-12 10:32:47 -04:00
JonahStanley
35094a968b Beginnings of refactoring the acceptance tests 2013-07-12 10:32:45 -04:00
Jonah Stanley
70ce6a11e0 Merge pull request #333 from edx/jonahstanley/fix-flakey-video-test 
Jonahstanley/fix flakey video test
 2013-07-12 07:28:53 -07:00
Miki Goyal
4c8eb6b0d5 Adding myself to authors file 2013-07-12 10:24:48 -04:00
Xavier Antoviaque
bdca0f1d0e vagrant: Always mount node_modules folder after Vagrant NFS mount 2013-07-12 11:15:00 -03:00