Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

2444 Commits

Author SHA1 Message Date
cahrens
e6dfa8e81c Merge branch 'master' into feature/christina/metadata-ui 2013-05-31 09:46:17 -04:00
Valera Rozuvan
37cffd0835 Added videoalpha to advanced components in component.py file. 2013-05-31 13:48:17 +03:00
David Baumgold
4f1e6c484e Put the advanced settings notifications back in 2013-05-30 15:08:40 -04:00
Peter Fogg
1ead857792 Working on Lettuce tests for video in LMS. 
In progress, committing for the great git history rewrite.
 2013-05-30 15:01:23 -04:00
cahrens
6c06599d75 Prepare for Peter's change. 2013-05-30 14:30:28 -04:00
JonahStanley
62b74008e6 Added tests for Limited Attempt Problems and Showing the Answer 2013-05-30 14:22:37 -04:00
cahrens
46cf5e3338 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-30 14:13:14 -04:00
cahrens
8fd15ce45d Review feedback. 2013-05-30 14:13:10 -04:00
Jay Zoldak
86afe7279b Refactor user factory usage for lettuce tests. Fix merge conflict. 2013-05-30 13:48:07 -04:00
cahrens
c0c5e920a3 Go back to setFixtures. 2013-05-30 12:56:55 -04:00
Jay Zoldak
2f504ec4bf fix merge conflict 2013-05-30 12:42:50 -04:00
Jay Zoldak
a1b62912f3 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-30 12:33:15 -04:00
Jay Zoldak
4a64c0c9b6 Merge in from origin/feature/christina/metadata-ui 2013-05-30 12:33:02 -04:00
cahrens
14eb9c9a3b Merge branch 'master' into feature/christina/metadata-ui 2013-05-30 12:27:03 -04:00
Jay Zoldak
6627ca5635 Tidy up the new lettuce tests for metadata editing a bit. 2013-05-30 12:26:18 -04:00
cahrens
5d41e2a952 Updates from code review. 2013-05-30 12:26:01 -04:00
Peter Fogg
6eeb12ad1c Add Lettuce tests for autoplay in Studio. 2013-05-30 11:34:15 -04:00
Peter Fogg
5465bda5f3 Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div. 2013-05-29 17:00:25 -04:00
cahrens
f0260757c5 Cleanup. 2013-05-29 16:50:22 -04:00
cahrens
551a1c1516 pep8 and documentation cleanup. 2013-05-29 15:47:46 -04:00
cahrens
4920f08d2a i18n 2013-05-29 15:15:31 -04:00
cahrens
7d07309f9d Don't call setFixtures. Can stomp on other tests. 2013-05-29 14:03:16 -04:00
cahrens
24707f8f85 Jasmine test for views. 2013-05-29 12:09:42 -04:00
cahrens
625c6b518c Cleanup, change how we load templates. 2013-05-28 14:07:35 -04:00
cahrens
aca5cbb215 Merge branch 'master' into bug/christina/preview_url 2013-05-28 12:13:19 -04:00
cahrens
e0bb4ad4dd Preview url is read in from environment file. 2013-05-28 12:04:48 -04:00
cahrens
6be9463eca Cleanup. 2013-05-27 21:50:56 -04:00
cahrens
851ed6722a Continue merge. 2013-05-27 20:28:56 -04:00
cahrens
17c710af83 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
 2013-05-27 20:08:09 -04:00
cahrens
599a215ad0 Move includes to right place. 2013-05-27 19:36:02 -04:00
Vik Paruchuri
cef401f246 Swap icon to icon-table 2013-05-24 16:20:59 -04:00
cahrens
87d904cb35 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/templates/base.html
 2013-05-24 16:10:34 -04:00
Vik Paruchuri
9cbb4e090d Swap icons for font awesome 2013-05-24 14:40:33 -04:00
Vik Paruchuri
5050eab74a Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor 2013-05-24 14:26:33 -04:00
marco
c0aef206ae Merge branch 'style/btalbot/metadata-ui' into feature/christina/metadata-ui 2013-05-24 09:49:57 -04:00
Frances Botsford
dfb623a29f removed old icon css and js files and references that are no longer needed 2013-05-24 09:01:15 -04:00
Frances Botsford
8b76afb938 converted undo image in component settings list to FontAwesome 2013-05-24 08:51:14 -04:00
cahrens
138ad3988f Update test (and set PREVIEW_LMS_BASE to something different so we can actually test the method). 2013-05-23 17:06:02 -04:00
cahrens
a03a4fdd07 PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). Make this work locally as well. 
https://edx.lighthouseapp.com/projects/102637/tickets/331
 2013-05-23 16:45:10 -04:00
cahrens
522b76e847 PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). 
https://edx.lighthouseapp.com/projects/102637/tickets/331
 2013-05-23 16:27:05 -04:00
Calen Pennington
69beea854c Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports 
Record junit reports of jasmine tests
 2013-05-23 11:06:34 -07:00
Brian Talbot
7940ca54ad studio - adjusts visual vertical spacing of save/cancel actions in modal editing windows on unit and page edits. 2013-05-23 13:27:22 -04:00
David Baumgold
007a4e534f Merge pull request #2110 from edx/fix/db/lettuce-tests 
Fix lettuce tests
 2013-05-23 09:55:56 -07:00
David Baumgold
cf1e906c13 Fix lettuce tests 2013-05-23 12:50:19 -04:00
cahrens
1a8a721998 Will not do unrelated test at this time. 2013-05-23 12:31:20 -04:00
chrisndodge
a8084628e1 Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master 
Feature/cdodge/autoprovision forums master
 2013-05-23 09:27:36 -07:00
David Baumgold
082e24c634 Removed references to server_error.js 2013-05-23 12:09:12 -04:00
cahrens
c95b44d851 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-05-23 11:41:12 -04:00
cahrens
c8d6d5d283 Selenium tests. 2013-05-23 11:34:02 -04:00
David Baumgold
c26edbd631 jasmine-jquery compatiblity post-backport 2013-05-23 10:14:47 -04:00