Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
4d7c7f866a Merge branch 'master' into feature/christina/metadata-ui 2013-05-20 15:06:40 -04:00
e0d
c94f8d6f56 Merge pull request #2089 from edx/bugfix/e0d/resize-notes-uri 
actually needs to be 255 given unicode requirements
 2013-05-20 11:49:59 -07:00
e0d
a7b02e0029 actually needs to be 255 given unicode requirements 2013-05-20 14:40:05 -04:00
marco
7641e128de Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-20 14:39:50 -04:00
marco
c0cff81e5e styled firefox number buttons 2013-05-20 14:39:37 -04:00
Ned Batchelder
c947133e54 A better way to compute the hash, that gets the right hash after an install actually installs something. 2013-05-20 14:39:25 -04:00
Vik Paruchuri
7699c1794c Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor 2013-05-20 14:16:04 -04:00
cahrens
25388dec96 Minor cleanup. 2013-05-20 13:31:55 -04:00
cahrens
2020923f2d Prevent invalid numeric entries. 2013-05-20 13:26:27 -04:00
e0d
f63a4432d0 Merge pull request #2086 from edx/bugfix/e0d/resize-notes-uri 
Bugfix/e0d/resize notes uri
 2013-05-20 10:24:27 -07:00
Ned Batchelder
ec09ac7f29 Put numpy into a pre.txt so that everything will actually install. 2013-05-20 12:57:07 -04:00
Vik Paruchuri
16e1ecf686 fix some pylint violations 2013-05-20 12:46:12 -04:00
Ned Batchelder
23384ca2eb Use backticks so that the command won't echo to the user. 2013-05-20 12:09:28 -04:00
Ned Batchelder
fa87a64984 Missing trailing paren 2013-05-20 12:06:36 -04:00
marco
c356904027 css styles for firefox input number fields 2013-05-20 12:06:30 -04:00
e0d
0e37564490 pep8 fixes 2013-05-20 12:01:25 -04:00
e0d
a54ecb98c6 resizing uri column 2013-05-20 11:59:56 -04:00
Ned Batchelder
5b5fbc6b14 Fingerprint the filenames in site-packages to decide when to install requirements. 2013-05-20 11:46:56 -04:00
Vik Paruchuri
ed2c1cf0d1 Remove header from cheatsheet 2013-05-20 11:46:01 -04:00
marco
32f7691040 minor style changes for increment and decrement buttons on firefox number fields 2013-05-20 11:39:13 -04:00
Vik Paruchuri
55fda26fd8 Fix tests, fix xqueue error, minor polish 2013-05-20 11:29:19 -04:00
cahrens
3229aaf503 Call polyfill at right time. 2013-05-20 11:16:20 -04:00
Vik Paruchuri
6bdbbb62d5 Polish up editor, fix issues 2013-05-20 11:09:35 -04:00
Vik Paruchuri
d4b54ceca7 Update open ended editor to parse tasks properly 2013-05-20 10:49:04 -04:00
Chris Dodge
a44e816877 remove_open_ended_panel_tab() -> remove_extra_paneltab(). Also, update new forums test factors to use refactored Models.py 2013-05-20 10:33:52 -04:00
Brian Talbot
3671c7a7fd Merge pull request #2075 from edx/fix/btalbot/studio-navLineHeight 
Studio - Revised Course Nav Line Heights
 2013-05-20 07:29:19 -07:00
Chris Dodge
fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py
 2013-05-20 10:22:36 -04:00
Vik Paruchuri
986999c62e Fix cheatsheet, start working on xml replacement 2013-05-20 09:50:15 -04:00
marco
aa41aed9d1 prototype for polyfill on number input fields, minimal styling to up down buttons 2013-05-20 09:45:33 -04:00
Vik Paruchuri
3a15f93564 Render proper templates when user clicks on editor buttons 2013-05-20 09:20:46 -04:00
Vik Paruchuri
9a7006473e Do basic work on a simple editor for combinedopenended 2013-05-20 09:07:03 -04:00
Brian Talbot
bf8df49728 studio - revising line height between course nav titles and prefixes 2013-05-20 08:40:28 -04:00
Brian Talbot
0947329fc4 Merge pull request #2076 from edx/fix/btalbot/studio-fontrefs 
Studio - Font Import Method Revert/Fix
 2013-05-20 05:39:50 -07:00
Brian Talbot
098a5dda48 studio - reverts google web font import method back to original @font-face syntax since Sass doesn't like google's original method when processing 2013-05-20 08:39:18 -04:00
Vik Paruchuri
4c80325db3 Start working on COE editor, fix name checking in module_render 2013-05-20 08:11:54 -04:00
Ned Batchelder
9834f27eb9 Fingerprint the filenames in site-packages to decide when to install requirements. 2013-05-17 18:15:40 -04:00
e0d
f8e9c4d4d1 Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name 
Set the default celery queue name in addition to the default routing key
 2013-05-17 15:02:31 -07:00
Carlos Andrés Rocha
34d39dde9a Set the default celery queue name in addition to the default routing key 2013-05-17 17:59:51 -04:00
Will Daly
bab4b18647 Set the browser size on startup of acceptance tests. 
This resolves an issue on Mac OS X in which the login dropdown
arrow couldn't be clicked because it was off-screen.
It should make the test suite more stable.
 2013-05-17 17:21:44 -04:00
Greg Price
372084e0b6 Merge branch 'drupal-new' 
Conflicts:
	lms/envs/common.py
 2013-05-17 16:17:35 -04:00
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Ned Batchelder
5f7e856cf3 Merge pull request #2073 from edx/ned/message-if-no-install-needed 
Print a message if the requirements files haven't changed.
 2013-05-17 13:08:51 -07:00
Ned Batchelder
5555d41d80 OK, all the phases should have messages. 2013-05-17 16:04:24 -04:00
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
Greg Price
5268d982ce Merge pull request #2067 from edx/fix/gprice/mktg-button-closed-registration 
Disable marketing registration button for courses that user cannot enrol...
 2013-05-17 12:40:54 -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
Diana Huang
00378add25 Merge pull request #2065 from edx/diana/drupal/fix-link-test 
Drupal: Fix test so that it works with both CMS and LMS settings
 2013-05-17 12:08:46 -07:00
cahrens
b16e17a250 Some i18n work and other minor cleanup. 2013-05-17 14:57:25 -04:00
Greg Price
bc650887c9 Merge pull request #2070 from edx/fix/gprice/moar-cookies 
Ensure CSRF cookie is present for login and registration pages
 2013-05-17 11:56:59 -07:00