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

18378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
6bd015d321 Update docs readme 2013-10-07 15:40:36 -04:00
jkarni
31980150f0 Merge pull request #1043 from edx/jkarni/feature/import-feedback 
Jkarni/feature/import feedback
 2013-10-07 12:13:07 -07:00
Julian Arni
bb00924917 Use requirejs for import.js 
And fixes for rebase-breakage.
 2013-10-07 14:07:26 -04:00
Adam
faf796b574 Merge pull request #1125 from edx/adam/remove-instr-dash-buttons 
disable buttons for legacy and beta instr dash
 2013-10-07 10:36:51 -07:00
Will Daly
a617988cf7 Merge pull request #1232 from edx/will/navigation-grading-test-fixes 
Fix navigation and grading acceptance tests
 2013-10-07 08:34:48 -07:00
Adam Palay
e37584619b add entry to changelog 2013-10-07 10:14:12 -04:00
Brian Talbot
8ec583c355 LMS: abstracts consistent message/copy color styling from Instructor Dashboard view 
LMS: adds message styling to the separate instructor_2 Sass file
 2013-10-07 10:14:10 -04:00
Adam Palay
197f9015aa disable buttons for large courses on legacy and beta instr dash 
set max enrollment for downloads to 200
 2013-10-07 10:11:08 -04:00
Brian Talbot
5cfec75ece Studio: adds in instructional copy to user on when it is safe to leave the import view without harming an import process 2013-10-07 09:57:41 -04:00
Julian Arni
777144111a Update changelog 2013-10-07 09:57:41 -04:00
Julian Arni
57b38969e5 Move import-related js to import.js 2013-10-07 09:57:20 -04:00
Julian Arni
7b3c4945cf Review fixes 
Studio: revises import help/status copy to better reflect/generalize what is done with imported content

Add test cases for import status
 2013-10-07 09:55:46 -04:00
Julian Arni
642bf0e6e6 Clear import status on retry 2013-10-07 09:53:37 -04:00
Brian Talbot
1735a0f41f Studio: copy and styling changes to import view to support new status UI 2013-10-07 09:52:59 -04:00
Brian Talbot
89bba535e1 Studio: adds in action-related elements to the status display UI of the Import view 2013-10-07 09:52:59 -04:00
Julian Arni
4bbacb02db Re-add bar references 2013-10-07 09:52:59 -04:00
Julian Arni
cab7c4ff74 Remove references to old upload progress bar 2013-10-07 09:52:59 -04:00
Brian Talbot
76ee27c22a Studio: revises import view Sass extends to use placeholder syntax 2013-10-07 09:52:59 -04:00
Julian Arni
45ce8d30d9 Use swanky error css for error messages 2013-10-07 09:52:59 -04:00
Julian Arni
abdaeef9d8 Hook up js to css classes 2013-10-07 09:51:52 -04:00
Brian Talbot
59af44574c Studio: revises general layout/styling of import view and adds in detail progress feedback after import (WIP) 
Studio: removes import progress bar HTML and Sass; hides import status by default

Studio: revises import file upload success copy; sets up showing/hiding states for import status and additional messages

Studio: revises iconography and adds in success step in import status feedback

Studio: adds hidden styling back into import status UI
 2013-10-07 09:51:19 -04:00
Julian Arni
a108827564 Route ajax request to appropriate view, and show feedback only then 
Hook up view

Fix getStatus function
 2013-10-07 09:51:19 -04:00
Julian Arni
c62691e9fc Scaffolding for import progress reporting 2013-10-07 09:49:59 -04:00
Will Daly
3257a7baf2 Refactored navigation feature 
Fixed grading tests
 2013-10-07 09:41:18 -04:00
jmclaus
4bb9dcf190 Merge pull request #1220 from edx/jmclaus/bugfix_bypass_captions 
Captions are now removed from tab order when hidden
 2013-10-04 15:02:45 -07:00
Julian Arni
f095f3c8c8 Merge branch 'release' 2013-10-04 17:34:49 -04:00
jkarni
602eb87676 Merge pull request #1227 from edx/jkarni/hotfix/safetar 
Use wrapped tar extraction
 2013-10-04 14:30:48 -07:00
Nick Parlante
5d995ddb5c Merge pull request #1228 from edx/nick/fix-customization-visibility 
Bug fix - text_customization should not show in settings
 2013-10-04 13:50:49 -07:00
jmclaus
4f59e6bbee Captions are now removed from tab order when hidden 2013-10-04 22:16:59 +02:00
Nick Parlante
ad7c3f932b Bug fix - text_customization should not show in settings 
Also change test to not expect text_customization
 2013-10-04 12:55:28 -07:00
Julian Arni
dadc766fc0 Use wrapped tar extraction 
Signed-off-by: Julian Arni <julian@edx.org>
 2013-10-04 15:47:58 -04:00
Will Daly
e11bd1d96f Merge pull request #1226 from edx/will/use-lettuce-fork 
Use a forked version of lettuce that fixes a bug with tag inheritance
 2013-10-04 12:07:34 -07:00
David Baumgold
715aa6985e Merge pull request #662 from edx/db/requirejs 
requirejs in Studio
 2013-10-04 11:42:07 -07:00
Usman Khalid
a47442ed01 Merge pull request #1222 from edx/usman/lms1112-register-form-help-text 
register.html: Corrected help text for username & name fields
 2013-10-04 11:28:31 -07:00
Diana Huang
ab74b4d56f Merge pull request #1225 from edx/diana/fix-dashboard-error 
Add in the static namespace to the new template
 2013-10-04 11:27:23 -07:00
Will Daly
b7b8a2da8a Use a forked version of lettuce that fixes a bug with tag inheritence 2013-10-04 14:20:05 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Diana Huang
f51a99c9bc Add in the static namespace to the new template 2013-10-04 13:28:33 -04:00
Sarina Canelake
94ce535f41 Merge pull request #1008 from edx/fix/ichuang/inline-for-formulaequationinput 
add inline style flag to formulaequationinput
 2013-10-04 10:05:21 -07:00
ichuang
5b460ff6b7 add inline style flag to formulaequationinput 2013-10-04 11:56:50 -04:00
Will Daly
54ea98d249 Merge pull request #1219 from edx/will/run-individual-tests 
Allow rake test to run individual tests again
 2013-10-04 07:27:30 -07:00
Jay Zoldak
2d17c00eef Merge pull request #1223 from edx/zoldak/fix-acceptance-text-customization 
Modify acceptance tests to account for the new text_customization...
 2013-10-04 07:18:47 -07:00
Jay Zoldak
cce3758363 Modify acceptance tests to account for the new text_customization capa field 2013-10-04 09:38:40 -04:00
Diana Huang
3ec8df9f5e Merge pull request #1216 from edx/diana/dashboard-cleanup 
Some dasbhoard template cleanup
 2013-10-04 06:17:06 -07:00
Diana Huang
361fbaff03 Update CHANGELOG 2013-10-04 09:16:23 -04:00
Usman Khalid
f80a32e082 Register.html: Corrected help text for username & name fields 2013-10-04 17:12:23 +05:00
Nick Parlante
32bf5b93b2 Merge pull request #1106 from edx/nick/customization 
Targeted string customization in the lms UI
 2013-10-03 14:41:36 -07:00
Diana Huang
6bb2ba283b Remove more unnecessary imports 2013-10-03 16:34:16 -04:00
Jay Zoldak
23dd16611d Merge pull request #1218 from edx/zoldak/fix-file-matcher 
Fix the matcher for the word 'test' in the upload file step of tests
 2013-10-03 13:28:55 -07:00
Diana Huang
ed5168ec61 Move more dashboard logic into the views 2013-10-03 16:22:00 -04:00