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 |
|
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 |
|
Your Name
|
a9db41d8d0
|
flag and unflag tests for comments and threads
|
2013-05-16 10:59:23 -04:00 |
|
Your Name
|
c7e0b576d0
|
fix missing paren
|
2013-05-16 10:59:23 -04:00 |
|
Kevin Chugh
|
03725de34a
|
flag abuse failing
|
2013-05-16 10:59:23 -04:00 |
|
Kevin Chugh
|
fa269d3c96
|
add flag thread django test
|
2013-05-16 10:59:23 -04:00 |
|
Your Name
|
82d2b78b96
|
update jasmine tests
|
2013-05-16 10:56:58 -04:00 |
|
marco
|
71be3debc4
|
updated flagging icons to not use other libraries
|
2013-05-16 10:56:58 -04:00 |
|
Jay Zoldak
|
e1481d93a8
|
Work on view test for comment client code.
|
2013-05-16 10:56:58 -04:00 |
|
Jay Zoldak
|
7e63611478
|
Start adding view tests for discussion client. Note that these will not work unless you change your test.py to enable discussion forums.
|
2013-05-16 10:56:57 -04:00 |
|
Your Name
|
90892450b7
|
failed jasmine tests still failing
|
2013-05-16 10:56:57 -04:00 |
|
Jay Zoldak
|
cc2cc469fe
|
more work on jasmine tests for forums
|
2013-05-16 10:56:57 -04:00 |
|
Jay Zoldak
|
cbdf93473b
|
start to get the jasmine tests working for comment service
|
2013-05-16 10:56:57 -04:00 |
|
Jay Zoldak
|
ed3df10638
|
Set up rake task for jasmine tests for discussion forums code.
|
2013-05-16 10:56:57 -04:00 |
|
marco
|
33e8621af6
|
cursor state for discussions (not inline) span text needed to be set to pointer
|
2013-05-16 10:29:34 -04:00 |
|
marco
|
18759b21d6
|
capitalization on tooltips
|
2013-05-16 10:29:34 -04:00 |
|
marco
|
495cd305d4
|
adjusted cursor for span label on pins to be default
|
2013-05-16 10:29:34 -04:00 |
|
Your Name
|
e2d3aee768
|
styling inline flaggin
|
2013-05-16 10:29:34 -04:00 |
|
marco
|
65dbd3cf73
|
padding around icons for flags and pins
|
2013-05-16 10:29:34 -04:00 |
|
marco
|
0a43c0ff59
|
minor css tweaks to flag and pin icons
|
2013-05-16 10:29:34 -04:00 |
|
Your Name
|
90e7a84570
|
show inline pinning and flagging
|
2013-05-16 10:29:34 -04:00 |
|
Your Name
|
78097c7ee1
|
update css for better cursor on pinning and flagging
|
2013-05-16 10:29:33 -04:00 |
|
Your Name
|
121f678f1b
|
restore flagging to inline thread
|
2013-05-16 10:29:33 -04:00 |
|
Jay Zoldak
|
3b8a8a13b0
|
Revert "Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs""
This reverts commit 5560a4add4.
|
2013-05-16 10:29:33 -04:00 |
|
Jay Zoldak
|
ed5ad46192
|
Revert "Revert "fix merge conflict""
This reverts commit 2df3fe9344.
Conflicts:
common/static/coffee/src/discussion/utils.coffee
|
2013-05-16 10:29:33 -04:00 |
|
Your Name
|
4b806768ec
|
more server trial and error
|
2013-05-16 10:29:33 -04:00 |
|
Your Name
|
8568ce7ad0
|
server django version generating 1 instead of True so test for both
|
2013-05-16 10:29:33 -04:00 |
|
Kevin Chugh
|
ab08fa94e4
|
coffeescript fixes
|
2013-05-16 10:29:32 -04:00 |
|
Kevin Chugh
|
c410da91de
|
fix coffeescript error
|
2013-05-16 10:29:32 -04:00 |
|
Ned Batchelder
|
1c36564f45
|
Use newer CodeJail.
|
2013-05-16 07:47:16 -04:00 |
|