Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,392 Commits 1 Branch 0 Tags
340d39f322fba0f12f43bb83b386a59cefc06bbf
Commit Graph

13392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
340d39f322 Merge pull request #2069 from edx/fix/cale/coffee-watch-on-osx 
Batched coffee --watch compilation in smaller batches
 2013-05-17 13:02:08 -07:00
Sarina
39456f98b5 Merge pull request #2072 from edx/fix/sarina/add-frances 
Add Frances Botsford as one of our authors
 2013-05-17 12:38:47 -07:00
Carlos Andrés Rocha
0042988ea7 Merge pull request #2063 from edx/feature/rocha/lets-use-celery 
Add Celery configuration to LMS and CMS
 2013-05-17 12:36:23 -07:00
Sarina Canelake
73e05b3e67 Add Frances Botsford as one of our authors 2013-05-17 14:48:11 -04:00
Sarina
036be2a692 Merge pull request #2001 from edx/jtauber/intial-authors 
added initial AUTHORS file
 2013-05-17 11:37:51 -07:00
Calen Pennington
280f09739f Batched coffee --watch compilation in smaller batches 
This is to work around an OSx issue that causes EMFILE errors in the
default configuration.
Ref: https://github.com/joyent/node/issues/2479
 2013-05-17 14:22:01 -04:00
frances botsford
cb9d2c8879 Merge pull request #2064 from edx/bug/frances/studio-ffnavwrap 
Bug fix for Studio nav in FF on PC
 2013-05-17 11:08:03 -07:00
Frances Botsford
e69b5c4792 adjusted width of header nav to prevent wrapping in PC FF, also put max-width on Org name and Course number in header to prevent the nav from getting bumped way over 2013-05-17 14:07:06 -04:00
Kevin Chugh
ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing 
Feature/zoldak/forum testing
 2013-05-17 10:10:55 -07:00
Christina Roberts
f4044ed1e8 Merge pull request #2061 from edx/bug/christina/static-pages 
Make sure to get the correct modulestore on delete (static tabs do not e...
 2013-05-17 09:59:59 -07:00
Carlos Andrés Rocha
35bd38d677 Add status app with simple view to check celery workers 2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha
c05efbc31e Added base Celery settings 2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha
95496b5c50 Cleanup dev settings a little bit 2013-05-17 11:33:14 -04:00
Ned Batchelder
935905665c Have to look in subdirectories for requirements files. 2013-05-17 11:31:28 -04:00
Jay Zoldak
a1a33eb5e5 Fix path to phantom jasmine now that we install via node 2013-05-17 10:53:14 -04:00
Brian Talbot
163a50c697 Merge pull request #2055 from edx/fix/btalbot/studio-tooltips 
Studio: Tooltip line-height/visual space fix
 2013-05-17 07:47:30 -07:00
Brian Talbot
85f2be44b5 studio - resolves line-height issue that core typography settings creates with tooltip rendering 2013-05-17 10:46:58 -04:00
Ned Batchelder
f856b69ab5 Merge branch 'feature/ned/sandboxed-python' 2013-05-17 10:28:06 -04:00
Your Name
6fb8adaa50 add flagging and unflagging tests to response show view 2013-05-17 09:52:02 -04:00
Your Name
ad5b71deae format content view test for readability 2013-05-17 09:34:41 -04:00
Your Name
296a878169 add flagging tests to DiscussionContentView 2013-05-17 09:31:12 -04:00
Your Name
ce2308b5bb add flagging tests to DiscussionContentView 2013-05-17 09:28:12 -04:00
Your Name
867d69ed12 update views.py to add docstrings and change exception name to address pylint errors 2013-05-16 18:13:59 -04:00
cahrens
944d2d61f1 Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore). 
#324
 2013-05-16 17:15:53 -04:00
Ned Batchelder
d0c4afb32f More info in the capa/safe_exec/README 2013-05-16 17:02:45 -04:00
Jay Zoldak
9fba56c0e2 Include running jasmine tests for discussion forums on jenkins 2013-05-16 16:49:25 -04:00
Jay Zoldak
71626f4ff6 Pep8 fixes of django_comment_client code 2013-05-16 15:57:34 -04:00
chrisndodge
ce56fa3066 Merge pull request #1990 from edx/feature/abarrett/lms-notes-app 
LMS Notes Djangoapp
 2013-05-16 12:38:56 -07:00
John Jarvis
2fd0b1b972 Merge pull request #2054 from edx/jarv/move-edx-requirements 
Jarv/move edx requirements
 2013-05-16 12:13:44 -07:00
Ned Batchelder
d8fed59314 Use the latest CodeJail. 2013-05-16 14:54:13 -04:00
Arthur Barrett
adcd1dd886 update annotator.min.css with change to fix adder button and serve the minified one. 2013-05-16 14:48:06 -04:00
Ned Batchelder
522c2a12d2 private-requirements.txt moved, ignore it in the new place. 2013-05-16 14:37:55 -04:00
John Jarvis
b8acb39ce1 moving sandbox requirements 2013-05-16 14:32:27 -04:00
John Jarvis
653dd4240c moving requirements files to a directory that corresponds with the virtualenv name 2013-05-16 14:30:01 -04:00
John Jarvis
e1120d5624 new location for requirement files 2013-05-16 14:29:45 -04:00
John Jarvis
9138302108 rakefile updates 2013-05-16 14:29:18 -04:00
Arthur Barrett
52e5fe223c update annotator.js library and fix the annotator-adder button hover state in courseware. 2013-05-16 14:27:21 -04:00
Ned Batchelder
e947218285 Merge master to here. 2013-05-16 14:21:51 -04:00
Ned Batchelder
bbd1d8d09e From code review: the hash was shallow, so nested objects could have hashed differently when they didn't need to. 2013-05-16 13:58:05 -04:00
Arthur Barrett
e89cd7a397 fix test to check for 400 status code instead of 500. 2013-05-16 13:38:14 -04:00
Arthur Barrett
1fbe43a650 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-16 13:23:12 -04:00
Arthur Barrett
430e009b5d added TODO for open ended and notes tab advanced policy settings. 2013-05-16 13:22:40 -04:00
Arthur Barrett
0dd8dabf13 validation errors should return 400 status code instead of 500. 2013-05-16 13:18:36 -04:00
Will Daly
fca63f065f Merge pull request #2023 from edx/feature/will/ci-lettuce-tests 
Feature/will/ci lettuce tests
 2013-05-16 10:18:00 -07:00
Ned Batchelder
f05b25d17a Added more to the safe_exec docstring. 2013-05-16 13:15:28 -04:00
Jay Zoldak
b97772a9c6 Gitignore jasmine_test_runner.html in the appropriate place. 2013-05-16 12:39:48 -04:00
John Jarvis
a30e31213b rakefile updates 2013-05-16 12:16:21 -04:00
John Jarvis
50160592f7 new location for requirement files 2013-05-16 12:13:40 -04:00
John Jarvis
caf64d5dd0 moving requirements files to a directory that corresponds with the virtualenv name 2013-05-16 12:06:31 -04:00
Will Daly
d1fee427fe Updated Jenkins script to reflect new requirements installation process 2013-05-16 11:39:44 -04:00