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

15584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Baratta
662c577951 Undo change to jenkins/test.sh in anticipation of merge 
Original change: SHA 58e98d
This was resolved by merging in Cale's branch
  https://github.com/edx/edx-platform/pull/44
 2013-06-13 11:36:21 -04:00
Renzo Lucioni
d136fdac9a added comment to make clear that leaving the variable analytics outside of the feature flag block is intentional 2013-06-13 11:35:26 -04:00
Renzo Lucioni
8508e3f647 dummy object creation without conditionals 2013-06-13 11:35:26 -04:00
cahrens
dac174e448 Merge cleanup. 2013-06-13 11:31:18 -04:00
cahrens
9d0867ea11 Merge cleanup. 2013-06-13 11:31:10 -04:00
cahrens
c7e37887b3 Merge updates. 2013-06-13 11:22:34 -04:00
Peter Baratta
5735ccaad5 Address Sarina's comments from the PR 
-Clean up `SUFFIXES` from interspersed commented-out suffixes
-Remove unused `LOG`
-Remove unused method `raiseself` of UndefinedVariable and its usage
 2013-06-13 11:16:18 -04:00
JonahStanley
40bf2514ab Added tests for downloading files 
A few notes:
1. Downloads are done through direct requests.  This is due to the difficulty of downloading a file to the correct place
2. Modifiying a file will just change the file to a random 10 character string.
3. The page is reloaded in between uploads.  This is due to a current caching bug that is in the process of being looked into and will be updated once it is fixed.
 2013-06-13 11:00:45 -04:00
Don Mitchell
6af4402abd Squash 3 more naive datetime warnings. I think the only ones left are in 
migrations.
 2013-06-13 10:56:48 -04:00
cahrens
fae8fd3841 Merge branch 'master' into feature/christina/unify-fields 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt
 2013-06-13 10:55:13 -04:00
cahrens
0f8d7c744c Test cleanup. 2013-06-13 10:42:23 -04:00
James Tauber
d4d92135ca Merge pull request #119 from kern3020/master 
Fix formatting problem in README.md
 2013-06-13 07:40:26 -07:00
Ned Batchelder
86cdc06d82 Merge branch 'release' 
message to explain why this merge is necessary,
 2013-06-13 10:35:56 -04:00
Miles Steele
7fb9bfd685 fix test string comparison 2013-06-13 10:25:36 -04:00
Calen Pennington
2fab945340 Cherry pick change to url matching regular expression. Fixes LMS-37 2013-06-13 10:20:43 -04:00
Peter Fogg
66ab6597ca Remove outdated unit test for VideoModule constructor. 2013-06-13 09:46:42 -04:00
Peter Fogg
d52329be23 Merge pull request #128 from edx/peter-fogg/fix-video-captions-setting 
Make video captions respect course author's setting.
 2013-06-13 06:32:33 -07:00
cahrens
6e92ddf3dd Cannot set String field to a dict anymore! 2013-06-12 17:07:41 -04:00
cahrens
89d0003603 Be strict about ModelType expected types, rename Object as Dict. 2013-06-12 14:59:17 -04:00
Calen Pennington
25aec96e86 Merge pull request #124 from edx/fix/cale/test-ruby-install 
Do a bundle install before trying to use rake, so that we have all the p...
 2013-06-12 11:30:10 -07:00
Peter Fogg
8da102c732 Update failing Jasmine tests for video. 2013-06-12 13:50:33 -04:00
Calen Pennington
5b8163dc9c Merge pull request #92 from edx/fix/cale/url-tests 
Fix tests that vary urls.py
 2013-06-12 10:47:13 -07:00
JonahStanley
3c43dbb26f Changed the other % to format 2013-06-12 13:36:46 -04:00
cahrens
86d952bf91 Change to putting serialize/de-serialize directly in xml_module. 2013-06-12 13:34:38 -04:00
JonahStanley
6d686dd9f6 Changed the way the file path was obtained 2013-06-12 13:32:46 -04:00
JonahStanley
1b5050c9ac Changed the following: 
% to format
css_find().click() to its actual function
A few name changes as well as step changes
Removal of drag testing
A refactoring of login and create user.  Login will no longer create the specified user
 2013-06-12 13:25:33 -04:00
Miles Steele
0825319cc7 fix gradebook tests 2013-06-12 13:16:08 -04:00
Peter Fogg
4e2c4f02d6 Fix times not being parse from HH:MM:SS format into floats and update video module logic tests. 2013-06-12 12:37:06 -04:00
Brian Talbot
45c1109c72 syncs up font-weight across problem button/input actions 
(cherry picked from commit 14100ba14c)
 2013-06-12 12:01:02 -04:00
Brian Talbot
10fd401157 syncs styling rules for buttons/inputs to ensure consistency 
(cherry picked from commit 832da3ad48)
 2013-06-12 12:00:52 -04:00
Brian Talbot
cb46cc6ac6 abstracts height rule to apply to the capa check, show, save actions 
(cherry picked from commit 050846af71)
 2013-06-12 12:00:42 -04:00
Brian Talbot
a684c6f679 removes HTML elemements from problem action Sass selectors 
(cherry picked from commit 664efb9887)
 2013-06-12 12:00:31 -04:00
Brian Talbot
04bfa01644 resolves height issue when display the check and show answer actions alongside problems 
(cherry picked from commit a17bf5e2ce)
 2013-06-12 12:00:21 -04:00
e0d
9acab2de70 added pylint ignores, fixed missing import 
(cherry picked from commit 273df4e113)
 2013-06-12 11:56:51 -04:00
e0d
bcc92ef8ef Adding comments. 
(cherry picked from commit c96511a278)
 2013-06-12 11:56:51 -04:00
e0d
3ae11e860c Better error handling. 
(cherry picked from commit 1511ec841a)
 2013-06-12 11:56:51 -04:00
e0d
d380c76df6 Adding a new env to handle escalating privileges to run db migrations. 
(cherry picked from commit d2554909d8)
 2013-06-12 11:56:51 -04:00
Brian Talbot
e641d2c6b5 Merge pull request #136 from edx/fix/btalbot/xmodule-showanswer 
Problem Show Answer/Check Button Line Height Syncing
 2013-06-12 08:56:08 -07:00
Brian Talbot
14100ba14c syncs up font-weight across problem button/input actions 2013-06-12 11:44:00 -04:00
Brian Talbot
832da3ad48 syncs styling rules for buttons/inputs to ensure consistency 2013-06-12 11:43:59 -04:00
Brian Talbot
050846af71 abstracts height rule to apply to the capa check, show, save actions 2013-06-12 11:43:59 -04:00
Brian Talbot
664efb9887 removes HTML elemements from problem action Sass selectors 2013-06-12 11:43:59 -04:00
Brian Talbot
a17bf5e2ce resolves height issue when display the check and show answer actions alongside problems 2013-06-12 11:43:59 -04:00
Peter Fogg
681e96b702 Update display names and help text for video metadata. 2013-06-12 11:42:41 -04:00
e0d
b11e748341 Merge pull request #142 from edx/e0d/pylint-and-import 
added pylint ignores, fixed missing import
 2013-06-12 08:38:32 -07:00
Peter Fogg
52bf82ac17 Set Youtube ID defaults to the empty string. 2013-06-12 11:29:14 -04:00
e0d
273df4e113 added pylint ignores, fixed missing import 2013-06-12 11:24:28 -04:00
Calen Pennington
d715c61d69 Merge pull request #118 from edx/fix/cale/xmodule-assets-deletion-error 
Ignore files that don't exist when we try and delete them while compilin...
 2013-06-12 08:10:36 -07:00
Feanil Patel
20df6dec00 Default to unicode for sass compilation. 
If no default is provided, sass falls back to the system
default. This fails when the system default is not unicode because
various sass files have unicode characters in them.
 2013-06-12 10:57:31 -04:00
Peter Fogg
63e376daf8 Fix failing test bug. 2013-06-12 10:48:04 -04:00