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

2140 Commits

Author SHA1 Message Date
Brian Talbot
bf8df49728 studio - revising line height between course nav titles and prefixes 2013-05-20 08:40:28 -04:00
Brian Talbot
098a5dda48 studio - reverts google web font import method back to original @font-face syntax since Sass doesn't like google's original method when processing 2013-05-20 08:39:18 -04:00
e0d
f8e9c4d4d1 Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name 
Set the default celery queue name in addition to the default routing key
 2013-05-17 15:02:31 -07:00
Carlos Andrés Rocha
34d39dde9a Set the default celery queue name in addition to the default routing key 2013-05-17 17:59:51 -04:00
Greg Price
372084e0b6 Merge branch 'drupal-new' 
Conflicts:
	lms/envs/common.py
 2013-05-17 16:17:35 -04:00
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Carlos Andrés Rocha
0042988ea7 Merge pull request #2063 from edx/feature/rocha/lets-use-celery 
Add Celery configuration to LMS and CMS
 2013-05-17 12:36:23 -07:00
Frances Botsford
e69b5c4792 adjusted width of header nav to prevent wrapping in PC FF, also put max-width on Org name and Course number in header to prevent the nav from getting bumped way over 2013-05-17 14:07:06 -04:00
Christina Roberts
f4044ed1e8 Merge pull request #2061 from edx/bug/christina/static-pages 
Make sure to get the correct modulestore on delete (static tabs do not e...
 2013-05-17 09:59:59 -07:00
Carlos Andrés Rocha
35bd38d677 Add status app with simple view to check celery workers 2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha
c05efbc31e Added base Celery settings 2013-05-17 11:33:14 -04:00
Brian Talbot
85f2be44b5 studio - resolves line-height issue that core typography settings creates with tooltip rendering 2013-05-17 10:46:58 -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
Diana Huang
1c2175304e Merge branch 'master' into drupal-new 2013-05-16 16:27:36 -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
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
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
Will Daly
59f68c2179 Added comments for skipped tests 2013-05-15 15:45:12 -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
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Will Daly
b3e959773d Disabled logging of warnings/errors for acceptance tests 
to make the logs readable
 2013-05-15 11:31:52 -04:00
Chris Dodge
6cec66979a fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test 2013-05-15 11:16:47 -04:00
Arthur Barrett
3a178bab1f Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-15 11:12:42 -04:00
Will Daly
3217989de5 Fixed/skipped CMS tests in subsection and signup. 2013-05-15 10:14:37 -04:00
Will Daly
8e069c1faa Skip tests that break on Ubuntu due to alerts (which will be removed 
soon anyway).  Removed @skip-phantom and @skip-firefox tags

Fixed sign up test to work in Ubuntu

Added comments
 2013-05-15 09:39:07 -04:00
David Baumgold
1afe556161 Merge pull request #2039 from edx/fix-course-updates 
Fix "Course Updates" page
 2013-05-14 16:14:20 -07:00
Frances Botsford
6c119fa3ab refixed extend for text-sr and text-hide 2013-05-14 17:17:43 -04:00
frances botsford
24b7defb43 removed mixin for text-sr and text-hide, replaced with extend 2013-05-14 17:17:42 -04:00
Brian Talbot
8b77111d58 Studio: more styling changes 
typography, SASS, imports
 2013-05-14 17:16:53 -04:00
Jay Zoldak
5d783d33ad Update lettuce test for new css changes. 2013-05-14 17:16:51 -04:00
Brian Talbot
f069c1a1a1 Studio: style reorg 
typography, SASS import, mixins/extends
 2013-05-14 17:15:07 -04:00
David Baumgold
e9a8f408bf Add {reset: true} to all collection.fetch() calls 
This is to fix a bug with the Backbone 1.0 upgrade; some views were listening to
reset events that were not longer getting fired
 2013-05-14 16:43:41 -04:00
Will Daly
36fb8f91e0 Acceptance tests now use the same mongo db as the unit test suite. 
The LMS/CMS acceptance tests both use the collection acceptance_modules
 2013-05-14 12:45:38 -04:00
Will Daly
daef910494 Mae mongo DB and collection names consistent for all 
acceptance tests.
 2013-05-14 12:34:15 -04:00
Arthur Barrett
5e39971fcc merge master. resolved conflicts in component.py and course.py. 2013-05-14 10:54:21 -04:00
Will Daly
72a42413e2 Fixed database to work on Jenkins (now stored in test_root), 
moved syncdb/migration steps into the rake test_acceptance commands
and updated the documentation.
 2013-05-14 10:33:25 -04:00
Calen Pennington
bd6bb8e9c1 Fix advanced modules list 2013-05-14 09:39:25 -04:00
Arthur Barrett
bea943d537 merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules. 2013-05-13 16:26:28 -04:00
Steve Strassmann
7b71271bc1 prefix unused vars with _ 2013-05-13 15:21:29 -04:00
Steve Strassmann
9b7374ab73 pull from master 2013-05-13 15:07:14 -04:00
Steve Strassmann
10b7622018 declare exports from course, component 2013-05-13 15:06:52 -04:00
David Baumgold
f0bd73b2fb Merge pull request #2022 from edx/kill-submodules 
Install phantom-jasmine via npm, rather than git submodules
 2013-05-13 12:02:41 -07:00
Arthur Barrett
55942b8a0b fix brokn tab test 2013-05-13 14:57:36 -04:00
Steve Strassmann
b3cc9a1174 pep8 cleanups 2013-05-13 14:55:41 -04:00
Arthur Barrett
8f07072d3d added unit tests to add/remove course tab utility functions. 2013-05-13 14:44:56 -04:00
Arthur Barrett
8cddec41bf updated comments about adding/removing tab types for advanced modules 2013-05-13 13:55:59 -04:00
Steve Strassmann
96c37089dc whitespace for pep8 2013-05-13 13:47:51 -04:00