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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felix Sun
c79ca38f6e Moved the hinter rendering onto a mako template. 
Hinter now displays vote count after voting.

Began testing templates.
 2013-07-01 10:25:04 -04:00
Felix Sun
bb922ed8d8 Moved the crowdsourced hinter module into mako template form. 
Fixed some bugs in the tests for crowdsourced hinter.
 2013-07-01 10:25:04 -04:00
Felix Sun
ad40905a38 Made correct/incorrect determination in coffeescript a little more sensitive. Still very hacky. 2013-07-01 10:25:04 -04:00
Felix Sun
475ac62c79 Fixed epic git rebase meltdown. No new features. 2013-07-01 10:25:04 -04:00
Felix Sun
6ccfa2e38d Made tests of the crowdsource hinter module more standardized and easier to read. Fixed database non-initialization bug in crowdsource hinter module. 2013-07-01 10:25:03 -04:00
Felix Sun
b64fe5c537 Finished prototype of hint moderation view. Began re-writing tests of the crowdsource hinter module. (Old tests no longer cover all the code, now that moderation has been added.) 2013-07-01 10:25:03 -04:00
Felix Sun
100f6bf11e Began work on instructor view to hinting system. 
Added moderation feature - you can now choose to hold all hints for moderator approval before showing.
 2013-07-01 10:25:03 -04:00
Felix Sun
6f6a451784 Working prototype of crowdsourced hinting module. 
Conflicts:
	common/static/coffee/src/logger.coffee
 2013-07-01 10:25:03 -04:00
Julian Arni
386029bee3 Adding jasmine tests; code cleanup. 2013-07-01 10:18:38 -04:00
Peter Fogg
1809fde60c Pylint cleanup. 2013-07-01 09:16:25 -04:00
Sarina Canelake
712f17a47e Merge pull request #257 from edx/sarina/fix-unknown-user-profile 
When user profile isn't found, throw a 404 rather than 500
 2013-06-28 15:24:25 -07:00
Sarina Canelake
e5f97b372b pep8 fixes 2013-06-28 18:00:41 -04:00
Peter Fogg
7aa76bc663 Add some documentation around XModule/XModuleDescriptor initialization. 2013-06-28 16:57:24 -04:00
Jay Zoldak
b1424a75b8 Add a test for 404 raised when requesting the profile page of a user that does not exist 2013-06-28 16:51:24 -04:00
Sarina Canelake
09501a62e2 Handle exception with a 404 2013-06-28 16:14:56 -04:00
Diana Huang
d5c5fb344e Merge pull request #290 from edx/diana/open-id-namespace 
Handle issues decoding openid requests more gracefully
 2013-06-28 13:00:19 -07:00
Vik Paruchuri
2246944594 Set a default weight 2013-06-28 15:09:19 -04:00
Diana Huang
f33bfd1c6c Address code review feedback 2013-06-28 15:03:44 -04:00
Vik Paruchuri
8930e753e4 Set default weights 2013-06-28 14:59:39 -04:00
Peter Fogg
b3cd6af9aa Change deleted Alert to a Notification, with a timeout. 2013-06-28 14:46:58 -04:00
Vik Paruchuri
b38a36d44a Fix test 2013-06-28 14:38:13 -04:00
Don Mitchell
1c5706fb1f Add JSON encoder for datetimes to xml export 
During policy export, we want to write any python datetime objects found
as iso timestamps, rather than throwing exceptions.
 2013-06-28 14:19:10 -04:00
Don Mitchell
2ef4d82959 Standardize on get_default_time_display 2013-06-28 14:19:10 -04:00
Don Mitchell
c7046df0f2 Make request.POST be only json content when using expect_json 2013-06-28 14:19:10 -04:00
Don Mitchell
115b214df1 Retrieve location from self in CustomTagDescriptor 2013-06-28 14:19:10 -04:00
Don Mitchell
e9bd1c5602 Fix SessionKeyValueStore.has to use the correct indexing value when looking up data 2013-06-28 14:19:10 -04:00
Don Mitchell
97c2e9ec80 Make url matching regex flexible to allow for browsers that munged :// into :/ 2013-06-28 14:19:09 -04:00
Don Mitchell
26aa085d9d Handle edge case when trying to aggregate progress in an empty sequence 2013-06-28 14:19:09 -04:00
Vik Paruchuri
8a6c8b5ab0 Add test for incrementing student attempts 2013-06-28 14:10:17 -04:00
Peter Fogg
1be2068bcf Show a confirmation on asset delete. Fixes STUD-375. 2013-06-28 12:28:49 -04:00
cahrens
72999e8417 Initial model. 2013-06-28 12:19:51 -04:00
Renzo Lucioni
4a41ce804f Merge pull request #293 from edx/renzo/fix-idashboard-event-types 
Standardize types used for logging events from the instructor dashboard
 2013-06-28 09:07:45 -07:00
Renzo Lucioni
d53114abda Shorten line length 2013-06-28 11:46:20 -04:00
Ned Batchelder
ff60034849 Merge pull request #273 from edx/ned/remove-obsolete-and-distracting-scss-file 
Remove obsolete and distracting SCSS file
 2013-06-28 08:40:56 -07:00
Valera Rozuvan
938e48e5c8 Merge pull request #296 from edx/valera/bugfix_allow_no_youtube_attribute 
Fix for bug Blades/BLD-152
 2013-06-28 05:08:35 -07:00
Valera Rozuvan
97d7421432 Fix for bug Blades/BLD-152. Added test for bugfix. Optimized bug fix. 2013-06-28 13:52:04 +03:00
Diana Huang
c98651fadb Add in the ability to handle malformed return urls. 2013-06-27 18:02:23 -04:00
Diana Huang
c6fa4873b1 Handle issues decoding requests more gracefully 
Clean up some pep8/pylint violations as well
 2013-06-27 18:02:23 -04:00
Carlos Andrés Rocha
a844548fb8 Add setting to set the virtual host of a Celery broker 2013-06-27 17:58:51 -04:00
Christina Roberts
8207f229f1 Merge pull request #285 from edx/christina/course-create-permissions 
Script for granting existing instructors creator access.
 2013-06-27 14:08:18 -07:00
jnater
7d0b72a41e Merge pull request #204 from edx/jnater/courseware_tests 
Jnater/courseware tests
 2013-06-27 13:50:51 -07:00
Will Daly
af05d05cbe Used dependency to ensure that REPORT_DIR exists before cleaning. 
This allows the build to pass in Jenkins
 2013-06-27 16:40:32 -04:00
Will Daly
7e6722c50f Added clean reports dependency to rake JavaScript test tasks. 
This ensures that `rake test` will clean the report directories
*before* running the JS tests.
 2013-06-27 16:40:32 -04:00
Jean Manuel Nater
3e0f933a73 Formatted a docstring. 2013-06-27 16:40:04 -04:00
JonahStanley
1a5bda4d08 Broke up long line into smaller line 2013-06-27 16:35:01 -04:00
Ned Batchelder
be4d5f3228 Merge pull request #292 from edx/ned/remove-pointless-addition-tests 
Remove pointless addition tests
 2013-06-27 13:31:36 -07:00
Ned Batchelder
a484224ef5 Remove pointless addition tests 2013-06-27 16:27:39 -04:00
Renzo Lucioni
4557891e0d Standardize types used for logging events from the instructor dashboard 2013-06-27 16:25:03 -04:00
Vik Paruchuri
9b14ea790c Properly increment student attempts 2013-06-27 16:20:58 -04:00
cahrens
32e6d4819f pep8/pylint cleanup. 2013-06-27 16:18:16 -04:00