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 |
|
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 |
|
cahrens
|
235ecff28b
|
In progress.
|
2013-05-16 10:40:48 -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 |
|
marco
|
ef14155306
|
cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill
|
2013-05-16 09:50:16 -04:00 |
|
Ned Batchelder
|
1c36564f45
|
Use newer CodeJail.
|
2013-05-16 07:47:16 -04:00 |
|
Will Daly
|
e78436db18
|
Merge branch 'feature/will/ci-lettuce-tests' of https://github.com/edx/edx-platform into feature/will/ci-lettuce-tests
|
2013-05-15 17:07:24 -04:00 |
|
Will Daly
|
3a981cfa05
|
Removed COURSES_ROOT and DATA_DIR from cms/envs/acceptance.py
|
2013-05-15 17:06:44 -04:00 |
|
Ned Batchelder
|
8f3c1db1ef
|
Add some notes for the future maintainer.
|
2013-05-15 17:00:39 -04:00 |
|
Calen Pennington
|
281662a43e
|
Merge pull request #2048 from edx/fix/cale/prereqs-before-django
Install python prereqs before trying to run django or install requiremen...
|
2013-05-15 13:49:05 -07:00 |
|
marco
|
bbb6a3c60d
|
resolved metadata-edit conflict, adding in latex item into settings
|
2013-05-15 16:27:04 -04:00 |
|
marco
|
12dae84a07
|
commented out firefox polyfill ad well as xmodule css editor changes
|
2013-05-15 16:07:45 -04:00 |
|
Brian Talbot
|
6dcf7be05d
|
Merge pull request #2047 from edx/fix/btalbot/studio-typographyvariables
Studio - Resolving incorrect Sans Serif Sass Variable Definition
|
2013-05-15 13:03:50 -07:00 |
|
Brian Talbot
|
6a618cbe5e
|
Merge branch 'master' into fix/btalbot/studio-typographyvariables
|
2013-05-15 16:02:44 -04:00 |
|
Calen Pennington
|
0df9f714b8
|
Install python prereqs before trying to run django or install requirements/local.txt
|
2013-05-15 15:49:51 -04:00 |
|
Will Daly
|
4e118a080e
|
Updated docs to add a note about Chrome / ChromeDriver revisions.
|
2013-05-15 15:48:03 -04:00 |
|
Will Daly
|
59f68c2179
|
Added comments for skipped tests
|
2013-05-15 15:45:12 -04:00 |
|