Valera Rozuvan
b1a73a5293
Client side drag and drop. Work in progress. Part 5.
2013-01-21 15:55:44 +02:00
Alexander Kryklia
57bec4083e
updated inpyttype to new req
2013-01-21 15:54:57 +02:00
Valera Rozuvan
4594986b38
Client side drag and drop. Work in progress. Part 4.
2013-01-21 15:54:56 +02:00
Valera Rozuvan
de954a41be
Changed back rakefile.
2013-01-21 15:54:56 +02:00
Valera Rozuvan
06fd823881
Client side drag and drop. Work in progress. Part 3.
2013-01-21 15:54:56 +02:00
Valera Rozuvan
f659247739
Client-side Drag and Drop: work in progress. Part 2.
2013-01-21 15:54:56 +02:00
Valera Rozuvan
8d69049746
Client-side Drag and Drop: work in progress. Part 1.
2013-01-21 15:53:44 +02:00
Alexander Kryklia
95060f3930
updated python part to sync with new interface
2013-01-21 15:53:44 +02:00
Valera Rozuvan
61c68b740c
Set up of basic RequireJS skeleton structure.
2013-01-21 15:53:44 +02:00
Valera Rozuvan
757f955c5e
Moved JS for drag-and-drop from global capa. Now it will load only when required, and can be specified from any course.
2013-01-21 15:53:44 +02:00
Alexander Kryklia
313055fe96
transfer images list to html
2013-01-21 15:53:43 +02:00
Alexander Kryklia
ccb8e96acb
fix
2013-01-21 15:53:43 +02:00
Alexander Kryklia
a394419641
updates
2013-01-21 15:53:43 +02:00
Alexander Kryklia
c7add85c9a
added new tag
2013-01-21 15:53:43 +02:00
Alexander Kryklia
0001a67ce1
update tag name
2013-01-21 15:53:43 +02:00
Alexander Kryklia
cc78ebe329
rename tag
2013-01-21 15:53:43 +02:00
Alexander Kryklia
ea3b1f93b0
updated drag and drop files
2013-01-21 15:53:43 +02:00
Alexander Kryklia
5200534a4a
template for drag_and_drop capaproblem
2013-01-21 15:52:49 +02:00
Carlos Andrés Rocha
9790881af3
Merge pull request #1319 from MITx/bug/remove_extra_require_js
...
Remove extra RequireJS.js entry.
2013-01-18 14:07:07 -08:00
David Ormsbee
0f035b7692
Remove extra RequireJS.js entry.
2013-01-18 17:03:55 -05:00
David Ormsbee
84fa4a0192
Merge pull request #1318 from MITx/hotfix/rocha/javascript-error-in-sequence-display
...
Add missing semicolon at the end of sequence display module javascript
2013-01-18 14:02:27 -08:00
Carlos Andrés Rocha
84efafc896
Add missing semicolon at the end of sequence display module javascript
2013-01-18 17:00:51 -05:00
David Ormsbee
44e7d6b267
Merge pull request #1315 from MITx/diana/fix-sa-tests
...
Quick fixes to self assessment tests
2013-01-18 13:07:33 -08:00
Diana Huang
999a648c3f
Merge branch 'master' into diana/fix-sa-tests
2013-01-18 15:49:03 -05:00
David Ormsbee
878640b651
Merge pull request #1316 from MITx/bugfix/victor/beta_testers
...
fix tests--nosetests is overly excited about my code
2013-01-18 12:43:11 -08:00
Victor Shnayder
1411bd1a88
fix tests--nosetests is overly excited about my code
2013-01-18 15:39:28 -05:00
Diana Huang
89055da8ba
Take out useless logging.
2013-01-18 15:38:59 -05:00
Diana Huang
0e3aeb4041
Merge branch 'master' into diana/fix-sa-tests
2013-01-18 15:21:50 -05:00
Diana Huang
bd6d153126
Fix failing self-assessment unit tests
2013-01-18 15:18:13 -05:00
David Ormsbee
bdc55d3686
Merge pull request #1308 from MITx/feature/rocha/sort-by-announcement-date
...
Sort courses by announcement date
2013-01-18 11:20:18 -08:00
David Ormsbee
33093e2d7a
Merge pull request #1313 from MITx/feature/ichuang/fix-bug-in-idashboard
...
fix bug in instructor dashboard groups code
2013-01-18 11:17:30 -08:00
ichuang
6d73a399b1
fix bug in instructor dashboard groups code
2013-01-18 14:04:01 -05:00
Carlos Andrés Rocha
ef69b738c9
Sort courses announcement date
...
If there is no announcement date (in the policy metadata) then use a
heuristic to sort them.
If there is an announcement date, the use it in the heuristic to
determine if the course is new or not.
2013-01-17 21:46:58 -05:00
David Ormsbee
7ac36d2f43
Merge pull request #1306 from MITx/fix/vik/remove-mitxmako
...
Fix/vik/remove mitxmako
2013-01-17 14:19:23 -08:00
Vik Paruchuri
18dc59c93a
Error message fix
2013-01-17 17:18:10 -05:00
Vik Paruchuri
eaa6701c6f
Remove mitxmako dependencies, make rubric and oechild inherit fro object
2013-01-17 17:13:31 -05:00
jarv
af086c2029
Merge pull request #1304 from MITx/mysql-python
...
Add MySQL-Python back in for AWS.
2013-01-17 12:56:20 -08:00
Ashley Penney
2d55f871ee
While this is a pain for content developer local environment updates it breaks the LMS in EC2 which is vastly more important. We'll jsut have to address helping individual content people with installing MySQL if needed. This is a real dependency in production and I think those belong in here.
2013-01-17 15:51:26 -05:00
David Ormsbee
18d5792025
Merge pull request #1302 from MITx/bugfix/brian/pearson-reg
...
Bugfix/brian/pearson reg
2013-01-17 11:42:00 -08:00
David Ormsbee
9f33e3c755
Merge pull request #1294 from MITx/content/rocha/faq-update
...
Update content: FAQ, help page and front page video
2013-01-17 08:15:12 -08:00
David Ormsbee
15249b03d6
Merge pull request #1296 from MITx/hotfix/alex/gst
...
Hotfix/alex/gst
2013-01-17 08:14:39 -08:00
Brian Talbot
fdd395e0b3
pearson registration - synced up link text for emailing edx
2013-01-17 10:50:58 -05:00
Brian Talbot
59b328f4b2
pearson registration - removed telephone/fax placeholder attributes since they can't represent both domestic and international formatting easily
2013-01-17 10:49:57 -05:00
Carlos Andrés Rocha
9fdb4d0923
Replace front page video
...
[#154 ]
2013-01-17 10:47:50 -05:00
Carlos Andrés Rocha
1be58c62e3
Update /faq page: change certificate of completion to mastery
2013-01-17 10:47:50 -05:00
Carlos Andrés Rocha
00f83d03a0
Restore /faq page, and moved new content to /help
2013-01-17 10:47:50 -05:00
Brian Wilson
80b2f45ac5
move pearson_import to another branch
2013-01-17 10:14:55 -05:00
Alexander Kryklia
176be15998
removed unnecssary debug information
2013-01-17 14:25:28 +02:00
Alexander Kryklia
f22af62f2c
removed jstat, added javascript_loader
2013-01-17 14:22:13 +02:00
Alexander Kryklia
1d36e7baf9
now we invoke gst consturctor as callback to javascript_loader, so dependencies are loaded first
2013-01-17 14:21:52 +02:00
