Brian Talbot
85f2be44b5
studio - resolves line-height issue that core typography settings creates with tooltip rendering
2013-05-17 10:46:58 -04:00
marco
1f43fa163a
internationalization stripped out
2013-05-17 10:29:24 -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
Greg Price
362736c4d1
Merge pull request #2060 from edx/fix/gprice/marketing-links
...
Fix marketing links in password reset pages
2013-05-16 14:24:13 -07:00
marco
29b7778461
initial i18n changes to unit.html, component.html, and the individual setting type template files
2013-05-16 17:17:43 -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
Greg Price
4e95aa053f
Fix marketing links in password reset pages
2013-05-16 16:57:56 -04:00
Greg Price
37ec01dd8d
Handle ItemNotFoundError from the modulestore to avoid 500 errors
2013-05-16 16:50:03 -04:00
Jay Zoldak
9fba56c0e2
Include running jasmine tests for discussion forums on jenkins
2013-05-16 16:49:25 -04:00
Diana Huang
b6c0081064
Look for the existence of the links, not for
...
the actual urls
2013-05-16 16:30:29 -04:00
Diana Huang
22cf0dfa97
Fix bug in lettuce tests where the unregister dialog wasn't
...
getting closed fast enough.
2013-05-16 16:30:29 -04:00
Diana Huang
1c2175304e
Merge branch 'master' into drupal-new
2013-05-16 16:27:36 -04:00
Greg Price
f30b9d91e9
Merge pull request #2057 from edx/fix/gprice/disable-courseware-links
...
Disable courseware links on marketing site and dashboard if courseware is not accessible
2013-05-16 13:23:19 -07:00
Jay Zoldak
71626f4ff6
Pep8 fixes of django_comment_client code
2013-05-16 15:57:34 -04:00
marco
f58deb4c3c
removed latex compiler buttom from settings tab
2013-05-16 15:42:29 -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
Greg Price
b8d2276de7
Remove dashboard links for unstarted courses
...
If a course is not started, the course image and title on the dashboard link
to the course about page. Because the LMS course about pages do not exist
(i.e. 404) with the marketing site enabled, we simply do not use a link if
the course has not started.
2013-05-16 15:06:48 -04:00
Greg Price
ff2ba68d79
Tweak behavior of registration button for marketing site
...
If a user is already registered for a course but the course has not started
yet, display a grey button that says "you are registered" and goes nowhere
instead of the blue "access courseware" button, which goes to the LMS course
about page (which 404s).
2013-05-16 15:06:48 -04: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
cahrens
a6c5e699ea
Update combined open ended and peer grading per conversation with Vik.
2013-05-16 13:28:48 -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
cahrens
01ff8396e3
Fix CodeMirror initialization problem.
2013-05-16 12:34:39 -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
Will Daly
1e1e6450df
Pep8 fixes
2013-05-16 11:33:50 -04:00
Will Daly
342b3bb0e9
Merge branch 'master' into feature/will/ci-lettuce-tests
...
Resolved conflict with changes to Rakefile in master
Conflicts:
rakefile
2013-05-16 11:21:59 -04:00
