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

10630 Commits

Author SHA1 Message Date
Arthur Barrett
3a178bab1f Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-15 11:12:42 -04:00
marco
e157173c11 styling adjustments to codemirror and wrapped polyfill into a function 2013-05-15 10:53:54 -04:00
Will Daly
3217989de5 Fixed/skipped CMS tests in subsection and signup. 2013-05-15 10:14:37 -04:00
Chris Dodge
ce52be1e57 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-15 09:59:26 -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
marco
b9fc3f9e07 updated styles for input type numbers 2013-05-15 00:04:41 -04:00
marco
47a4d6b6a1 initial polyfill implementation and metadata number entry javascript validation 2013-05-14 23:55:34 -04:00
marco
98e692d15e fixed broken coffee script caused by errant pseudo code I checked in 2013-05-14 23:03:33 -04:00
marco
81e95f27db basic tab switching added 2013-05-14 22:31:11 -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
marco
6ec1a29201 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-14 15:05:29 -04:00
marco
064d21c4e2 clean up of editor header styling 2013-05-14 15:05:22 -04:00
cahrens
17750a7d6d Use min, max, and step values from server. 2013-05-14 14:20:10 -04:00
cahrens
5bd0442ffb Merge branch 'master' into feature/christina/metadata-ui 2013-05-14 13:53:03 -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
cahrens
69832c57a9 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-14 12:40:25 -04:00
cahrens
82899d6d2e Number view. 2013-05-14 12:40:17 -04:00
marco
8d8c8d83df updated unit styling, added polyfill js library, updated javascript handling for modes swap 2013-05-14 12:38:52 -04:00
Will Daly
daef910494 Mae mongo DB and collection names consistent for all 
acceptance tests.
 2013-05-14 12:34:15 -04:00
Chris Dodge
5df23d15f2 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
 2013-05-14 10:57:11 -04:00
Arthur Barrett
5e39971fcc merge master. resolved conflicts in component.py and course.py. 2013-05-14 10:54:21 -04:00
Chris Dodge
ef78c99f70 pep8/pylint violations fixes 2013-05-14 10:53:10 -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
marco
0aaaf84f62 added number metadata template, cleaned up editor theme ui bordering and settings styles 2013-05-14 08:22:36 -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
marco
cb4019304a cleaned up references to proper elements in settings header mode buttons 2013-05-13 16:22:14 -04:00
Chris Dodge
155ad08b9e create forums permissions on course create 2013-05-13 16:04:20 -04:00
Chris Dodge
cbe205328a Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2013-05-13 15:47:33 -04:00
cahrens
2a8b8e2010 Merge branch 'master' into feature/christina/metadata-ui 2013-05-13 15:36:15 -04:00
cahrens
8c36918abf Support display names for choices. 2013-05-13 15:35:55 -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
Arthur Barrett
be98b5fa3e merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list) 2013-05-13 13:26:55 -04:00
Steve Strassmann
cdc2de7e65 Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views 
pull from master
 2013-05-13 13:22:39 -04:00
Steve Strassmann
b0cc989b1e pull from master 2013-05-13 11:45:23 -04:00
David Baumgold
7c98981498 Install phantom-jasmine via npm, rather than git submodules 
Because removing a step from our install process is a Good Thing™
 2013-05-13 11:33:09 -04:00