Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,137 Commits 1 Branch 0 Tags
cbdf93473b15744e4c7130bc72159319c90bf194
Commit Graph

13137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Brian Talbot
d1c629882c studio - fixes Sass variable defintion to ensure the older -serif references the proper new -sans-serif variable 2013-05-15 15:42:59 -04:00
Calen Pennington
ec7c47828f Merge pull request #1961 from edx/feature/cale/maintain-dev-environment 
Feature/cale/maintain dev environment
 2013-05-15 12:36:36 -07:00
Calen Pennington
9c2756b76b Fix up documentation 2013-05-15 15:25:43 -04:00
Calen Pennington
b5c134e21e Make the externally facing asset watch commands wait for user intervention, and add internal tasks that only run as long as the rake process 2013-05-15 15:25:42 -04:00
Calen Pennington
91dce34f77 Be more graceful when terminating background processes 2013-05-15 15:25:42 -04:00
Calen Pennington
352a4da5b8 Use install_prereqs in tests 2013-05-15 15:25:42 -04:00
Calen Pennington
0701e1a776 Use local node_modules as system_node_path if none is set 2013-05-15 15:25:42 -04:00
Calen Pennington
52d209d053 Use coffee installed in local node_modules for tests 2013-05-15 15:25:41 -04:00
Calen Pennington
089ac002c6 Install prereqs before running pep8 or pylint 2013-05-15 15:25:41 -04:00
Calen Pennington
ed9b91e9d0 Add mechanism for running migrations of developer workspaces 2013-05-15 15:25:41 -04:00
Calen Pennington
9d42bce54f Split rake file into smaller, more manageable pieces 2013-05-15 15:25:35 -04:00
Calen Pennington
437158a4f1 Allow disabling of prereq installation 2013-05-15 15:23:57 -04:00
Calen Pennington
afdf10a448 Clean up how asset prereq tasks are wired up 2013-05-15 15:23:57 -04:00
Calen Pennington
6485b85a9c Allow overriding of prereqs cache dir 2013-05-15 15:23:57 -04:00
Calen Pennington
a22287f192 Install prereqs before starting cms/lms or running tests 2013-05-15 15:23:57 -04:00
Calen Pennington
964c21ff2b Add a jasmine test runner for capa 2013-05-15 15:23:56 -04:00
Calen Pennington
1c28f5a0ec Move Mysql and scipi to requirements/post.txt, because they require the contents of requirements.txt to be completely installed 2013-05-15 15:23:56 -04:00
Calen Pennington
ef17e9368c Make capa specify distribute 0.6.28 like the rest of the project 2013-05-15 15:23:56 -04:00
Calen Pennington
05d76c77ec Pip installs paths relative to the current directory, not the directory the requirements file is in 2013-05-15 15:23:56 -04:00
Calen Pennington
9743e84d0b Use launchy for opening browsers 2013-05-15 15:23:55 -04:00
Calen Pennington
8e54991b89 Clean out cruft from rake file 2013-05-15 15:23:55 -04:00
Carlos Andrés Rocha
4a835433ab Remove unused fixtures 2013-05-15 15:23:55 -04:00
Carlos Andrés Rocha
79a029ce9a Clean root project directory 2013-05-15 15:23:55 -04:00
Calen Pennington
14bf719538 Merge pull request #2019 from edx/fix/cale/xmodule-template-docs 
Add documentation of xmodule template files
 2013-05-15 12:20:10 -07:00
Calen Pennington
1746c60072 Merge pull request #2027 from edx/fix/cale/allow-liveserver-port-ranges 
Allow django liveserver to use larger port range
 2013-05-15 12:19:25 -07:00
Calen Pennington
f499dec1db Merge pull request #2028 from edx/feature/cale/flexible-repo-jenkins 
Make gcli commands flexible around org and repo name
 2013-05-15 12:15:48 -07:00
Calen Pennington
9689445251 Merge pull request #1964 from edx/feature/cale/parallel-build-venvs 
Use one virtualenv for each parallel build process
 2013-05-15 10:48:40 -07:00
Calen Pennington
8b7970938f Use one virtualenv for each parallel build process 2013-05-15 13:39:21 -04:00
Calen Pennington
b3e8d59762 Make gcli commands flexible around org and repo name 2013-05-15 13:19:42 -04:00