Steve Strassmann
4620f50fb1
addressed Cale's comments; switched to path.py paths
2013-05-07 13:24:38 -04:00
Diana Huang
2947ce246f
Better error handling for when marketing urls are missing from the settings.
2013-05-07 13:17:30 -04:00
Greg Price
93cbb2e422
Redirect from LMS courses page to marketing courses page
...
(Only if marketing site is enabled)
2013-05-07 13:06:38 -04:00
Vik Paruchuri
258aebed20
Fix anonymoususer 500 error
2013-05-07 12:58:49 -04:00
Greg Price
ef27b8f787
Make register button for marketing site break out of iframe
...
Use window.top.location.href instead of location.href for redirection.
2013-05-07 12:41:33 -04:00
cahrens
9e1c935b60
Merge branch 'master' into feature/christina/fields
2013-05-07 12:39:45 -04:00
Christina Roberts
729ca900e6
Merge pull request #1920 from edx/feature/christina/fields
...
Pass additional field information from editable_metadata_fields, remove system_metadata_fields variable.
2013-05-07 09:38:34 -07:00
Arthur Barrett
cd4bec8750
merged master branch into feature/abarrett/lms-notes-app
2013-05-07 12:32:22 -04:00
Greg Price
6361280075
Merge pull request #1959 from edx/feature/gprice/drupal-register-button-fix
2013-05-07 08:57:12 -07:00
Chris Dodge
3c747f0e6e
consolidate the list of permissions
2013-05-07 11:53:02 -04:00
Greg Price
2c67352606
Fix new view containing only register button to properly enroll
2013-05-07 11:34:41 -04:00
Chris Dodge
81ecf0c5df
add unit test to verify forum seeding occurs when creating new courses
2013-05-07 11:18:15 -04:00
Greg Price
3fd8b6ff59
Merge pull request #1960 from edx/feature/gprice/drupal-reset-buttons
2013-05-07 08:17:44 -07:00
Brian Talbot
7aa9a6cfa5
Merge pull request #1962 from edx/fix/btalbot/lms-mktgiframe
...
edx.org - resolved iframe button styles in IE + added in coming soon state
2013-05-07 08:04:45 -07:00
Brian Talbot
9a01bb5e52
edx.org - adding back js-dependent register class to register button
2013-05-07 11:02:02 -04:00
Brian Talbot
126c9f9f37
edx.org - further revision to iframe register button states: coming soon styling
2013-05-07 11:00:21 -04:00
Steve Strassmann
87fbfdce3f
merge with master
2013-05-07 10:48:51 -04:00
Brian Talbot
3b84d77131
edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment
2013-05-07 10:25:41 -04:00
Jay Zoldak
29a5d3b42e
Merge pull request #1955 from edx/fix/zoldak/add-gitignores-xmodule-js
...
Ignore the js files that are compiled from coffeescript when running the...
2013-05-07 06:09:54 -07:00
marco
d28c0b5f91
cleaned up styling, synced up partially to existing standards for forms, fonts, colors, etc; currently open select box issue on chrome
2013-05-07 08:59:28 -04:00
Arthur Barrett
ade6d4085d
turn off notes js debugging
2013-05-06 19:35:41 -04:00
Arthur Barrett
4070e019e4
modified the html static book to only enable annotator.js when notes are enabled for the course
2013-05-06 19:29:44 -04:00
Ned Batchelder
91db1eed4c
The new settings will only be read from .json files if aws.py handles them.
2013-05-06 18:06:08 -04:00
Will Daly
1b0b365fa6
Added unit tests for safe_key() to resolve bug 392.
...
Updated safe_key() so that it: (a) avoids creating keys that
are too long for memcache, and (b) handles unicode in keys, prefixes,
and versions
Added __init__.py, which should have been in the last commit
Pep8/Pylint fixes
2013-05-06 17:26:18 -04:00
Ned Batchelder
3da841ea2b
Pin codejail to a specific commit so it will get installed properly on deploying.
2013-05-06 17:16:35 -04:00
Diana Huang
a081ba4bbb
Merge pull request #1934 from edx/diana/drupal/fix-lms-links
...
Fix links between marketing site and courseware.
2013-05-06 14:14:29 -07:00
Jay Zoldak
c2cd75469b
Change the methodology to ignore .js files by default. Any .js files that are coded can be handled individually.
2013-05-06 17:05:47 -04:00
Arthur Barrett
45cca10fb9
remove debugging from default notes view
2013-05-06 17:01:35 -04:00
Arthur Barrett
0e1b3999e8
add limit and offset params to search endpoint
2013-05-06 17:01:17 -04:00
Steve Strassmann
0b0a4a7564
pull from master
2013-05-06 16:57:32 -04:00
Chris Dodge
5ba22ec89b
fix another broken test
2013-05-06 16:56:37 -04:00
Chris Dodge
40e3410121
fix broken unit tests
2013-05-06 16:51:36 -04:00
Diana Huang
13d29b8e72
Fix indentation of settings dictionaries.
2013-05-06 16:49:10 -04:00
Chris Dodge
c20dd7d903
forgot to remove enough stuff from the django admin path
2013-05-06 16:40:25 -04:00
Jay Zoldak
2ffaea7ade
Merge pull request #1949 from edx/fix/zoldak/modulestore-tests
...
Fix tests that intermittently fail when run in concurrent jobs on jenkins.
2013-05-06 13:32:27 -07:00
Chris Dodge
a92910db20
update lms to reflect where comment models.py is now in common
2013-05-06 16:23:32 -04:00
Chris Dodge
ae9d13b53a
update comment models.py to not have the dependency on get_course_by_id (which is in LMS). Also explicitly set the db_table name because django auto generates table prefixes according to the djangoapp name
2013-05-06 16:04:25 -04:00
cahrens
594d28a653
Pass default value through.
2013-05-06 16:03:41 -04:00
Chris Dodge
3858f1b706
update cms envs
2013-05-06 16:02:13 -04:00
Chris Dodge
30d266b430
seed forum permissions when creating new courses
2013-05-06 16:01:14 -04:00
Chris Dodge
57eca325d2
move some files from lms/djangoapps/django_comment_client to common/djangoapps/django_comment_common
2013-05-06 15:59:35 -04:00
Arthur Barrett
ceefdf0161
user must be authenticated to view notes tab
2013-05-06 15:52:32 -04:00
Ned Batchelder
8ad87a693b
Merge pull request #1954 from edx/fix/will/md5-unicode-error
...
Fix UnicodeEncodeError when generating cache keys
2013-05-06 12:45:47 -07:00
Will Daly
4f33b8e0c0
Fixed a UnicodeEncodeError that occurred when generating cache keys
...
from non-ASCII unicode code submissions.
2013-05-06 15:04:20 -04:00
Diana Huang
6110b54ca8
Address code review feedback
...
* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
2013-05-06 14:56:06 -04:00
Arthur Barrett
c5728fb036
fix undefined variable name error in mako template
2013-05-06 14:48:51 -04:00
Jay Zoldak
522751e425
Ignore the js files that are compiled from coffeescript when running the xmodule jasmine tests
2013-05-06 14:28:05 -04:00
Steve Strassmann
8e735b4deb
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/transifex
2013-05-06 14:06:12 -04:00
Steve Strassmann
bec2ca4086
cleanup headers of files pulled from transifex.
2013-05-06 14:05:05 -04:00
Greg Price
ec3c8458e7
Merge pull request #1911 from edx/feature/gprice/feedback-button
2013-05-06 11:03:41 -07:00
