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
Ned Batchelder
61f135944d
Print a message if the requirements files haven't changed.
2013-05-17 14:56:44 -04:00
Sarina Canelake
73e05b3e67
Add Frances Botsford as one of our authors
2013-05-17 14:48:11 -04:00
Will Daly
a28aed5803
Added tests for capa input templates. This includes tests
...
for HTML we expect to be unescaped.
2013-05-17 14:38:59 -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
Greg Price
d4cee365e6
Ensure CSRF cookie is present for login and registration pages
2013-05-17 14:23:28 -04: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
Greg Price
f200bca6f8
Merge pull request #2066 from edx/fix/gprice/mktg-access-courseware
...
Make "access courseware" buttons for marketing site break out of iframes
2013-05-17 11:13:40 -07:00
Greg Price
db3189d5ad
Disable marketing registration button for courses that user cannot enroll in
2013-05-17 14:10:04 -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
Greg Price
e4509ae3ad
Make "access courseware" buttons for marketing site break out of iframes
2013-05-17 13:31:22 -04:00
Diana Huang
15a5e6c1ac
Fix test so that it works with both CMS and LMS settings
2013-05-17 13:18:10 -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
Diana Huang
ba983d5f49
Merge pull request #2062 from edx/diana/drupal/lettuce-tests
...
Fix Lettuce Tests for Drupal site
2013-05-17 08:56:11 -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
cahrens
1c9ebbc9ef
Put colon on Visibility back in.
2013-05-17 11:02:25 -04:00
cahrens
5920ea91ee
One minor update.
2013-05-17 11:00:00 -04:00
cahrens
a32a740c39
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
2013-05-17 10:56:08 -04:00
Jay Zoldak
a1a33eb5e5
Fix path to phantom jasmine now that we install via node
2013-05-17 10:53:14 -04:00
Diana Huang
dadcdd0599
Fix lettuce signup feature to match Drupal site.
2013-05-17 10:51:38 -04:00
Diana Huang
acfcd0f8a4
Fix the login lettuce feature for the new Drupal site.
2013-05-17 10:51:38 -04:00
Diana Huang
2b80b358ed
Add in a test for the marketing_link function in mitxmako
2013-05-17 10:51:37 -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
