Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
11,300 Commits 1 Branch 0 Tags
97b44446a09a411dfade8b57c2bf10c08a7a10da
Commit Graph

1589 Commits

Author SHA1 Message Date
Brian Talbot
97b44446a0 studio - checklists: added animation to collapse/expand toggle 2013-03-14 16:30:48 -04:00
Brian Talbot
13c38fa173 studio - checklists: revised input/label HTML and adjusted styling for each 2013-03-14 16:17:47 -04:00
cahrens
ac25b02ce6 Minor updates. 2013-03-14 13:48:17 -04:00
cahrens
9a7b0fb563 Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 
Conflicts:
	cms/templates/checklists.html
 2013-03-14 13:47:55 -04:00
cahrens
017fd06bfc Pre-merge. 2013-03-14 13:37:22 -04:00
Brian Talbot
0aea85a4d9 studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators 2013-03-14 12:55:44 -04:00
cahrens
564374048e A little cleanup. 2013-03-14 09:35:26 -04:00
cahrens
065e850449 Merge with Brian's changes. 2013-03-14 09:32:54 -04:00
cahrens
e0207432ca Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1 Saving work. 2013-03-14 09:22:58 -04:00
Brian Talbot
1fce77d8b2 Merge branch 'master' into feature/btalbot/studio-checklists 2013-03-13 19:19:38 -04:00
Brian Talbot
7b74d972a1 studio - checklists: defaulting checklist visual progress to 0% 2013-03-13 19:18:47 -04:00
Brian Talbot
16f6744aef studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states 2013-03-13 19:13:26 -04:00
Brian Talbot
bf71f099d4 studio - checklists: finished static styling, initial checklist content import, and some basic JS 2013-03-13 14:09:18 -04:00
Brian Talbot
66a8735a58 studio - Checklists: initial design and front end proofing/firming up - WIP 2013-03-13 10:50:34 -04:00
Brian Talbot
1b5f040021 studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI 2013-03-12 21:57:40 -04:00
Chris Dodge
e5ee0a77ed hot fix for delete_item. The 'delete_all_versions' is useful in that it is set to true when doing explicit deletes as opposed to 'delete draft'. If delete_all_versions=False, then don't remove the deleted item from the parent children collection 2013-03-12 15:24:10 -04:00
Chris Dodge
bf0e5a2701 do a bunch of pylint improvements 2013-03-11 21:14:24 -04:00
Don Mitchell
d85f7ac9be Merge pull request #1645 from MITx/feature/cdodge/pylint-cleanup 
Feature/cdodge/pylint cleanup
 2013-03-11 12:10:05 -07:00
Chris Dodge
4ec3683c3c clean up some pylint violations 2013-03-11 14:57:04 -04:00
Chris Dodge
26f4424581 clean up some pylint violations 2013-03-11 14:55:37 -04:00
Chris Dodge
78c8358957 clean up pyling violations from views.py 2013-03-11 14:51:44 -04:00
Chris Dodge
d38b37f0b4 delete_item should update the parent's list of children to reflect the delete operation. Also added unit test 2013-03-11 10:47:22 -04:00
cahrens
f5dd5d35e9 Need to trigger invalid instead of error, after changes for new version of Backbone. 2013-03-08 14:51:29 -05:00
Jay Zoldak
c5a9ec5e86 Speed up the lettuce test for no policy settings. 2013-03-08 13:34:28 -05:00
Jay Zoldak
3c3f6c3cbe Revert lettuce css_find function to not fail if it does not find the element. 2013-03-08 13:34:28 -05:00
Calen Pennington
d9b68e2de2 Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics 
Add datadog metrics capture around heartbeat timing
 2013-03-08 08:59:44 -08:00
Jay Zoldak
55eefd0ef6 Fix test that sets release date to work on all platforms 2013-03-08 11:15:15 -05:00
Jay Zoldak
24d088933e Fix intermittent lettuce test failure on ubuntu. 2013-03-08 11:15:15 -05:00
Jay Zoldak
21e7bc5128 More robust handling for finding and clicking on objects by css. 
Tag tests not working under PhantomJS to skip for now.
 2013-03-08 11:15:14 -05:00
Jay Zoldak
b66d0cf5da Fix signup test on ubuntu 2013-03-08 11:15:14 -05:00
Jay Zoldak
ad5d2a9624 Update update_templates reference 2013-03-08 11:15:14 -05:00
Jay Zoldak
e84fa63826 Catch WebDriverException 2013-03-08 11:15:14 -05:00
Jay Zoldak
21c15d8f1f Click in the upper left of an element instead of the middle. 2013-03-08 11:15:14 -05:00
Jay Zoldak
3cec8f1a76 Catch WebDriverException 2013-03-08 11:15:14 -05:00
Jay Zoldak
b9e5ed9525 Click in the upper left of an element instead of the middle. 2013-03-08 11:15:14 -05:00
Calen Pennington
cd802d8e14 Add datadog metrics capture around heartbeat timing 2013-03-08 10:36:59 -05:00
Don Mitchell
49db56ab7d Merge pull request #1618 from MITx/bug/christina/misc 
New version of Backbone has separate invalid event.
 2013-03-07 11:02:52 -08:00
cahrens
98e410816e New version of Backbone has separate invalid event. 2013-03-07 13:52:55 -05:00
cahrens
9ec33928ce New version of Backbone has separate invalid event. 2013-03-07 13:37:10 -05:00
chrisndodge
19eb6a3449 Merge pull request #1617 from MITx/bug/christina/misc 
Disable Django toolbar-- breaking mongo updates.
 2013-03-07 08:31:44 -08:00
cahrens
4434ca632e Disable Django toolbar-- breaking mongo updates. 2013-03-07 11:30:00 -05:00
Chris Dodge
9ba759802c make export a bit more resilient. If there's a piece of metadata that we can't serialize - i.e. someone wrote a new bool attribute and didn't put it in the type mapping table - then we log the exception and continue. 2013-03-07 10:43:36 -05:00
chrisndodge
05211d4fe8 Merge pull request #1607 from MITx/feature/christina/djdebug 
Enable Django debug toolbar on Studio (including Mongo panel).
 2013-03-06 13:14:19 -08:00
cahrens
de225e6623 Enable Django debug toolbar on Studio (including Mongo panel). 2013-03-06 14:08:54 -05:00
cahrens
b706d4a1f5 Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox. 
#225
 2013-03-06 11:50:23 -05:00
Christina Roberts
e093431d75 Merge pull request #1581 from MITx/feature/vik/advanced-studio 
Feature/vik/advanced studio
 2013-03-05 12:28:29 -08:00
Vik Paruchuri
102c594e7b Remove string and old import 2013-03-05 15:01:12 -05:00
Arthur Barrett
5bbb70ef8a Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu. 2013-03-05 13:47:02 -05:00
Will Daly
a018b8ac38 Merge pull request #1599 from MITx/feature/deena/testing 
Feature/deena/testing
 2013-03-05 09:48:23 -08:00