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

21085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
ece123e90f More than one dummy language 2014-02-08 10:37:01 -05:00
Andy Armstrong
a60abede7b Merge pull request #2524 from edx/andya/dev-show-template 
Add the ability to view templates in a browser in development mode
 2014-02-07 15:43:17 -05:00
David Baumgold
e09990ff30 Merge pull request #2413 from edx/bugfix/ichuang/do-not-import-tilde-files 
Skip tilde files when importing
 2014-02-07 15:42:02 -05:00
Jason Bau
50f7c0ebed Merge pull request #2510 from edx/jbau/fix-timezone-test-breakage 
fix tests that were breaking on dev envs due to TIME_ZONE='UTC'
 2014-02-07 12:28:36 -08:00
David Baumgold
d1dc8c9191 Add README to tilde fixture, fix pylint/pep8 issues 2014-02-07 15:03:37 -05:00
Greg Price
b1fc36d513 Merge pull request #2514 from edx/gprice/fix-single-thread-recursive 
Avoid requesting unnecessary thread responses
 2014-02-07 15:01:44 -05:00
Andy Armstrong
651d1afbf8 Add the ability to view templates in a browser in development mode 
This adds a simple mechanism to view any template file directly in a browser. The intention is that we can use this to build up reference HTML files which illustrate common UX patterns. We can then view the resulting pages without having to have a working implementation.

In development mode, the URL is /template followed by the path to the template file. For example, you can view the 404 page at:

    /template/404.html

You can also supply string parameters to the template by specifying them as query parameters in the URL.

e.g.  /template/my_template?name=Foo
 2014-02-07 14:56:35 -05:00
Mark Hoeber
2086fcb811 Merge pull request #2427 from edx/sylvia/documentation/BLD-793 
Remove warning about LTI not working in Preview mode
 2014-02-07 14:53:31 -05:00
Giulio Gratta
732051311d Merge pull request #2362 from edx/giulio/image-modal-squash 
Image Modal CMS HTML Block subtype
 2014-02-07 09:41:39 -08:00
Giulio Gratta
5e67612e9b Image Modal CMS HTML Block subtype 
- Added YAML file for the HTML template code for the modal to work
- Added CSS and JS code for modal to look and function properly
- Updated code to take comments into account.
- Simplified HTML template and expanded JS to set up image modal on load.
- Added preliminary drag script.
- Converted jQuery UI draggable to Draggabilly
 2014-02-07 09:21:20 -08:00
Greg Price
bc0ca63f7e Avoid requesting unnecessary thread responses 
The front-end code for rendering a thread always makes an AJAX request
for the resopnses, regardless of how the thread was accessed (directly
by URL or by selecting it from the thread list). Previously, when
a user accessed a thread directly by URL, the LMS would initially
request the thread from the comments service with responses, but that
response data was never actually used. Now, the responses are not
fetched with that initial query.
 2014-02-07 10:50:59 -05:00
Greg Price
b1e5bbb8ff Merge pull request #2504 from edx/gprice/forum-pagination-acceptance 
Add acceptance tests for forum response pagination
 2014-02-07 10:47:07 -05:00
David Baumgold
ff910028fd Merge pull request #2465 from glowe/fix-sequence-position 
Fix goto_position in sequence coffeescript.
 2014-02-07 10:46:33 -05:00
Ned Batchelder
c7de2b7f25 Merge pull request #2485 from edx/ned/make-i18n-generate-forgiving 
Make i18n:generate more flexible
 2014-02-07 10:41:42 -05:00
Mark Hoeber
8b924404df Merge pull request #2513 from edx/sylvia/documentation/BLD-801 
Sylvia/documentation/bld 801
 2014-02-07 10:34:09 -05:00
Sylvia Pearce
7632c229e2 Reorganize content in Appendix E 
Change order of tags (now alphabetical); add link list at beginning of document
 2014-02-07 10:28:38 -05:00
David Baumgold
83b0eda4a4 Add test for ignoring tilde static files on import 2014-02-07 10:26:02 -05:00
David Baumgold
cc091f833a Add test for ignoring tilde files on import of extra content 2014-02-07 10:25:46 -05:00
Dave St.Germain
98a5ce3261 Merge pull request #2499 from edx/dcs/a11y-slight-rearrange 
Added an alt tag to the footer logo; added charset meta tag; moved
 2014-02-07 10:05:52 -05:00
Brian Talbot
08f448389a Merge pull request #2410 from ionis-education-group/courseware-none-bodyclass 
Add '' default to bodyclass in courseware templates
 2014-02-07 10:00:59 -05:00
David Baumgold
a93ef64a68 Merge pull request #2454 from ionis-education-group/theme-template-paths 
Prepend theme template paths
 2014-02-07 09:25:34 -05:00
Jason Bau
fc8efc3017 fix tests that were breaking on dev envs due to TIME_ZONE='UTC' 2014-02-06 23:07:26 -08:00
John Jarvis
6c5ad2b74a Merge pull request #2448 from edx/jarv/db-env-override 
Jarv/db env override
 2014-02-06 17:53:26 -05:00
Greg Price
8e3a77fa1e Add acceptance tests for forum response pagination 2014-02-06 17:52:14 -05:00
Mark Hoeber
1cef2fe59f Merge pull request #2506 from edx/sylvia/documentation/add_PT_and_ME 
Add periodic table and molecule editor to Additional Tools
 2014-02-06 16:35:57 -05:00
David Baumgold
3f1612acea Merge pull request #2497 from edx/db/brew-bundle-install-script 
Teach install-system-req.sh about `brew bundle`
 2014-02-06 16:12:37 -05:00
Jason Bau
c3e1184211 Merge pull request #2269 from edx/jbau/lms-localize-datetime 
make LMS accordion and progress datetime display respect settings.TIME_ZONE
 2014-02-06 12:48:10 -08:00
Sarina Canelake
9a10c322e6 Merge pull request #2495 from edx/sarina/update-i18n-guide 
Update i18n coding guidelines
 2014-02-06 14:59:06 -05:00
ichuang
09bdcbbc6f skip ~ files in static content import 2014-02-06 14:21:40 -05:00
ichuang
33f86a7af1 skip *~ files in import of extra content (e.g. info and about pages) 2014-02-06 14:21:40 -05:00
Sylvia Pearce
9506e44906 Add periodic table and molecule editor to Additional Tools 2014-02-06 14:18:54 -05:00
Sarina Canelake
5f841f286b Update i18n coding guidelines 2014-02-06 14:18:15 -05:00
David Baumgold
b9edc195bf Merge pull request #2505 from edx/db/resolve-dev-env-script 
fixup create-dev-env.sh
 2014-02-06 14:12:40 -05:00
David Baumgold
decda74899 Teach install-system-req.sh about brew bundle 2014-02-06 14:11:11 -05:00
David Baumgold
c273648395 fixup create-dev-env.sh 2014-02-06 14:09:05 -05:00
Greg Price
e1c36aa557 Merge pull request #2456 from edx/gprice/i18n-extract-dependency 
Make assets:coffee a dependency of i18n:extract
 2014-02-06 13:35:25 -05:00
David Baumgold
44d7d9523e Merge pull request #2501 from edx/db/clarify-test 
Minor test cleanup
 2014-02-06 13:05:11 -05:00
Sylvia Pearce
f7859c432c Continue updating Appendix E 2014-02-06 12:24:36 -05:00
Greg Price
02a233b7e2 Rename URL_PATH to url_path in acceptance code 
It's not a constant, and some subclasses will want to make it a
function with @property.
 2014-02-06 12:02:48 -05:00
David Baumgold
698aedc329 better pylint formatting 2014-02-06 11:56:46 -05:00
David Baumgold
2d59d44bb5 Clarify DATA_DIR path 2014-02-06 11:55:41 -05:00
hkim823
37fea91d37 Merge branch 'master' of https://github.com/edx/edx-platform 2014-02-06 11:48:12 -05:00
Graham Lowe
c659b1c5f4 Fix goto_position in sequence coffeescript. 
Replace single-quotes with double-quotes so that #{@ajaxUrl} is
interpolated.
 2014-02-06 11:36:11 -05:00
Brian Talbot
a41bdb46db Merge pull request #2476 from ionis-education-group/bodyclass-without-js 
Stop using JavaScript to set the body's CSS class
 2014-02-06 11:28:09 -05:00
Feanil Patel
4636b2706c Merge pull request #2494 from edx/feanil/fix_cms_gather_assets 
Pull THEME_NAME from envs tokens if it's there.
 2014-02-06 11:25:37 -05:00
Dave St.Germain
2d72184620 Added an alt tag to the footer logo; added charset meta tag; moved 
DOCTYPE to the top of the file.
 2014-02-06 11:25:16 -05:00
hkim823
70ca3a4729 fixing create-dev-env.sh to use Brewfile 2014-02-06 11:10:05 -05:00
Ned Batchelder
e64ab5e454 Merge pull request #2417 from edx/ned/add-missing-people-to-authors 
add missing people to AUTHORS
 2014-02-06 11:06:07 -05:00
Jason Bau
b525f40377 Start datetime localization in LMS 
Currently just coerces the time displayed for due dates
(accordion.html and progess.html) to settings.TIME_ZONE
 2014-02-06 07:57:56 -08:00
Will Daly
c82e4ede34 Merge pull request #2492 from edx/will/really-fix-tab-nav-test 
Skip page check in promise for Tab Nav in bok-choy suite
 2014-02-06 10:22:50 -05:00